summaryrefslogtreecommitdiff
path: root/indoteknik_api/controllers
diff options
context:
space:
mode:
authorRafi Zadanly <zadanlyr@gmail.com>2023-08-24 11:28:05 +0700
committerRafi Zadanly <zadanlyr@gmail.com>2023-08-24 11:28:05 +0700
commitc420bd4e418b2f646e1b3116bdb31e4ff07bf448 (patch)
treed004c85cec5800c218fc1b39de3f6e2d842c63bb /indoteknik_api/controllers
parent9e4511c8d27665a53d296ee648150121a7f6cf84 (diff)
Add estimated arrival days field and estimated time arrival API response
Diffstat (limited to 'indoteknik_api/controllers')
-rw-r--r--indoteknik_api/controllers/api_v1/sale_order.py4
-rw-r--r--indoteknik_api/controllers/api_v1/stock_picking.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 36803466..4f6393a6 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -258,7 +258,8 @@ class SaleOrder(controller.Controller):
'carrier_id': [],
'delivery_service_type': [],
'voucher': [],
- 'source': []
+ 'source': [],
+ 'estimated_arrival_days': ['number', 'default:0']
})
if not params['valid']:
@@ -283,6 +284,7 @@ class SaleOrder(controller.Controller):
'partner_purchase_order_name': params['value']['po_number'],
'partner_purchase_order_file': params['value']['po_file'],
'delivery_amt': params['value']['delivery_amount'],
+ 'estimated_arrival_days': params['value']['estimated_arrival_days'],
'shipping_cost_covered': 'customer',
'shipping_paid_by': 'customer',
'carrier_id': params['value']['carrier_id'],
diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 7d397b4d..304bc806 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -28,7 +28,7 @@ class StockPicking(controller.Controller):
child_ids = request.env['res.partner'].browse(partner_id).get_child_ids()
picking_model = request.env['stock.picking']
- default_domain = [('partner_id', 'in', child_ids), ('sale_id', '!=', False), ('origin', 'ilike', 'SO%')]
+ default_domain = [('partner_id', 'in', child_ids), ('sale_id', '!=', False), ('origin', 'ilike', 'SO%'), ('state', '!=', 'cancel')]
domain = default_domain
if params['q']: