<Miqdad> set back to pengajuan1 when CO from website and change SO line behavior onchange vendor_id

1 files changed, 8 insertions, 4 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 56b49f9a..741dc0b1 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -231,10 +231,11 @@ class SaleOrder(controller.Controller):
         for so in filtered_orders_paginated:
             item = request.env['sale.order'].api_v1_single_response(so)
 
+            approval_ok = (so.approval_status in ('pengajuan1', 'pengajuan2'))
             source_ok = _is_website_order(so)
             term_ok = bool(so.payment_term_id and so.payment_term_id.id == CBD_PAYMENT_TERM_ID)
             pay_status = (getattr(so, 'payment_status', '') or '').strip().lower()
-            eligible = bool(source_ok and term_ok and pay_status in ALLOWED_CONTINUE)
+            eligible = bool(approval_ok and source_ok and term_ok and pay_status in ALLOWED_CONTINUE)
 
             redirect_url = getattr(so, 'payment_link_midtrans', '') or ''
 
@@ -242,6 +243,7 @@ class SaleOrder(controller.Controller):
                 'eligibleContinue': eligible,
                 'paymentSummary': {
                     'eligible': eligible,
+                    'approvalStatus': so.approval_status or '',
                     'paymentStatus': pay_status,
                     'paymentTermId': so.payment_term_id.id if so.payment_term_id else None,
                     'sourceId': so.source_id.id if so.source_id else None,
@@ -283,6 +285,7 @@ class SaleOrder(controller.Controller):
 
             pay_status = (getattr(sale_order, 'payment_status', '') or '').strip().lower()
             eligible = (
+                    sale_order.approval_status in ('pengajuan1', 'pengajuan2') and
                     _is_website_order(sale_order) and
                     sale_order.payment_term_id and sale_order.payment_term_id.id == CBD_PAYMENT_TERM_ID and
                     pay_status in ALLOWED_CONTINUE
@@ -314,6 +317,7 @@ class SaleOrder(controller.Controller):
                 'eligible_continue': eligible,
                 'payment_summary': {
                     'eligible': eligible,
+                    'approval_status': sale_order.approval_status or '',
                     'payment_status': pay_status,
                     'payment_term_id': sale_order.payment_term_id.id if sale_order.payment_term_id else None,
                     'source_id': sale_order.source_id.id if sale_order.source_id else None,
@@ -723,9 +727,9 @@ class SaleOrder(controller.Controller):
                 _logger.info(f"Updated user_id from partner: {parameters['user_id']}")
 
             if params['value']['type'] == 'sale_order':
-                # parameters['approval_status'] = 'pengajuan1'
-                parameters['approval_status'] = False
-                _logger.info("Setting approval_status to 'false'")
+                parameters['approval_status'] = 'pengajuan1'
+                # parameters['approval_status'] = False
+                _logger.info("Setting approval_status to 'pengajuan1'")
 
             sale_order = request.env['sale.order'].with_context(from_website_checkout=True).create([parameters])
             sale_order.onchange_partner_contact()