Merge branch 'odoo-backup' into CR/form-merchant

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/security/ir.model.access.csv

3 files changed, 19 insertions, 5 deletions

diff --git a/indoteknik_custom/models/solr/product_product.py b/indoteknik_custom/models/solr/product_product.py
index 667511b2..d8bc3973 100644
--- a/indoteknik_custom/models/solr/product_product.py
+++ b/indoteknik_custom/models/solr/product_product.py
@@ -57,6 +57,8 @@ class ProductProduct(models.Model):
             is_in_bu = True if variant.qty_free_bandengan > 0 else False
 
             document = solr_model.get_doc('variants', variant.id)
+
+            carousel = [ir_attachment.api_image('image.carousel', 'image', carousel.product_id.id) for carousel in variant.product_tmpl_id.image_carousel_lines],
             
             document.update({
                 'id': variant.id,
@@ -67,10 +69,11 @@ class ProductProduct(models.Model):
                 'product_id_i': variant.id,
                 'template_id_i': variant.product_tmpl_id.id,
                 'image_s': ir_attachment.api_image('product.template', 'image_512', variant.product_tmpl_id.id),
+                'image_carousel_s': [ir_attachment.api_image('image.carousel', 'image', carousel.id) for carousel in variant.product_tmpl_id.image_carousel_lines],
                 'image_mobile_s': ir_attachment.api_image('product.template', 'image_256', variant.product_tmpl_id.id),
                 'stock_total_f': variant.qty_stock_vendor,
                 'weight_f': variant.weight,
-                'manufacture_id_i': variant.product_tmpl_id.x_manufacture.id or 0,
+                'manufacture_id_i': variant.product_tmpl_id.x_manufacture.id or 0,  
                 'manufacture_name_s': variant.product_tmpl_id.x_manufacture.x_name or '',
                 'manufacture_name': variant.product_tmpl_id.x_manufacture.x_name or '',
                 'image_promotion_1_s': ir_attachment.api_image('x_manufactures', 'image_promotion_1', variant.product_tmpl_id.x_manufacture.id),
diff --git a/indoteknik_custom/models/solr/product_template.py b/indoteknik_custom/models/solr/product_template.py
index 87e8370f..c4aefe19 100644
--- a/indoteknik_custom/models/solr/product_template.py
+++ b/indoteknik_custom/models/solr/product_template.py
@@ -26,7 +26,7 @@ class ProductTemplate(models.Model):
                 'function_name': function_name
             }) 
 
-    @api.constrains('name', 'default_code', 'weight', 'x_manufacture', 'public_categ_ids', 'search_rank', 'search_rank_weekly', 'image_1920', 'unpublished')
+    @api.constrains('name', 'default_code', 'weight', 'x_manufacture', 'public_categ_ids', 'search_rank', 'search_rank_weekly', 'image_1920', 'unpublished','image_carousel_lines')
     def _create_solr_queue_sync_product_template(self):
         self._create_solr_queue('_sync_product_template_to_solr')
 
@@ -76,12 +76,21 @@ class ProductTemplate(models.Model):
                 ('product_id', 'in', template.product_variant_ids.ids),
                 ('location_id', 'in', target_locations),
             ])
-
-            is_in_bu = any(quant.available_quantity > 0 for quant in stock_quant)
+            is_in_bu = False
+            for quant in stock_quant:
+                if quant.product_id.qty_free_bandengan > 0:
+                    is_in_bu = True
+                    break
 
             cleaned_desc = BeautifulSoup(template.website_description or '', "html.parser").get_text()
             website_description = template.website_description if cleaned_desc else ''
 
+            # carousel_images = ', '.join([self.env['ir.attachment'].api_image('image.carousel', 'image', carousel.id) for carousel in template.image_carousel_lines])
+            carousel_images = []
+            for carousel in template.image_carousel_lines:
+                image_url = self.env['ir.attachment'].api_image('image.carousel', 'image', carousel.id)
+                if image_url:  # Hanya tambahkan jika URL valid
+                    carousel_images.append(image_url)
             document = solr_model.get_doc('product', template.id)
             document.update({
                 "id": template.id,
@@ -91,6 +100,7 @@ class ProductTemplate(models.Model):
                 "product_rating_f": template.virtual_rating,
                 "product_id_i": template.id,
                 "image_s": self.env['ir.attachment'].api_image('product.template', 'image_512', template.id),
+                "image_carousel_ss": carousel_images if carousel_images else [],
                 'image_mobile_s': self.env['ir.attachment'].api_image('product.template', 'image_256', template.id),
                 "variant_total_i": template.product_variant_count,
                 "stock_total_f": template.qty_stock_vendor,
diff --git a/indoteknik_custom/models/solr/x_banner_banner.py b/indoteknik_custom/models/solr/x_banner_banner.py
index 8452644c..aa6e0c2a 100644
--- a/indoteknik_custom/models/solr/x_banner_banner.py
+++ b/indoteknik_custom/models/solr/x_banner_banner.py
@@ -23,7 +23,7 @@ class XBannerBanner(models.Model):
                 'function_name': function_name
             }) 
 
-    @api.constrains('x_name', 'x_url_banner', 'background_color', 'x_banner_image', 'x_banner_category', 'x_relasi_manufacture', 'x_sequence_banner', 'x_status_banner', 'sequence', 'group_by_week', 'headline_banner_s', 'description_banner_s')
+    @api.constrains('x_name', 'x_url_banner', 'background_color', 'x_banner_image', 'x_banner_category', 'x_relasi_manufacture', 'x_sequence_banner', 'x_status_banner', 'sequence', 'group_by_week', 'headline_banner_s', 'description_banner_s', 'x_keyword_banner')
     def _create_solr_queue_sync_brands(self):
         self._create_solr_queue('_sync_banners_to_solr')
 
@@ -51,6 +51,7 @@ class XBannerBanner(models.Model):
                 'group_by_week': banners.group_by_week or '',
                 'headline_banner_s': banners.x_headline_banner or '',
                 'description_banner_s': banners.x_description_banner or '',
+                'keyword_banner_s': banners.x_keyword_banner or '',
             })
             self.solr().add([document])
             banners.update_last_update_solr()