From c8091b31dff783a64e71a1427fc2e63972f3a365 Mon Sep 17 00:00:00 2001 From: Amit sharma Date: Thu, 4 Jun 2026 16:06:16 +0530 Subject: [PATCH 1/5] Fix order status changing to "Partial Payment Accepted" when adding extra products to a free order --- controllers/admin/AdminOrdersController.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 8a3722b84..7c55806a1 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -5860,25 +5860,29 @@ class AdminOrdersControllerCore extends AdminController $objOrderHistory->changeIdOrderState($idOrderState, $objOrder, $useExistingPayment); $objOrderHistory->add(); } else { - // check if new order amount is greater that old order amount and order payment is accepted - // then update order status to partial payment accepted $currentOrderState = $objOrder->getCurrentOrderState(); - $psOsPartialPaymentAccepted = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED'); - if ($currentOrderState->paid == 1 && $currentOrderState->id != $psOsPartialPaymentAccepted) { + if ($currentOrderState->paid == 1) { + $psOsPartialPaymentAccepted = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED'); + $psOSPaymentComplete = Configuration::get('PS_OS_PAYMENT_ACCEPTED'); + + if ($currentOrderState->id == $psOSPaymentComplete && $objOrder->module == 'free_order') { + $targetState = Configuration::get('PS_OS_AWAITING_PAYMENT'); + } elseif ($currentOrderState->id != $psOsPartialPaymentAccepted) { + $targetState = $psOsPartialPaymentAccepted; + } + // calculate due amount $dueAmount = $objOrder->total_paid_tax_incl - $objOrder->total_paid_real; if ($dueAmount > 0) { - // now change order status to partial payment $objOrderHistory = new OrderHistory(); $objOrderHistory->id_order = $objOrder->id; $objOrderHistory->id_employee = (int) $this->context->employee->id; - $useExistingPayment = false; if (!$objOrder->hasInvoice()) { $useExistingPayment = true; } - $objOrderHistory->changeIdOrderState($psOsPartialPaymentAccepted, $objOrder, $useExistingPayment); + $objOrderHistory->changeIdOrderState($targetState, $objOrder, $useExistingPayment); $objOrderHistory->add(); } } From 541ab231bdfacf0ecd75a210960f2d85c3576b1e Mon Sep 17 00:00:00 2001 From: Amit sharma Date: Fri, 5 Jun 2026 12:19:47 +0530 Subject: [PATCH 2/5] Fix: changes order status when added new extra service in the order --- controllers/admin/AdminOrdersController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 7c55806a1..9b1a0ecb1 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -7751,6 +7751,7 @@ class AdminOrdersControllerCore extends AdminController $response['hasError'] = true; $response['errors'][] = Tools::displayError('Error while updating service, please try again after refresing the page'); } else { + $this->sendChangedNotification($objOrder); $response['service_panel']= $servicesBlock = $this->processRenderServicesPanel( $objOrderDetail->id_order, $objHotelBookingDetail->id_product, @@ -8007,6 +8008,8 @@ class AdminOrdersControllerCore extends AdminController } } } + + $this->sendChangedNotification($order); $response['service_panel'] = $this->processRenderServicesPanel( $order->id, $objHotelBookingDetail->id_product, @@ -8289,6 +8292,7 @@ class AdminOrdersControllerCore extends AdminController // Save changes of order if ($objOrder->update()) { + $this->sendChangedNotification($objOrder); $response['service_panel'] = $this->processRenderServicesPanel( $objOrder->id, $objHotelBookingDetail->id_product, From 63c72f8c5c7ec6256643fc34610115db436fdda6 Mon Sep 17 00:00:00 2001 From: Amit sharma Date: Fri, 12 Jun 2026 20:00:53 +0530 Subject: [PATCH 3/5] Fixed: fix testing issue and code review changes --- classes/PaymentModule.php | 4 ++-- controllers/admin/AdminOrdersController.php | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index fe1ce4392..091da9f9f 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -677,8 +677,8 @@ abstract class PaymentModuleCore extends Module $orderTotals[$order->id]['excl'] -= $used['excl']; $cart_rules[$key]['remaining'] -= $used['excl']; } - - $order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values, 0, $cart_rule['obj']->free_shipping); + $discount_amount = array('tax_incl' => $used['incl'], 'tax_excl' => $used['excl']); + $order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $discount_amount, 0, $cart_rule['obj']->free_shipping); if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && !in_array($cart_rule['obj']->id, $cart_rule_used)) { $cart_rule_used[] = $cart_rule['obj']->id; diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 9b1a0ecb1..5eadb7588 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -5861,19 +5861,18 @@ class AdminOrdersControllerCore extends AdminController $objOrderHistory->add(); } else { $currentOrderState = $objOrder->getCurrentOrderState(); - if ($currentOrderState->paid == 1) { - $psOsPartialPaymentAccepted = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED'); - $psOSPaymentComplete = Configuration::get('PS_OS_PAYMENT_ACCEPTED'); - - if ($currentOrderState->id == $psOSPaymentComplete && $objOrder->module == 'free_order') { - $targetState = Configuration::get('PS_OS_AWAITING_PAYMENT'); - } elseif ($currentOrderState->id != $psOsPartialPaymentAccepted) { - $targetState = $psOsPartialPaymentAccepted; - } - + if ($currentOrderState->paid == 1) { // calculate due amount $dueAmount = $objOrder->total_paid_tax_incl - $objOrder->total_paid_real; if ($dueAmount > 0) { + $psOsPartialPaymentAccepted = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED'); + $psOSPaymentComplete = Configuration::get('PS_OS_PAYMENT_ACCEPTED'); + + if ($currentOrderState->id == $psOSPaymentComplete && $objOrder->total_paid_real == 0) { + $targetState = Configuration::get('PS_OS_AWAITING_PAYMENT'); + } elseif ($currentOrderState->id != $psOsPartialPaymentAccepted) { + $targetState = $psOsPartialPaymentAccepted; + } $objOrderHistory = new OrderHistory(); $objOrderHistory->id_order = $objOrder->id; $objOrderHistory->id_employee = (int) $this->context->employee->id; From 37856f9701da5e3c944039ecfccd547466278b7e Mon Sep 17 00:00:00 2001 From: amit sharma Date: Tue, 7 Jul 2026 17:32:56 +0530 Subject: [PATCH 4/5] fix: set order status to "Awaiting" when paid amount is 0 --- controllers/admin/AdminOrdersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 5eadb7588..0dfc5a3c9 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -5868,7 +5868,7 @@ class AdminOrdersControllerCore extends AdminController $psOsPartialPaymentAccepted = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED'); $psOSPaymentComplete = Configuration::get('PS_OS_PAYMENT_ACCEPTED'); - if ($currentOrderState->id == $psOSPaymentComplete && $objOrder->total_paid_real == 0) { + if ($objOrder->total_paid_real == 0) { $targetState = Configuration::get('PS_OS_AWAITING_PAYMENT'); } elseif ($currentOrderState->id != $psOsPartialPaymentAccepted) { $targetState = $psOsPartialPaymentAccepted; From 2d71165511ead29014a7adfd923cc70c590a9aad Mon Sep 17 00:00:00 2001 From: amit sharma Date: Tue, 28 Jul 2026 19:06:51 +0530 Subject: [PATCH 5/5] Fixed: remove unnecessary code --- classes/PaymentModule.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 091da9f9f..684ddff55 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -677,8 +677,8 @@ abstract class PaymentModuleCore extends Module $orderTotals[$order->id]['excl'] -= $used['excl']; $cart_rules[$key]['remaining'] -= $used['excl']; } - $discount_amount = array('tax_incl' => $used['incl'], 'tax_excl' => $used['excl']); - $order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $discount_amount, 0, $cart_rule['obj']->free_shipping); + + $order->addCartRule($cart_rule['obj']->id, $cart_rule['obj']->name, $values, 0, $cart_rule['obj']->free_shipping); if ($id_order_state != Configuration::get('PS_OS_ERROR') && $id_order_state != Configuration::get('PS_OS_CANCELED') && !in_array($cart_rule['obj']->id, $cart_rule_used)) { $cart_rule_used[] = $cart_rule['obj']->id;