Merge branch 'production' into purchasing-job

5 files changed, 61 insertions, 4 deletions

diff --git a/indoteknik_custom/models/promotion/__init__.py b/indoteknik_custom/models/promotion/__init__.py
index 1e15d714..82628d31 100644
--- a/indoteknik_custom/models/promotion/__init__.py
+++ b/indoteknik_custom/models/promotion/__init__.py
@@ -5,4 +5,5 @@ from . import promotion_free_product
 from . import sale_order_promotion
 from . import sale_order_line
 from . import sale_order
-from . import promotion_keyword
\ No newline at end of file
+from . import promotion_keyword
+from . import promotion_monitoring
\ No newline at end of file
diff --git a/indoteknik_custom/models/promotion/promotion_free_product.py b/indoteknik_custom/models/promotion/promotion_free_product.py
index c5055562..e91d5137 100644
--- a/indoteknik_custom/models/promotion/promotion_free_product.py
+++ b/indoteknik_custom/models/promotion/promotion_free_product.py
@@ -17,6 +17,10 @@ class PromotionFreeProduct(models.Model):
             weight = rec.product_id.weight or 0
             result.append({
                 'id': rec.product_id.id,
+                'parent': {
+                    'id': rec.product_id.product_tmpl_id.id,
+                    'name': rec.product_id.product_tmpl_id.name,
+                },
                 'image': ir_attachment.api_image('product.template', 'image_256', rec.product_id.product_tmpl_id.id),
                 'display_name': rec.product_id.display_name,
                 'name': rec.product_id.name,
diff --git a/indoteknik_custom/models/promotion/promotion_monitoring.py b/indoteknik_custom/models/promotion/promotion_monitoring.py
new file mode 100644
index 00000000..9df0825d
--- /dev/null
+++ b/indoteknik_custom/models/promotion/promotion_monitoring.py
@@ -0,0 +1,45 @@
+from odoo import fields, models, tools
+
+
+class PromotionMonitoring(models.Model):
+    _name = "promotion.monitoring"
+    _auto = False
+    _rec_name = "product_id"
+
+    product_id = fields.Many2one(comodel_name="product.product", string="Product")
+    manufacture_id = fields.Many2one(comodel_name="x_manufactures", string="Manufacture", related="product_id.x_manufacture")
+    price = fields.Float(string="Price", help="Computed Price di Product Pricelist (Tier 1 New)")
+    has_promo = fields.Boolean(string="Has Promo")
+    count_active = fields.Integer(string="Count Active")
+    count_inactive = fields.Integer(string="Count Inactive")
+
+    def init(self):
+        tools.drop_view_if_exists(self.env.cr, self._table)
+        sql = {
+            'count_active': "COUNT(CASE WHEN ppl.active = True THEN ppl.id ELSE NULL END)", 
+            'count_inactive': "COUNT(CASE WHEN ppl.active = False THEN ppl.id ELSE NULL END)"
+        }
+        self.env.cr.execute("""
+            CREATE OR REPLACE VIEW {table} AS (
+                SELECT 
+                    p.id as id,
+                    p.id as product_id,
+                    ppi.computed_price as price,
+                    ({count_active} > 0) as has_promo,
+                    {count_active} as count_active,
+                    {count_inactive} as count_inactive
+                FROM product_product p
+                LEFT JOIN product_template pt ON pt.id = p.product_tmpl_id
+                LEFT JOIN promotion_product pp ON pp.product_id = p.id 
+                LEFT JOIN promotion_program_line ppl ON ppl.id = pp.program_line_id
+                LEFT JOIN product_pricelist_item ppi ON ppi.product_id = p.id
+                WHERE p.active = True
+                AND pt.sale_ok = True
+                AND ppi.pricelist_id = 17023
+                GROUP BY p.id, ppi.id
+            )
+        """.format(
+            table=self._table, 
+            count_active=sql['count_active'],
+            count_inactive=sql['count_inactive']
+        ))
\ No newline at end of file
diff --git a/indoteknik_custom/models/promotion/promotion_product.py b/indoteknik_custom/models/promotion/promotion_product.py
index 2fad0f0d..ae26e888 100644
--- a/indoteknik_custom/models/promotion/promotion_product.py
+++ b/indoteknik_custom/models/promotion/promotion_product.py
@@ -17,6 +17,10 @@ class PromotionProduct(models.Model):
             weight = rec.product_id.weight or 0
             result.append({
                 'id': rec.product_id.id,
+                'parent': {
+                    'id': rec.product_id.product_tmpl_id.id,
+                    'name': rec.product_id.product_tmpl_id.name,
+                },
                 'image': ir_attachment.api_image('product.template', 'image_256', rec.product_id.product_tmpl_id.id),
                 'display_name': rec.product_id.display_name,
                 'name': rec.product_id.name,
diff --git a/indoteknik_custom/models/promotion/promotion_program_line.py b/indoteknik_custom/models/promotion/promotion_program_line.py
index 18a7e184..cb231889 100644
--- a/indoteknik_custom/models/promotion/promotion_program_line.py
+++ b/indoteknik_custom/models/promotion/promotion_program_line.py
@@ -30,6 +30,8 @@ class PromotionProgramLine(models.Model):
     discount_amount = fields.Float('Discount Amount')
 
     order_promotion_ids = fields.One2many('sale.order.promotion', 'program_line_id', 'Promotions')
+    active = fields.Boolean(string="Active", default=True)
+    solr_flag = fields.Integer(string="Solr Flag", default=1)
 
     def get_active_promotions(self, product_id):
         current_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
@@ -74,6 +76,9 @@ class PromotionProgramLine(models.Model):
         }
     
     def _get_remaining_time(self):
+        if not self.program_id.end_time:
+            return 0
+        
         calculate_time = self.program_id.end_time - datetime.now()
         return round(calculate_time.total_seconds())
     
@@ -93,9 +98,7 @@ class PromotionProgramLine(models.Model):
         free_products = self.free_product_ids.formats(purchase_qty=qty)
 
         merged_products = products + free_products
-        weight = 0
-        if not any(x['package_weight'] == 0 for x in merged_products):
-            weight = sum(x['package_weight'] for x in merged_products)
+        weight = sum(x['package_weight'] for x in merged_products)
         
         # Sum of products and free products in 1 package quantity
         products_total = sum(x['price']['price_discount'] * x['qty'] / qty for x in products)