Merge branch 'release' into staging

5 files changed, 30 insertions, 1 deletions

diff --git a/indoteknik_api/controllers/api_v1/__init__.py b/indoteknik_api/controllers/api_v1/__init__.py
index 5d5f723b..d05cdf3a 100644
--- a/indoteknik_api/controllers/api_v1/__init__.py
+++ b/indoteknik_api/controllers/api_v1/__init__.py
@@ -23,3 +23,4 @@ from . import customer
 from . import content
 from . import midtrans
 from . import wati
+from . import courier
diff --git a/indoteknik_api/controllers/api_v1/banner.py b/indoteknik_api/controllers/api_v1/banner.py
index 4db320ed..1bd0fea6 100644
--- a/indoteknik_api/controllers/api_v1/banner.py
+++ b/indoteknik_api/controllers/api_v1/banner.py
@@ -31,6 +31,7 @@ class Banner(controller.Controller):
             data.append({
                 'name': banner.x_name,
                 'url': banner.x_url_banner,
+                'background_color': banner.background_color,
                 'image': request.env['ir.attachment'].api_image('x_banner.banner', 'x_banner_image', banner.id),
             })
         
diff --git a/indoteknik_api/controllers/api_v1/courier.py b/indoteknik_api/controllers/api_v1/courier.py
new file mode 100644
index 00000000..cd3e35c0
--- /dev/null
+++ b/indoteknik_api/controllers/api_v1/courier.py
@@ -0,0 +1,26 @@
+from .. import controller
+from odoo import http
+from odoo.http import request
+
+
+class Courier(controller.Controller):
+    prefix = '/api/v1/'
+
+    @http.route(prefix + 'courier', auth='public', methods=['GET', 'OPTIONS'])
+    @controller.Controller.must_authorized()
+    def get_courier(self):
+        base_url = request.env['ir.config_parameter'].get_param('web.base.url')
+        query = [
+            ('publish', '=', True),
+        ]
+
+        couriers = request.env['rajaongkir.kurir'].search(query)
+        data = []
+        for courier in couriers:
+            data.append({
+                'id': courier.delivery_carrier_id.id,
+                'name': courier.name,
+                'image': base_url + 'api/image/rajaongkir.kurir/image/'+str(courier.id)
+            })
+        return self.response(data)
+    
\ No newline at end of file
diff --git a/indoteknik_api/controllers/api_v1/flash_sale.py b/indoteknik_api/controllers/api_v1/flash_sale.py
index a0aaa44e..dc7c3928 100644
--- a/indoteknik_api/controllers/api_v1/flash_sale.py
+++ b/indoteknik_api/controllers/api_v1/flash_sale.py
@@ -27,6 +27,7 @@ class FlashSale(controller.Controller):
                     'name': pricelist.name,
                     'banner': request.env['ir.attachment'].api_image('product.pricelist', 'banner', pricelist.id),
                     'banner_mobile': request.env['ir.attachment'].api_image('product.pricelist', 'banner_mobile', pricelist.id),
+                    'banner_top': request.env['ir.attachment'].api_image('product.pricelist', 'banner_top', pricelist.id),
                     'duration': round((pricelist.end_date - datetime.now()).total_seconds()),
                     'product_total': request.env['product.pricelist.item'].search_count(query),
                 })
diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index 5edb208e..d82152b7 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -16,7 +16,7 @@ class User(controller.Controller):
         ])
     
     def response_with_token(self, user):
-        data = request.env['res.users'].api_single_response(user)
+        data = request.env['res.users'].sudo().api_single_response(user)
         data['token'] = self.create_user_token(user)
         return data