update order status name

This commit is contained in:
Shreesh Arora
2022-12-27 14:55:33 +05:30
parent 41c01c6d54
commit be780220dc
46 changed files with 167 additions and 167 deletions

View File

@@ -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;
}

View File

@@ -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);
}

View File

@@ -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'));

View File

@@ -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']);

View File

@@ -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);

View File

@@ -377,10 +377,10 @@
<configuration id="PS_BACKUP_DROP_TABLE" name="PS_BACKUP_DROP_TABLE">
<value>1</value>
</configuration>
<configuration id="PS_OS_AWAITING" name="PS_OS_AWAITING">
<configuration id="PS_OS_AWAITING_PAYMENT" name="PS_OS_AWAITING_PAYMENT">
<value>1</value>
</configuration>
<configuration id="PS_OS_PAYMENT" name="PS_OS_PAYMENT">
<configuration id="PS_OS_PAYMENT_ACCEPTED" name="PS_OS_PAYMENT_ACCEPTED">
<value>2</value>
</configuration>
<configuration id="PS_OS_PROCESSING" name="PS_OS_PROCESSING">
@@ -404,7 +404,7 @@
<configuration id="PS_OS_OVERBOOKING" name="PS_OS_OVERBOOKING">
<value>7</value>
</configuration>
<configuration id="PS_OS_PARTIAL_PAYMENT" name="PS_OS_PARTIAL_PAYMENT">
<configuration id="PS_OS_PARTIAL_PAYMENT_ACCEPTED" name="PS_OS_PARTIAL_PAYMENT_ACCEPTED">
<value>8</value>
</configuration>
<!-- <configuration id="PS_OS_BANKWIRE" name="PS_OS_BANKWIRE">

View File

@@ -14,7 +14,7 @@
<field name="pdf_invoice"/>
</fields>
<entities>
<order_state id="Awaiting" invoice="0" send_email="1" color="#4169E1" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0" pdf_delivery="0" pdf_invoice="0">
<order_state id="Awaiting_payment" invoice="0" send_email="1" color="#4169E1" unremovable="1" hidden="0" logable="0" delivery="0" shipped="0" paid="0" pdf_delivery="0" pdf_invoice="0">
</order_state>
<order_state id="Payment_accepted" invoice="1" send_email="1" color="#32CD32" unremovable="1" hidden="0" logable="1" delivery="0" shipped="0" paid="1" pdf_delivery="0" pdf_invoice="1">
</order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Processing in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<entity_order_state>
<order_state id='Awaiting'>
<order_state id='Awaiting_payment'>
<name>অপেক্ষমান পেমেন্ট</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id='Payment_accepted'>
<name>পেমেন্ট গৃহীত </name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id='Preparation_in_progress'>
<name>প্রস্তুতি আগাচ্ছে </name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id='Payment_remotely_accepted'>
<name>পেমেন্ট স্থানিয় ভাবে গৃহীত</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<entity_order_state>
<order_state id='Awaiting'>
<order_state id='Awaiting_payment'>
<name>Aguardando pagamento</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id='Payment_accepted'>
<name>Pagamento aceito</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id='Preparation_in_progress'>
<name>Preparação em andamento</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id='Payment_remotely_accepted'>
<name>Pagamento a distância aceito</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Čeká se na platbu</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Platba byla přijata</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Probíhá příprava</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Warten auf Zahlung</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Zahlung eingegangen</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Bestellung in Bearbeitung</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Zahlung ausserhalb von PrestaShop eingegangen</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Processing in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<entity_order_state>
<order_state id='Awaiting'>
<order_state id='Awaiting_payment'>
<name>Pago pendiente</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id='Payment_accepted'>
<name>Pago aceptado</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id='Preparation_in_progress'>
<name>Preparación en proceso</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id='Payment_remotely_accepted'>
<name>Pago a distancia aceptado</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>منتظر پرداخت</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>پرداخت تایید شده</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>در حال آماده سازی</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>پرداخت از راه دور تایید شده</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version='1.0'?>
<entity_order_state>
<order_state id='Awaiting'>
<order_state id='Awaiting_payment'>
<name>En attente paiement</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id='Payment_accepted'>
<name>Paiement accepté</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id='Preparation_in_progress'>
<name>En cours de préparation</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Paiement à distance accepté</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>ממתין לתשלום</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>התקבל תשלום</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>בתהליך אריזה</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>התקבל תשלום מרחוק</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Processing in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Preparation in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -2,11 +2,11 @@
<entity_order_state>
<order_state id='Awaiting'>
<name>Menunggu pembayaran</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id='Payment_accepted'>
<name>Pembayaran diterima</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id='Preparation_in_progress'>
<name>Barang tengah disiapkan</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id='Payment_remotely_accepted'>
<name>Pembayaran diterima</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -2,11 +2,11 @@
<entity_order_state>
<order_state id='Awaiting'>
<name>In attesa del pagamento</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id='Payment_accepted'>
<name>Pagamento accettato</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id='Preparation_in_progress'>
<name>Preparazione in corso</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id='Payment_remotely_accepted'>
<name>Pagamento remoto accettato</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Processing in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Preparation in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -2,11 +2,11 @@
<entity_order_state>
<order_state id='Awaiting'>
<name>In afwachting van betaling</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id='Payment_accepted'>
<name>Betaling aanvaard</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id='Preparation_in_progress'>
<name>Wordt momenteel voorbereid</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id='Payment_remotely_accepted'>
<name>Betaling op afstand aanvaard</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Preparation in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Payment remotely accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>czekać na wypłatę</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Płatność zaakceptowana</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Przygotowanie w toku</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Płatność przyjęta</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>A aguardar pagamento</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Pagamento aceite</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Prepara&#231;&#227;o em curso</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Pagamento remoto aceite</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -2,11 +2,11 @@
<entity_order_state>
<order_state id='Awaiting'>
<name>En attente de paiement</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id='Payment_accepted'>
<name>Paiement accepté</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id='Preparation_in_progress'>
<name>En cours de préparation</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Paiement à distance accepté</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>În așteptarea plății</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Plată acceptată</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>În procesare</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Plata de la distanță acceptată</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Ожидание оплаты</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Платеж принят</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>В процессе подготовки</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Платеж принят</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Processing in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Preparation in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Processing in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>等待付款</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>付款完成</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>備貨中</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>遠端付款完成</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_remote_payment">
<name>Awaiting remote payment</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Đang chờ thanh toán</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Thanh toán được chấp nhận</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Chuẩn bị trong tiến trình</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_cod_validation">
<name>Awaiting Cash On Delivery validation</name>
@@ -42,7 +42,7 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<entity_order_state>
<order_state id="Awaiting">
<order_state id="Awaiting_payment">
<name>Awaiting payment</name>
<template>awaiting</template>
<template>awaiting_payment</template>
</order_state>
<order_state id="Payment_accepted">
<name>Payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Preparation_in_progress">
<name>Preparation in progress</name>
@@ -26,7 +26,7 @@
</order_state>
<order_state id="Payment_remotely_accepted">
<name>Remote payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
<order_state id="Awaiting_cod_validation">
<name>Remote payment accepted</name>
@@ -42,6 +42,6 @@
</order_state>
<order_state id="Partial_payment_accepted">
<name>Partial payment accepted</name>
<template>payment</template>
<template>payment_accepted</template>
</order_state>
</entity_order_state>

