summaryrefslogtreecommitdiff
path: root/indoteknik_api
diff options
context:
space:
mode:
authorFIN-IT_AndriFP <it@fixcomart.co.id>2025-10-10 14:49:13 +0700
committerFIN-IT_AndriFP <it@fixcomart.co.id>2025-10-10 14:49:13 +0700
commit10ddd8835a98bbfe58abedf6a405929dfbbb76d0 (patch)
treea61cea71a2e732a70d20fcbcc271d79e69ded02c /indoteknik_api
parentb0d0e26965ab1ba7aa0c5a607cc0a12a67546dfc (diff)
parente4b191155bf44bfcd58d6ae1b95d4a112bd43547 (diff)
Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup
Diffstat (limited to 'indoteknik_api')
-rw-r--r--indoteknik_api/controllers/api_v1/sale_order.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 1c87400f..56b49f9a 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -231,11 +231,10 @@ 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(approval_ok and source_ok and term_ok and pay_status in ALLOWED_CONTINUE)
+ eligible = bool(source_ok and term_ok and pay_status in ALLOWED_CONTINUE)
redirect_url = getattr(so, 'payment_link_midtrans', '') or ''
@@ -243,7 +242,6 @@ 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,
@@ -285,7 +283,6 @@ 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
@@ -317,7 +314,6 @@ 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,