Merged in biteship-v1 (pull request #329)

Biteship v1

1 files changed, 13 insertions, 3 deletions

diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py
index baba7c37..45461974 100644
--- a/indoteknik_api/models/sale_order.py
+++ b/indoteknik_api/models/sale_order.py
@@ -29,13 +29,23 @@ class SaleOrder(models.Model):
             'pickings': []
         }
         for picking in sale_order.picking_ids:
-            if not picking.name.startswith('BU/OUT'):
+            picking_model = self.env['stock.picking'].sudo().search([('id', '=', picking.id), ('name', 'like', '%BU/OUT/%')], limit=1)
+            if not picking_model:
                 continue
+            response = picking_model.get_tracking_detail()
+            
             data['pickings'].append({
+                'waybill_number' : response['waybill_number'] or '',
+                'delivered_date': response['delivered_date'],
+                'delivery_order' : {
+                    'carrier' : response['delivery_order']['carrier'] or '',
+                    'service' : response['delivery_order']['service'] or ''
+                },
+                'eta' : response['eta'],
                 'id': picking.id,
                 'name': picking.name,
-                'tracking_number': picking.delivery_tracking_no or '',
-                'delivered': picking.waybill_id.delivered or picking.driver_arrival_date != False or picking.sj_return_date != False,
+                # 'tracking_number': picking.delivery_tracking_no or '',
+                # 'delivered': picking.waybill_id.delivered or picking.driver_arrival_date != False or picking.sj_return_date != False,
             })
         if sale_order.state == 'cancel':
             data['status'] = 'cancel'