form-merchant & quotation tampilan

2 files changed, 27 insertions, 1 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 98b13cad..d5208fb1 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -54,6 +54,20 @@ class SaleOrder(controller.Controller):
             # sales = request.env['sale.order'].search_read([('name', '=', sale_number)], fields=['id', 'name', 'amount_total', 'state'])
             sales = request.env['sale.order'].search(query, limit=1)
         data = []
+        INDONESIAN_MONTHS = {
+            1: 'Januari',
+            2: 'Februari',
+            3: 'Maret',
+            4: 'April',
+            5: 'Mei',
+            6: 'Juni',
+            7: 'Juli',
+            8: 'Agustus',
+            9: 'September',
+            10: 'Oktober',
+            11: 'November',
+            12: 'Desember',
+        }
         for sale in sales:
             product_name = ''
             product_not_in_id = 0
@@ -65,6 +79,7 @@ class SaleOrder(controller.Controller):
                 'id': sale.id,
                 'name': sale.name,
                 'date_order': self.time_to_str(sale.date_order, '%d/%m/%Y %H:%M:%S'),
+                'expected_ready_to_ship': f"{sale.expected_ready_to_ship.day} {INDONESIAN_MONTHS[sale.expected_ready_to_ship.month]} {sale.expected_ready_to_ship.year}",
                 'state': sale.state,
                 'amount_untaxed': sale.amount_untaxed,
                 'amount_tax': sale.amount_tax,
@@ -142,6 +157,15 @@ class SaleOrder(controller.Controller):
         sale_order = request.env['sale.order'].search(domain)
         if sale_order:
             data = request.env['sale.order'].api_v1_single_response(sale_order, context='with_detail')
+            if sale_order.expected_ready_to_ship:
+                bulan_id = [
+                    "Januari", "Februari", "Maret", "April", "Mei", "Juni",
+                    "Juli", "Agustus", "September", "Oktober", "November", "Desember"
+                ]
+                tanggal = sale_order.expected_ready_to_ship.day
+                bulan = bulan_id[sale_order.expected_ready_to_ship.month - 1]
+                tahun = sale_order.expected_ready_to_ship.year
+                data['expected_ready_to_ship'] = f"{tanggal} {bulan} {tahun}"
 
         return self.response(data)
 
diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index b5b7e055..967bbcc9 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -60,7 +60,9 @@ class User(controller.Controller):
                 'user': self.response_with_token(user),
             }
             return self.response(data)
-        except:
+        except Exception as e:
+            respon = str(e)
+            print(respon)
             return self.response({
                 'is_auth': False,
                 'reason': 'NOT_FOUND'