diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 75fbe8c84..d1433cf41 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -26,22 +26,17 @@
abstract class PaymentModuleCore extends Module
{
- /** @var int Current order's id */
- public $currentOrder;
- public $currencies = true;
- public $currencies_mode = 'checkbox';
-
const DEBUG_MODE = false;
const PAYMENT_TYPE_ONLINE = 1;
const PAYMENT_TYPE_PAY_AT_HOTEL = 2;
const PAYMENT_TYPE_REMOTE_PAYMENT = 3;
- public function __construct()
- {
- parent::__construct();
- $this->payment_type = PaymentModule::PAYMENT_TYPE_REMOTE_PAYMENT;
- }
+ /** @var int Current order's id */
+ public $currentOrder;
+ public $currencies = true;
+ public $currencies_mode = 'checkbox';
+ public $payment_type = PaymentModule::PAYMENT_TYPE_REMOTE_PAYMENT;
public function install()
{
@@ -443,7 +438,7 @@ abstract class PaymentModuleCore extends Module
$transaction_id = null;
}
- if (!isset($order) || !Validate::isLoadedObject($order) || !$order->addOrderPayment($amount_paid, null, PaymentModule::PAYMENT_TYPE_ONLINE , $transaction_id)) {
+ if (!isset($order) || !Validate::isLoadedObject($order) || !$order->addOrderPayment($amount_paid, null, $this->payment_type, $transaction_id)) {
PrestaShopLogger::addLog('PaymentModule::validateOrder - Cannot save Order Payment', 3, null, 'Cart', (int)$id_cart, true);
throw new PrestaShopException('Can\'t save Order Payment');
}
diff --git a/classes/order/Order.php b/classes/order/Order.php
index e8fabab7a..4ff1c33d1 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -1612,7 +1612,7 @@ class OrderCore extends ObjectModel
$payment_module = Module::getInstanceByName($this->module);
$payment_module->orderSource = $this->source;
$customer = new Customer($this->id_customer);
- $payment_module->validateOrder($this->id_cart, Configuration::get('PS_OS_AWATING_REMOTE_PAYMENT'), $this->total_paid, $this->payment, null, array(), null, false, $customer->secure_key);
+ $payment_module->validateOrder($this->id_cart, Configuration::get('PS_OS_AWAITING_REMOTE_PAYMENT'), $this->total_paid, $this->payment, null, array(), null, false, $customer->secure_key);
$this->id = $payment_module->currentOrder;
return true;
}
diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php
index 0f5716ade..9d121f109 100644
--- a/classes/order/OrderHistory.php
+++ b/classes/order/OrderHistory.php
@@ -322,12 +322,12 @@ class OrderHistoryCore extends ObjectModel
/** @var OrderInvoice $invoice */
$rest_paid = $invoice->getRestPaid();
if ($rest_paid > 0) {
- if (Configuration::get('PS_OS_PARTIAL_PAYMENT') == $new_os->id
- && $order->total_paid_real < $order->advance_paid_amount
- ) {
- $rest_paid = $order->advance_paid_amount - $order->total_paid_real;
- } else {
- break;
+ if (Configuration::get('PS_OS_PARTIAL_PAYMENT') == $new_os->id) {
+ if ($order->total_paid_real < $order->advance_paid_amount) {
+ $rest_paid = $order->advance_paid_amount - $order->total_paid_real;
+ } else {
+ break;
+ }
}
$payment = new OrderPayment();
$payment->order_reference = Tools::substr($order->reference, 0, 9);
diff --git a/config/config.inc.php b/config/config.inc.php
index 674ddc01e..01fd793b7 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -238,7 +238,7 @@ $context->link = new Link($https_link, $https_link);
* USE : Configuration::get() method in order to getting the id of order status
*/
-define('_PS_OS_AWATING_', Configuration::get('PS_OS_AWATING'));
+define('_PS_OS_AWAITING_', Configuration::get('PS_OS_AWAITING'));
define('_PS_OS_PAYMENT_', Configuration::get('PS_OS_PAYMENT'));
define('_PS_OS_PROCESSING_', Configuration::get('PS_OS_PROCESSING'));
define('_PS_OS_CANCELED_', Configuration::get('PS_OS_CANCELED'));
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 36f4505b6..908c3bcc7 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -232,7 +232,7 @@ class AdminOrdersControllerCore extends AdminController
$this->addJqueryPlugin(array('autocomplete', 'fancybox', 'typewatch'));
$defaults_order_state = array(
- 'awating' => (int)Configuration::get('PS_OS_AWATING'),
+ 'awaiting' => (int)Configuration::get('PS_OS_AWAITING'),
'other' => (int)Configuration::get('PS_OS_PAYMENT'));
$payment_modules = array();
foreach (PaymentModule::getInstalledPaymentModules() as $p_module) {
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index 9f05ead7a..a8faded59 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -182,7 +182,7 @@ class ParentOrderControllerCore extends FrontController
// order status payment accepted if no amount is pending for the booking
if ($dueAmount > 0) {
- $orderStatus = Configuration::get('PS_OS_AWATING');
+ $orderStatus = Configuration::get('PS_OS_AWAITING');
} else {
$orderStatus = Configuration::get('PS_OS_PAYMENT');
}
diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml
index 663fc7dfe..f29eb051e 100644
--- a/install/data/xml/configuration.xml
+++ b/install/data/xml/configuration.xml
@@ -374,7 +374,7 @@
1
-
+
1
@@ -410,7 +410,7 @@
-
+
9
diff --git a/install/langs/bg/data/order_state.xml b/install/langs/bg/data/order_state.xml
index 516a2e42d..d0a50242d 100644
--- a/install/langs/bg/data/order_state.xml
+++ b/install/langs/bg/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/install/langs/bn/data/order_state.xml b/install/langs/bn/data/order_state.xml
index 80a3dad08..f1a4e311b 100644
--- a/install/langs/bn/data/order_state.xml
+++ b/install/langs/bn/data/order_state.xml
@@ -2,7 +2,7 @@
অপেক্ষমান পেমেন্ট
- awating
+ awaiting
পেমেন্ট গৃহীত
diff --git a/install/langs/br/data/order_state.xml b/install/langs/br/data/order_state.xml
index e62b8510d..3ae673a3a 100644
--- a/install/langs/br/data/order_state.xml
+++ b/install/langs/br/data/order_state.xml
@@ -2,7 +2,7 @@
Aguardando pagamento
- awating
+ awaiting
Pagamento aceito
diff --git a/install/langs/cs/data/order_state.xml b/install/langs/cs/data/order_state.xml
index d21deb508..2e1edf045 100644
--- a/install/langs/cs/data/order_state.xml
+++ b/install/langs/cs/data/order_state.xml
@@ -2,7 +2,7 @@
Čeká se na platbu
- awating
+ awaiting
Platba byla přijata
diff --git a/install/langs/de/data/order_state.xml b/install/langs/de/data/order_state.xml
index 933b00906..9ae40deda 100644
--- a/install/langs/de/data/order_state.xml
+++ b/install/langs/de/data/order_state.xml
@@ -2,7 +2,7 @@
Warten auf Zahlung
- awating
+ awaiting
Zahlung eingegangen
diff --git a/install/langs/en/data/order_state.xml b/install/langs/en/data/order_state.xml
index 7b4a5dc43..c153a1108 100644
--- a/install/langs/en/data/order_state.xml
+++ b/install/langs/en/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/install/langs/es/data/order_state.xml b/install/langs/es/data/order_state.xml
index 565f0779c..8b9745b2c 100644
--- a/install/langs/es/data/order_state.xml
+++ b/install/langs/es/data/order_state.xml
@@ -2,7 +2,7 @@
Pago pendiente
- awating
+ awaiting
Pago aceptado
diff --git a/install/langs/fa/data/order_state.xml b/install/langs/fa/data/order_state.xml
index 39fea76ad..5e9ec1b7f 100644
--- a/install/langs/fa/data/order_state.xml
+++ b/install/langs/fa/data/order_state.xml
@@ -2,7 +2,7 @@
منتظر پرداخت
- awating
+ awaiting
پرداخت تایید شده
diff --git a/install/langs/fr/data/order_state.xml b/install/langs/fr/data/order_state.xml
index 26b248c5c..ba12392d2 100644
--- a/install/langs/fr/data/order_state.xml
+++ b/install/langs/fr/data/order_state.xml
@@ -2,7 +2,7 @@
En attente paiement
- awating
+ awaiting
Paiement accepté
diff --git a/install/langs/he/data/order_state.xml b/install/langs/he/data/order_state.xml
index 979587b98..634c885ff 100644
--- a/install/langs/he/data/order_state.xml
+++ b/install/langs/he/data/order_state.xml
@@ -2,7 +2,7 @@
ממתין לתשלום
- awating
+ awaiting
התקבל תשלום
diff --git a/install/langs/hr/data/order_state.xml b/install/langs/hr/data/order_state.xml
index 516a2e42d..d0a50242d 100644
--- a/install/langs/hr/data/order_state.xml
+++ b/install/langs/hr/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/install/langs/hu/data/order_state.xml b/install/langs/hu/data/order_state.xml
index b3de46b6f..0e91466b0 100644
--- a/install/langs/hu/data/order_state.xml
+++ b/install/langs/hu/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/install/langs/id/data/order_state.xml b/install/langs/id/data/order_state.xml
index 4ea433084..bdae92ed7 100644
--- a/install/langs/id/data/order_state.xml
+++ b/install/langs/id/data/order_state.xml
@@ -2,7 +2,7 @@
Menunggu pembayaran
- awating
+ awaiting
Pembayaran diterima
diff --git a/install/langs/it/data/order_state.xml b/install/langs/it/data/order_state.xml
index 5cfee9455..15d5c299a 100644
--- a/install/langs/it/data/order_state.xml
+++ b/install/langs/it/data/order_state.xml
@@ -2,7 +2,7 @@
In attesa del pagamento
- awating
+ awaiting
Pagamento accettato
diff --git a/install/langs/lt/data/order_state.xml b/install/langs/lt/data/order_state.xml
index 2b08f4065..9ef37e7e8 100644
--- a/install/langs/lt/data/order_state.xml
+++ b/install/langs/lt/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/install/langs/mk/data/order_state.xml b/install/langs/mk/data/order_state.xml
index ca1a854bd..391f50dd5 100644
--- a/install/langs/mk/data/order_state.xml
+++ b/install/langs/mk/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/install/langs/nl/data/order_state.xml b/install/langs/nl/data/order_state.xml
index c6f6c0913..647699164 100644
--- a/install/langs/nl/data/order_state.xml
+++ b/install/langs/nl/data/order_state.xml
@@ -2,7 +2,7 @@
In afwachting van betaling
- awating
+ awaiting
Betaling aanvaard
diff --git a/install/langs/no/data/order_state.xml b/install/langs/no/data/order_state.xml
index a004b1c0c..2773dbfb1 100644
--- a/install/langs/no/data/order_state.xml
+++ b/install/langs/no/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/install/langs/pl/data/order_state.xml b/install/langs/pl/data/order_state.xml
index ca080d6a8..332776b28 100644
--- a/install/langs/pl/data/order_state.xml
+++ b/install/langs/pl/data/order_state.xml
@@ -2,7 +2,7 @@
czekać na wypłatę
- awating
+ awaiting
Płatność zaakceptowana
diff --git a/install/langs/pt/data/order_state.xml b/install/langs/pt/data/order_state.xml
index f7aade7cd..096b89ee3 100644
--- a/install/langs/pt/data/order_state.xml
+++ b/install/langs/pt/data/order_state.xml
@@ -2,7 +2,7 @@
A aguardar pagamento
- awating
+ awaiting
Pagamento aceite
diff --git a/install/langs/qc/data/order_state.xml b/install/langs/qc/data/order_state.xml
index d7f557e94..2d77c9d36 100644
--- a/install/langs/qc/data/order_state.xml
+++ b/install/langs/qc/data/order_state.xml
@@ -2,7 +2,7 @@
En attente de paiement
- awating
+ awaiting
Paiement accepté
diff --git a/install/langs/ro/data/order_state.xml b/install/langs/ro/data/order_state.xml
index 5b71d7e9f..fd6dd8ac7 100644
--- a/install/langs/ro/data/order_state.xml
+++ b/install/langs/ro/data/order_state.xml
@@ -2,7 +2,7 @@
În așteptarea plății
- awating
+ awaiting
Plată acceptată
diff --git a/install/langs/ru/data/order_state.xml b/install/langs/ru/data/order_state.xml
index b1013155e..087d333ee 100644
--- a/install/langs/ru/data/order_state.xml
+++ b/install/langs/ru/data/order_state.xml
@@ -2,7 +2,7 @@
Ожидание оплаты
- awating
+ awaiting
Платеж принят
diff --git a/install/langs/si/data/order_state.xml b/install/langs/si/data/order_state.xml
index 2b08f4065..9ef37e7e8 100644
--- a/install/langs/si/data/order_state.xml
+++ b/install/langs/si/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/install/langs/sr/data/order_state.xml b/install/langs/sr/data/order_state.xml
index ca1a854bd..391f50dd5 100644
--- a/install/langs/sr/data/order_state.xml
+++ b/install/langs/sr/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/install/langs/sv/data/order_state.xml b/install/langs/sv/data/order_state.xml
index 516a2e42d..d0a50242d 100644
--- a/install/langs/sv/data/order_state.xml
+++ b/install/langs/sv/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/install/langs/tw/data/order_state.xml b/install/langs/tw/data/order_state.xml
index e1f17f3c0..9717de91a 100644
--- a/install/langs/tw/data/order_state.xml
+++ b/install/langs/tw/data/order_state.xml
@@ -2,7 +2,7 @@
等待付款
- awating
+ awaiting
付款完成
diff --git a/install/langs/vn/data/order_state.xml b/install/langs/vn/data/order_state.xml
index 3b241bb62..f8ed3a75f 100644
--- a/install/langs/vn/data/order_state.xml
+++ b/install/langs/vn/data/order_state.xml
@@ -2,7 +2,7 @@
Đang chờ thanh toán
- awating
+ awaiting
Thanh toán được chấp nhận
diff --git a/install/langs/zh/data/order_state.xml b/install/langs/zh/data/order_state.xml
index 45eb14182..a0e6204e6 100644
--- a/install/langs/zh/data/order_state.xml
+++ b/install/langs/zh/data/order_state.xml
@@ -2,7 +2,7 @@
Awaiting payment
- awating
+ awaiting
Payment accepted
diff --git a/modules/bankwire/bankwire.php b/modules/bankwire/bankwire.php
index a7df7fbe2..757c776bb 100644
--- a/modules/bankwire/bankwire.php
+++ b/modules/bankwire/bankwire.php
@@ -79,7 +79,7 @@ class bankwire extends PaymentModule
public function getMailContent($id_order_state, $id_lang)
{
- if (Configuration::get('PS_OS_AWATING') == $id_order_state) {
+ if (Configuration::get('PS_OS_AWAITING') == $id_order_state) {
$this->context->smarty->assign(array(
'bankwire_owner' => Configuration::get('BANK_WIRE_OWNER'),
'bankwire_details' => nl2br(Configuration::get('BANK_WIRE_DETAILS')),
@@ -210,7 +210,7 @@ class bankwire extends PaymentModule
if (in_array(
$orderState,
array(
- Configuration::get('PS_OS_AWATING'),
+ Configuration::get('PS_OS_AWAITING'),
)
)) {
$objCart = new Cart($objOrder->id_cart);
diff --git a/modules/bankwire/controllers/front/validation.php b/modules/bankwire/controllers/front/validation.php
index 5045f4827..3a083da57 100644
--- a/modules/bankwire/controllers/front/validation.php
+++ b/modules/bankwire/controllers/front/validation.php
@@ -77,7 +77,7 @@ class BankwireValidationModuleFrontController extends ModuleFrontController
'{bankwire_address}' => nl2br(Configuration::get('BANK_WIRE_ADDRESS'))
);
- $this->module->validateOrder($cart->id, Configuration::get('PS_OS_AWATING'), $total, $this->module->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key);
+ $this->module->validateOrder($cart->id, Configuration::get('PS_OS_AWAITING'), $total, $this->module->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key);
Tools::redirect('index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key);
}
}
diff --git a/modules/cheque/cheque.php b/modules/cheque/cheque.php
index 133f9219c..3271e95d6 100644
--- a/modules/cheque/cheque.php
+++ b/modules/cheque/cheque.php
@@ -74,7 +74,7 @@ class Cheque extends PaymentModule
public function getMailContent($id_order_state, $id_lang)
{
- if (Configuration::get('PS_OS_AWATING') == $id_order_state) {
+ if (Configuration::get('PS_OS_AWAITING') == $id_order_state) {
$this->context->smarty->assign(array(
'cheque_name' => Configuration::get('CHEQUE_NAME'),
'cheque_address' => Configuration::get('CHEQUE_ADDRESS'),
@@ -193,7 +193,7 @@ class Cheque extends PaymentModule
if (in_array(
$orderState,
array(
- Configuration::get('PS_OS_AWATING')
+ Configuration::get('PS_OS_AWAITING')
)
)) {
$objCart = new Cart($objOrder->id_cart);
diff --git a/modules/cheque/controllers/front/validation.php b/modules/cheque/controllers/front/validation.php
index b31e3451f..044a53183 100644
--- a/modules/cheque/controllers/front/validation.php
+++ b/modules/cheque/controllers/front/validation.php
@@ -77,7 +77,7 @@ class ChequeValidationModuleFrontController extends ModuleFrontController
'{cheque_address}' => Configuration::get('CHEQUE_ADDRESS'),
'{cheque_address_html}' => str_replace("\n", '
', Configuration::get('CHEQUE_ADDRESS')));
- $this->module->validateOrder((int)$cart->id, Configuration::get('PS_OS_AWATING'), $total, $this->module->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key);
+ $this->module->validateOrder((int)$cart->id, Configuration::get('PS_OS_AWAITING'), $total, $this->module->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key);
Tools::redirect('index.php?controller=order-confirmation&id_cart='.(int)$cart->id.'&id_module='.(int)$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key);
}
}
diff --git a/modules/qlopaypalcommerce/controllers/front/payment.php b/modules/qlopaypalcommerce/controllers/front/payment.php
index 4fa88eeb2..d06c1d06c 100644
--- a/modules/qlopaypalcommerce/controllers/front/payment.php
+++ b/modules/qlopaypalcommerce/controllers/front/payment.php
@@ -138,7 +138,7 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
$orderStatus = Configuration::get('PS_OS_PAYMENT');
}
} else {
- $orderStatus = Configuration::get('PS_OS_AWATING');
+ $orderStatus = Configuration::get('PS_OS_AWAITING');
}
// create order for the payment