Merged in CR/form-merchant (pull request #310)odoo-production

odoo quotation view & merchant view

1 files changed, 25 insertions, 5 deletions

diff --git a/indoteknik_api/controllers/api_v1/banner.py b/indoteknik_api/controllers/api_v1/banner.py
index 308d2765..64a6167b 100644
--- a/indoteknik_api/controllers/api_v1/banner.py
+++ b/indoteknik_api/controllers/api_v1/banner.py
@@ -15,7 +15,8 @@ class Banner(controller.Controller):
         limit = int(kw.get('limit', 0))
         offset = int(kw.get('offset', 0))
         order = kw.get('order', 'write_date DESC')
-        
+        keyword = kw.get('keyword')
+
         query = [('x_status_banner', '=', 'tayang')]
         if type:
             query += [('x_banner_category.x_studio_field_KKVl4', '=', type)]
@@ -25,9 +26,27 @@ class Banner(controller.Controller):
         
         if manufacture_id:
             query += [('x_relasi_manufacture', '=', int(manufacture_id))]
-        
-        banners = request.env['x_banner.banner'].search(query, limit=limit, offset=offset, order=order)
-        
+
+        banner_kumpulan = []
+        banner_ids = set()  # Set untuk menyimpan ID banner agar tidak duplikat
+
+        if keyword:
+            keyword_list = [word.strip() for word in keyword.split() if word.strip()]  # Pisahkan berdasarkan spasi
+
+            for word in keyword_list:
+                keyword_query = query + [('x_keyword_banner', 'ilike', word)]  # Buat query baru dengan keyword
+                banners = request.env['x_banner.banner'].search(keyword_query, limit=limit, offset=offset, order=order)
+
+                for banner in banners:
+                    if banner.id not in banner_ids:  # Pastikan tidak ada duplikasi
+                        banner_kumpulan.append(banner)
+                        banner_ids.add(banner.id)
+
+        if not keyword:
+            banners = request.env['x_banner.banner'].search(query, limit=limit, offset=offset, order=order)
+        else:
+            banners = banner_kumpulan if len(banner_kumpulan) > 0 else request.env['x_banner.banner'].search(query, limit=limit, offset=offset, order=order)
+
         week_number = self.get_week_number_of_current_month()
         
         end_datas = []
@@ -41,7 +60,8 @@ class Banner(controller.Controller):
                 'group_by_week': banner.group_by_week,
                 'image': request.env['ir.attachment'].api_image('x_banner.banner', 'x_banner_image', banner.id),
                 'headline_banner': banner.x_headline_banner,
-                'description_banner': banner.x_description_banner
+                'description_banner': banner.x_description_banner,
+                'keyword_banner': banner.x_keyword_banner
             }
             
             if banner.group_by_week and int(banner.group_by_week) < week_number and type == 'index-a-1':