From 1d2011c7b1b9766b0254479733b2ec226e8201bd Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Mon, 24 Feb 2025 17:16:45 +0700
Subject: add public holiday

---
 indoteknik_api/controllers/api_v1/product.py    | 15 ++-------------
 indoteknik_api/controllers/api_v1/sale_order.py |  4 +++-
 2 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'indoteknik_api/controllers/api_v1')

diff --git a/indoteknik_api/controllers/api_v1/product.py b/indoteknik_api/controllers/api_v1/product.py
index 93ef305c..557215ea 100644
--- a/indoteknik_api/controllers/api_v1/product.py
+++ b/indoteknik_api/controllers/api_v1/product.py
@@ -7,18 +7,7 @@ import logging
 import math
 import json
 
-_logger = logging.getLogger(__name__)
-
-def get_days_until_next_business_day(start_date=None, *args, **kwargs):
-    today = start_date or datetime.today().date()
-    offset = 0  # Counter jumlah hari yang ditambahkan
-
-    while today.weekday() >= 5 :
-        today += timedelta(days=1)
-        offset += 1
-
-    return offset
-    
+_logger = logging.getLogger(__name__)  
 
 
 class Product(controller.Controller):
@@ -88,7 +77,7 @@ class Product(controller.Controller):
                         break
                     
         start_date = datetime.today().date()
-        additional_days = get_days_until_next_business_day(start_date)
+        additional_days = request.env['sale.order'].get_days_until_next_business_day(start_date)
         
         # Jika semua loop selesai tanpa include_instant menjadi False
         return self.response({
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 8b95ade8..4afeb21b 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -386,7 +386,8 @@ class SaleOrder(controller.Controller):
             'note_website': [],
             'voucher': [],
             'source': [],
-            'estimated_arrival_days': ['number', 'default:0']
+            'estimated_arrival_days': ['number', 'default:0'],
+            'estimated_arrival_days_start': ['number', 'default:0']
         })
         
         if not params['valid']:
@@ -416,6 +417,7 @@ class SaleOrder(controller.Controller):
             'partner_purchase_order_file': params['value']['po_file'],
             'delivery_amt': params['value']['delivery_amount'] * 1.10,
             'estimated_arrival_days': params['value']['estimated_arrival_days'],
+            'estimated_arrival_days_start': params['value']['estimated_arrival_days_start'],
             'shipping_cost_covered': 'customer',
             'shipping_paid_by': 'customer',
             'carrier_id': params['value']['carrier_id'],
-- 
cgit v1.2.3