Merge branch 'production' of https://bitbucket.org/altafixco/indoteknik-addons into production

1 files changed, 13 insertions, 1 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 1ad1ff51..ecc6c771 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -1,5 +1,6 @@
 from .. import controller
 from odoo import http
+from datetime import datetime, timedelta
 from odoo.http import request
 import json
 
@@ -389,6 +390,17 @@ class SaleOrder(controller.Controller):
             data = airway_bill.decode_response()
             delivery_order = airway_bill.do_id
             result = data['rajaongkir']['result'] 
+            
+            manifests_data = []
+            for manifest in airway_bill.manifest_ids:
+                manifest_data = {
+                    'code': manifest.code,
+                    'description': manifest.description,
+                    'datetime': datetime.strftime(manifest.datetime, '%Y-%m-%d %H:%M:%S'),
+                    'city': manifest.city,
+                }
+                manifests_data.append(manifest_data)
+            
             airways.append({
                 'delivery_order': {
                     'name': delivery_order.name,
@@ -399,7 +411,7 @@ class SaleOrder(controller.Controller):
                 'delivered': result['delivered'],  
                 'waybill_number': result['summary']['waybill_number'],
                 'delivery_status': result['delivery_status'],
-                'manifests': result['manifest']
+                'manifests': manifests_data
             })
         response = {'airways': airways}