<hafid> change api delivered

2 files changed, 4 insertions, 4 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index fd460ea0..33b2a4e3 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -206,8 +206,8 @@ class SaleOrder(controller.Controller):
                 ]
                 total = len(bu_pickings)
                 done_pickings = [p for p in bu_pickings if p.state == 'done']
-                done_with_driver = [p for p in done_pickings if p.driver_arrival_date]
-                done_without_driver = [p for p in done_pickings if not p.driver_arrival_date]
+                done_with_driver = [p for p in done_pickings if p.sj_return_date]
+                done_without_driver = [p for p in done_pickings if not p.sj_return_date]
 
                 if status == 'dikemas' and len(done_pickings) == 0:
                     filtered_orders.append(sale_order)
diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py
index 615dcdcb..0561043b 100644
--- a/indoteknik_api/models/sale_order.py
+++ b/indoteknik_api/models/sale_order.py
@@ -67,8 +67,8 @@ class SaleOrder(models.Model):
             # Hitung status masing-masing picking
             total = len(bu_pickings)
             done_pickings = [p for p in bu_pickings if p.state == 'done']
-            done_with_driver = [p for p in done_pickings if p.driver_arrival_date]
-            done_without_driver = [p for p in done_pickings if not p.driver_arrival_date]
+            done_with_driver = [p for p in done_pickings if p.sj_return_date]
+            done_without_driver = [p for p in done_pickings if not p.sj_return_date]
 
             if len(done_pickings) == 0:
                 data['status'] = 'sale'