Merge branch 'production' into iman/telegram

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/stock_picking.py

2 files changed, 12 insertions, 8 deletions

diff --git a/indoteknik_custom/models/solr/product_product.py b/indoteknik_custom/models/solr/product_product.py
index df20cc4b..667511b2 100644
--- a/indoteknik_custom/models/solr/product_product.py
+++ b/indoteknik_custom/models/solr/product_product.py
@@ -52,10 +52,9 @@ class ProductProduct(models.Model):
             stock_quant = self.env['stock.quant'].search([
                 ('product_id', 'in', variant.product_variant_ids.ids),
                 ('location_id', 'in', target_locations),
-                ('quantity', '>', 0)
             ])
 
-            is_in_bu = bool(stock_quant)
+            is_in_bu = True if variant.qty_free_bandengan > 0 else False
 
             document = solr_model.get_doc('variants', variant.id)
             
@@ -68,6 +67,7 @@ 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_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,
diff --git a/indoteknik_custom/models/solr/product_template.py b/indoteknik_custom/models/solr/product_template.py
index 70246ba3..87e8370f 100644
--- a/indoteknik_custom/models/solr/product_template.py
+++ b/indoteknik_custom/models/solr/product_template.py
@@ -75,10 +75,9 @@ class ProductTemplate(models.Model):
             stock_quant = self.env['stock.quant'].search([
                 ('product_id', 'in', template.product_variant_ids.ids),
                 ('location_id', 'in', target_locations),
-                ('quantity', '>', 0)
             ])
 
-            is_in_bu = bool(stock_quant)
+            is_in_bu = any(quant.available_quantity > 0 for quant in stock_quant)
 
             cleaned_desc = BeautifulSoup(template.website_description or '', "html.parser").get_text()
             website_description = template.website_description if cleaned_desc else ''
@@ -92,6 +91,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_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,
                 "weight_f": template.weight,
@@ -159,10 +159,14 @@ class ProductTemplate(models.Model):
                 traverse_category(category.parent_id.id)
 
         # Start traversal from the initial category
-        traverse_category(category_id)
-
-        # Reverse the list to get the hierarchy from top level to the current level
-        return list(reversed(category_ids))
+        if category_id:  # Check if category_id is not an empty value
+            traverse_category(category_id)
+
+            # Reverse the list to get the hierarchy from top level to the current level
+            return list(reversed(category_ids))
+        else:
+            # If category_id is empty, return an empty list
+            return []
 
     def _sync_price_to_solr(self):
         solr_model = self.env['apache.solr']