Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into pum-v2

3 files changed, 33 insertions, 2 deletions

diff --git a/indoteknik_api/controllers/api_v1/partner.py b/indoteknik_api/controllers/api_v1/partner.py
index b8bd21be..14136ca3 100644
--- a/indoteknik_api/controllers/api_v1/partner.py
+++ b/indoteknik_api/controllers/api_v1/partner.py
@@ -150,7 +150,7 @@ class Partner(controller.Controller):
 
             partner_params = self.get_request_params(request_data, {
                 'tax_name': ['alias:nama_wajib_pajak'],
-                'company_type_id': ['number'],
+                # 'company_type_id': ['number'],
                 'industry_id': ['number'],
                 'npwp': [],
                 'alamat_lengkap_text': [],
@@ -170,7 +170,7 @@ class Partner(controller.Controller):
             if 'id_user' in request_data:
                 user_params = self.get_request_params(request_data, {
                     'id_user': ['required', 'number'],
-                    'company_type_id': ['number'],
+                    # 'company_type_id': ['number'],
                     'industry_id': ['number'],
                     'tax_name': ['alias:nama_wajib_pajak'],
                     'npwp': [],
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 6f5a3d44..d199cd84 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -87,6 +87,8 @@ class SaleOrder(controller.Controller):
                 'amount_tax': sale.amount_tax,
                 'amount_total': sale.amount_total,
                 '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}",
+                'eta_date_start': f"{sale.eta_date_start.day} {INDONESIAN_MONTHS[sale.eta_date_start.month]} {sale.eta_date_start.year}",
+                'eta_date_end': f"{sale.eta_date.day} {INDONESIAN_MONTHS[sale.eta_date.month]} {sale.eta_date.year}",
                 'product_name': product_name,
                 'product_not_in_id': product_not_in_id,
                 'details': [request.env['sale.order.line'].api_single_response(x, context='with_detail') for x in sale.order_line]
@@ -257,6 +259,25 @@ class SaleOrder(controller.Controller):
                 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}"
+            if sale_order.eta_date_start:
+                bulan_id = [
+                    "Januari", "Februari", "Maret", "April", "Mei", "Juni",
+                    "Juli", "Agustus", "September", "Oktober", "November", "Desember"
+                ]
+                tanggal = sale_order.eta_date_start.day
+                bulan = bulan_id[sale_order.eta_date_start.month - 1]
+                tahun = sale_order.eta_date_start.year
+                data['eta_date_start'] = f"{tanggal} {bulan} {tahun}"
+
+            if sale_order.eta_date:
+                bulan_id = [
+                    "Januari", "Februari", "Maret", "April", "Mei", "Juni",
+                    "Juli", "Agustus", "September", "Oktober", "November", "Desember"
+                ]
+                tanggal = sale_order.eta_date.day
+                bulan = bulan_id[sale_order.eta_date.month - 1]
+                tahun = sale_order.eta_date.year
+                data['eta_date_end'] = f"{tanggal} {bulan} {tahun}"
 
         return self.response(data)
 
diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py
index 0561043b..9be03927 100644
--- a/indoteknik_api/models/sale_order.py
+++ b/indoteknik_api/models/sale_order.py
@@ -29,6 +29,9 @@ class SaleOrder(models.Model):
             'approval_step': APPROVAL_STEP[sale_order.web_approval] if sale_order.web_approval else 0,
             'date_order': self.env['rest.api'].datetime_to_str(sale_order.date_order, '%d/%m/%Y %H:%M:%S'),
             'payment_type': sale_order.payment_type,
+            'carrier_id': sale_order.carrier_id.id,
+            'carrier_name': sale_order.carrier_id.name,
+            'service_type': sale_order.shipping_option_id.name,
             'pickings': []
         }
         for picking in sale_order.picking_ids:
@@ -47,6 +50,13 @@ class SaleOrder(models.Model):
                 'eta' : response['eta'],
                 'id': picking.id,
                 'name': picking.name,
+                'products': [{
+                    'id': product.id,
+                    'name': product.name,
+                    'image': self.env['ir.attachment'].api_image('product.template', 'image_128', product.product_tmpl_id.id),
+                    'code': product.default_code or ''
+                } for product in picking.move_line_ids.product_id],
+                'product_count': len(picking.move_line_ids)
                 # 'tracking_number': picking.delivery_tracking_no or '',
                 # 'delivered': picking.waybill_id.delivered or picking.driver_arrival_date != False or picking.sj_return_date != False,
             })