View File

@@ -79,7 +79,7 @@ class Bankwire extends PaymentModule
public function getMailContent($id_order_state, $id_lang)
{
if (Configuration::get('PS_OS_AWAITING') == $id_order_state) {
if (Configuration::get('PS_OS_AWAITING_PAYMENT') == $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_AWAITING'),
Configuration::get('PS_OS_AWAITING_PAYMENT'),
)
)) {
$objCart = new Cart($objOrder->id_cart);

View File

@@ -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_AWAITING'), $total, $this->module->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key);
$this->module->validateOrder($cart->id, Configuration::get('PS_OS_AWAITING_PAYMENT'), $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);
}
}

View File

@@ -74,7 +74,7 @@ class Cheque extends PaymentModule
public function getMailContent($id_order_state, $id_lang)
{
if (Configuration::get('PS_OS_AWAITING') == $id_order_state) {
if (Configuration::get('PS_OS_AWAITING_PAYMENT') == $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_AWAITING')
Configuration::get('PS_OS_AWAITING_PAYMENT')
)
)) {
$objCart = new Cart($objOrder->id_cart);

View File

@@ -77,7 +77,7 @@ class ChequeValidationModuleFrontController extends ModuleFrontController
'{cheque_address}' => Configuration::get('CHEQUE_ADDRESS'),
'{cheque_address_html}' => str_replace("\n", '<br />', Configuration::get('CHEQUE_ADDRESS')));
$this->module->validateOrder((int)$cart->id, Configuration::get('PS_OS_AWAITING'), $total, $this->module->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key);
$this->module->validateOrder((int)$cart->id, Configuration::get('PS_OS_AWAITING_PAYMENT'), $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);
}
}

View File

@@ -95,9 +95,9 @@ class WkPaypalCommerceWebhook
$cartID = $transactionData['id_cart'];
$objCart = new Cart($cartID);
if ($objCart->is_advance_payment) {
$orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT');
$orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
} else {
$orderStatus = Configuration::get('PS_OS_PAYMENT');
$orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
}
if ($orders = WkPaypalCommerceHelper::getOrdersByCartId($cartID)) {
foreach ($orders as $order) {
@@ -125,9 +125,9 @@ class WkPaypalCommerceWebhook
$cartID = $transactionData['id_cart'];
$objCart = new Cart($cartID);
if ($objCart->is_advance_payment) {
$orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT');
$orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
} else {
$orderStatus = Configuration::get('PS_OS_PAYMENT');
$orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
}
if ($orders = WkPaypalCommerceHelper::getOrdersByCartId($cartID)) {
foreach ($orders as $order) {

View File

@@ -133,12 +133,12 @@ class QloPaypalCommercePaymentModuleFrontController extends ModuleFrontControlle
// set order status
if ($returnData['data']['status'] == 'COMPLETED') {
if ($cart->is_advance_payment) {
$orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT');
$orderStatus = Configuration::get('PS_OS_PARTIAL_PAYMENT_ACCEPTED');
} else {
$orderStatus = Configuration::get('PS_OS_PAYMENT');
$orderStatus = Configuration::get('PS_OS_PAYMENT_ACCEPTED');
}
} else {
$orderStatus = Configuration::get('PS_OS_AWAITING');
$orderStatus = Configuration::get('PS_OS_AWAITING_PAYMENT');
}
// create order for the payment