diff --git a/classes/Hook.php b/classes/Hook.php
index 4483ced1b..356d7b5b5 100644
--- a/classes/Hook.php
+++ b/classes/Hook.php
@@ -638,7 +638,7 @@ class HookCore extends ObjectModel
$order = new Order((int)$id_order);
$new_os = new OrderState((int)$new_order_status_id, $order->id_lang);
- $return = ((int)$new_os->id == Configuration::get('PS_OS_PAYMENT')) ? Hook::exec('paymentConfirm', array('id_order' => (int)($order->id))) : true;
+ $return = ((int)$new_os->id == Configuration::get('PS_OS_PAYMENT_ACCEPTED')) ? Hook::exec('paymentConfirm', array('id_order' => (int)($order->id))) : true;
$return = Hook::exec('updateOrderStatus', array('newOrderStatus' => $new_os, 'id_order' => (int)($order->id))) && $return;
return $return;
}
diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php
index 73531efe7..6ea97d187 100644
--- a/classes/order/OrderHistory.php
+++ b/classes/order/OrderHistory.php
@@ -97,7 +97,7 @@ class OrderHistoryCore extends ObjectModel
$old_os = $order->getCurrentOrderState();
// executes hook
- if (in_array($new_os->id, array(Configuration::get('PS_OS_PAYMENT'), Configuration::get('PS_OS_WS_PAYMENT')))) {
+ if (in_array($new_os->id, array(Configuration::get('PS_OS_PAYMENT_ACCEPTED'), Configuration::get('PS_OS_WS_PAYMENT')))) {
Hook::exec('actionPaymentConfirmation', array('id_order' => (int)$order->id), null, false, true, false, $order->id_shop);
}
diff --git a/config/config.inc.php b/config/config.inc.php
index 525ecb249..1c46634a1 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -240,14 +240,14 @@ $context->link = new Link($https_link, $https_link);
* USE : Configuration::get() method in order to getting the id of order status
*/
-define('_PS_OS_AWAITING_', Configuration::get('PS_OS_AWAITING'));
-define('_PS_OS_PAYMENT_', Configuration::get('PS_OS_PAYMENT'));
+define('_PS_OS_AWAITING_PAYMENT_', Configuration::get('PS_OS_AWAITING_PAYMENT'));
+define('_PS_OS_PAYMENT_ACCEPTED_', Configuration::get('PS_OS_PAYMENT_ACCEPTED'));
define('_PS_OS_PROCESSING_', Configuration::get('PS_OS_PROCESSING'));
define('_PS_OS_CANCELED_', Configuration::get('PS_OS_CANCELED'));
define('_PS_OS_REFUND_', Configuration::get('PS_OS_REFUND'));
define('_PS_OS_ERROR_', Configuration::get('PS_OS_ERROR'));
define('_PS_OS_OVERBOOKING_', Configuration::get('PS_OS_OVERBOOKING'));
-define('_PS_OS_PARTIAL_PAYMENT_', Configuration::get('PS_OS_PARTIAL_PAYMENT'));
+define('_PS_OS_PARTIAL_PAYMENT_ACCEPTED_', Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED'));
if (!defined('_MEDIA_SERVER_1_')) {
define('_MEDIA_SERVER_1_', Configuration::get('PS_MEDIA_SERVER_1'));
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index dbe0543b4..05395ec7b 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -232,8 +232,8 @@ class AdminOrdersControllerCore extends AdminController
$this->addJqueryPlugin(array('autocomplete', 'fancybox', 'typewatch'));
$defaults_order_state = array(
- 'awaiting' => (int)Configuration::get('PS_OS_AWAITING'),
- 'other' => (int)Configuration::get('PS_OS_PAYMENT'));
+ 'awaiting_payment' => (int)Configuration::get('PS_OS_AWAITING_PAYMENT'),
+ 'other' => (int)Configuration::get('PS_OS_PAYMENT_ACCEPTED'));
$payment_modules = array();
foreach (PaymentModule::getInstalledPaymentModules() as $p_module) {
$payment_modules[] = Module::getInstanceById((int)$p_module['id_module']);
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index a8faded59..eb2bf17d7 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -182,9 +182,9 @@ class ParentOrderControllerCore extends FrontController
// order status payment accepted if no amount is pending for the booking
if ($dueAmount > 0) {
- $orderStatus = Configuration::get('PS_OS_AWAITING');
+ $orderStatus = Configuration::get('PS_OS_AWAITING_PAYMENT');
} else {
- $orderStatus = Configuration::get('PS_OS_PAYMENT');
+ $orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
}
$order->validateOrder($this->context->cart->id, $orderStatus, 0, Tools::displayError('Free order', false), null, array(), null, false, $this->context->cart->secure_key);
diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml
index 52d07c2ed..145d8b8a1 100644
--- a/install/data/xml/configuration.xml
+++ b/install/data/xml/configuration.xml
@@ -377,10 +377,10 @@
1
-
+
1
-
+
2
@@ -404,7 +404,7 @@
7
-
+
8