Merge branch 'origin/feature/raja-ongkir' into release

2 files changed, 9 insertions, 17 deletions

diff --git a/indoteknik_api/controllers/api_v1/partner.py b/indoteknik_api/controllers/api_v1/partner.py
index fc05ae90..e61c98c1 100644
--- a/indoteknik_api/controllers/api_v1/partner.py
+++ b/indoteknik_api/controllers/api_v1/partner.py
@@ -33,7 +33,7 @@ class Partner(controller.Controller):
             'street': ['required'],
             'city_id': ['required', 'number', 'alias:kota_id'],
             'district_id': ['number', 'alias:kecamatan_id'],
-            'sub_district_id': ['number', 'alias:kelurahan_id'],
+            'sub_district_id': ['number', 'alias:kelurahan_id', 'exclude_if_null'],
             'zip': ['required'],
         })
 
@@ -62,7 +62,7 @@ class Partner(controller.Controller):
             'street': ['required'],
             'city_id': ['required', 'number', 'alias:kota_id'],
             'district_id': ['number', 'alias:kecamatan_id'],
-            'sub_district_id': ['number', 'alias:kelurahan_id'],
+            'sub_district_id': ['number', 'alias:kelurahan_id', 'exclude_if_null'],
             'zip': ['required'],
         })
 
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index ec39b32a..2ac92bf9 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -187,7 +187,7 @@ class SaleOrder(controller.Controller):
             return self.response('Unauthorized')
         
         sale_order = request.env['sale.order'].sudo().search_read([('id', '=', id)], ['name'])
-        pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'sale.report_saleorder')])._render_qweb_pdf([id])
+        pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'indoteknik_custom.report_saleorder_website')])._render_qweb_pdf([id])
         if pdf and len(sale_order) > 0:
             return rest_api.response_attachment({
                 'content': pdf,
@@ -235,7 +235,9 @@ class SaleOrder(controller.Controller):
             'po_number': [],
             'po_file': [],
             'type': [],
-            'delivery_amount': ['number', 'default:0']
+            'delivery_amount': ['number', 'default:0'],
+            'carrier_id': [],
+            'delivery_service_type': []
         })
         
         if not params['valid']:
@@ -260,7 +262,9 @@ class SaleOrder(controller.Controller):
             'partner_purchase_order_file': params['value']['po_file'],
             'delivery_amt': params['value']['delivery_amount'],
             'shipping_cost_covered': 'customer',
-            'shipping_paid_by': 'customer'
+            'shipping_paid_by': 'customer',
+            'carrier_id': params['value']['carrier_id'],
+            'delivery_service_type': params['value']['delivery_service_type'],
         }
         if params['value']['type'] == 'sale_order':
             parameters['approval_status'] = 'pengajuan1'
@@ -298,18 +302,6 @@ class SaleOrder(controller.Controller):
                 'price_unit': product._get_website_price_exclude_tax(),
                 'discount': discount
             })
-
-        # Static order line for delivery 
-        if params['value']['type'] == 'sale_order' and params['value']['delivery_amount'] > 0:
-            parameters.append({
-                'company_id': 1,
-                'order_id': sale_order.id,
-                'product_id': 81384,
-                'product_uom_qty': 1,
-                'price_unit': params['value']['delivery_amount'],
-                'discount': 0,
-                'tax_id': False
-            })
             
         request.env['sale.order.line'].create(parameters)
         return self.response({