diff options
Diffstat (limited to 'indoteknik_api/controllers/api_v1')
| -rw-r--r-- | indoteknik_api/controllers/api_v1/stock_picking.py | 2 | ||||
| -rw-r--r-- | indoteknik_api/controllers/api_v1/voucher.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index 7e246a9f..74f4564a 100644 --- a/indoteknik_api/controllers/api_v1/stock_picking.py +++ b/indoteknik_api/controllers/api_v1/stock_picking.py @@ -56,6 +56,7 @@ class StockPicking(controller.Controller): res_pickings = [] for picking in stock_pickings: manifests = picking.get_manifests() + res_pickings.append({ 'id': picking.id, 'name': picking.name, @@ -67,6 +68,7 @@ class StockPicking(controller.Controller): 'client_order_ref': picking.sale_id.client_order_ref or '' }, 'delivered': picking.waybill_id.delivered or picking.driver_arrival_date != False, + 'status': picking.shipping_status, 'carrier_name': picking.carrier_id.name or '', 'last_manifest': next(iter(manifests), None) }) diff --git a/indoteknik_api/controllers/api_v1/voucher.py b/indoteknik_api/controllers/api_v1/voucher.py index a76d57e6..dfe9ceba 100644 --- a/indoteknik_api/controllers/api_v1/voucher.py +++ b/indoteknik_api/controllers/api_v1/voucher.py @@ -67,7 +67,7 @@ class Voucher(controller.Controller): voucher_res['can_apply'] = can_apply voucher_res['discount_voucher'] = voucher_discount - cleaned_tnc = BeautifulSoup(voucher.terms_conditions, "html.parser").get_text() + cleaned_tnc = BeautifulSoup(voucher.terms_conditions or '', "html.parser").get_text() voucher_res['terms_conditions'] = voucher.terms_conditions if cleaned_tnc else voucher.generate_tnc() results.append(voucher_res) |