Merge branch 'production' of bitbucket.org:altafixco/indoteknik-addons into production

3 files changed, 28 insertions, 14 deletions

diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index ee9c9429..116354d6 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -37,6 +37,7 @@ from . import user_company_request
 from . import users
 from . import website_brand_homepage
 from . import website_categories_homepage
+from . import website_categories_lob
 from . import website_categories_management
 from . import website_content
 from . import website_page_content
diff --git a/indoteknik_custom/models/solr/product_template.py b/indoteknik_custom/models/solr/product_template.py
index 3d7d3a80..19143be3 100644
--- a/indoteknik_custom/models/solr/product_template.py
+++ b/indoteknik_custom/models/solr/product_template.py
@@ -65,11 +65,9 @@ class ProductTemplate(models.Model):
             variant_names = ', '.join([x.display_name or '' for x in template.product_variant_ids])
             variant_codes = ', '.join([x.default_code or '' for x in template.product_variant_ids])
 
-            category_id = 0
-            category_name = ''
-            for category in template.public_categ_ids:
-                category_id, category_name = category.id, category.name
-                break
+            # Mengumpulkan semua kategori
+            category_ids = [category.id for category in template.public_categ_ids]
+            category_names = [category.name for category in template.public_categ_ids]
             
             document = solr_model.get_doc('product', template.id)
             document.update({
@@ -92,21 +90,21 @@ class ProductTemplate(models.Model):
                 "variants_code_t": variant_codes,
                 "search_rank_i": template.search_rank,
                 "search_rank_weekly_i": template.search_rank_weekly,
-                "category_id_i": category_id,
-                "category_name_s": category_name,
-                "category_name": category_name,
+                "category_id_ids": category_ids,  # ID kategori sebagai string yang dipisahkan koma
+                "category_name_s": ', '.join(category_names),  # Nama kategori sebagai string yang dipisahkan koma
+                "category_name": category_names,  # Nama kategori sebagai list
                 "description_t": template.website_description or '',
                 'has_product_info_b': True,
                 'publish_b': not template.unpublished,
                 'sni_b': template.unpublished,
                 'tkdn_b': template.unpublished,
                 "qty_sold_f": template.qty_sold,
-                "voucher_pastihemat" : {
-                    "min_purchase" : voucher.min_purchase_amount,
-                    "discount_type" : voucher.discount_type,
-                    "discount_amount" : voucher.discount_amount,
-                    "max_discount" : voucher.max_discount_amount
-                }
+                # "voucher_pastihemat" : {
+                #     "min_purchase" : voucher.min_purchase_amount,
+                #     "discount_type" : voucher.discount_type,
+                #     "discount_amount" : voucher.discount_amount,
+                #     "max_discount" : voucher.max_discount_amount
+                # }
             })
 
             self.solr().add(docs=[document], softCommit=True)
diff --git a/indoteknik_custom/models/website_categories_lob.py b/indoteknik_custom/models/website_categories_lob.py
new file mode 100644
index 00000000..88182ba5
--- /dev/null
+++ b/indoteknik_custom/models/website_categories_lob.py
@@ -0,0 +1,15 @@
+from odoo import fields, models
+
+
+class WebsiteCategoriesLob(models.Model):
+    _name = 'website.categories.lob'
+    _rec_name = 'category_id'
+
+    category_id = fields.Many2one('res.partner.industry', string='Industri', help='table ecommerce category')
+    image = fields.Binary(string='Image')
+    sequence = fields.Integer(string='Sequence')
+    status = fields.Selection([
+        ('tayang', 'Tayang'),
+        ('tidak_tayang', 'Tidak Tayang')
+    ], string='Status')
+    category_ids = fields.Many2many('product.public.category', string='Category Parent')
\ No newline at end of file