From 2dc9a6860e72d5e2d7c0d95e28d6436a9007bce3 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 1 Aug 2022 16:04:31 +0530 Subject: [PATCH 01/60] removed extra order statuses and updated module statuses --- .../controllers/orders/helpers/view/view.tpl | 126 +++++++++----- classes/PaymentModule.php | 13 +- classes/order/Order.php | 11 +- classes/order/OrderHistory.php | 20 ++- classes/order/OrderPayment.php | 2 + config/config.inc.php | 15 +- controllers/admin/AdminOrdersController.php | 44 ++++- controllers/front/ParentOrderController.php | 2 +- install/data/db_structure.sql | 2 + install/data/img/os/Awaiting.gif | Bin 0 -> 1030 bytes install/data/img/os/Overbooking.gif | Bin 0 -> 1070 bytes install/data/img/os/Overbooking_unpaid.gif | Bin 0 -> 1070 bytes .../data/img/os/Processing_in_progress.gif | Bin 0 -> 1046 bytes install/data/xml/configuration.xml | 29 ++-- install/data/xml/order_state.xml | 31 +--- install/langs/bg/data/order_state.xml | 32 ++-- install/langs/bn/data/order_state.xml | 32 ++-- install/langs/br/data/order_state.xml | 32 ++-- install/langs/cs/data/order_state.xml | 34 ++-- install/langs/de/data/order_state.xml | 32 ++-- install/langs/en/data/order_state.xml | 32 ++-- install/langs/es/data/order_state.xml | 32 ++-- install/langs/fa/data/order_state.xml | 32 ++-- install/langs/fr/data/order_state.xml | 32 ++-- install/langs/he/data/order_state.xml | 32 ++-- install/langs/hr/data/order_state.xml | 32 ++-- install/langs/hu/data/order_state.xml | 32 ++-- install/langs/id/data/order_state.xml | 32 ++-- install/langs/it/data/order_state.xml | 33 ++-- install/langs/lt/data/order_state.xml | 33 ++-- install/langs/mk/data/order_state.xml | 33 ++-- install/langs/nl/data/order_state.xml | 32 ++-- install/langs/no/data/order_state.xml | 33 ++-- install/langs/pl/data/order_state.xml | 33 ++-- install/langs/pt/data/order_state.xml | 32 ++-- install/langs/qc/data/order_state.xml | 32 ++-- install/langs/ro/data/order_state.xml | 33 ++-- install/langs/ru/data/order_state.xml | 33 ++-- install/langs/si/data/order_state.xml | 33 ++-- install/langs/sr/data/order_state.xml | 33 ++-- install/langs/sv/data/order_state.xml | 32 ++-- install/langs/tw/data/order_state.xml | 33 ++-- install/langs/vn/data/order_state.xml | 33 ++-- install/langs/zh/data/order_state.xml | 32 ++-- js/admin/orders.js | 13 +- mails/en/{cheque.html => awating.html} | 83 ++++----- mails/en/awating.txt | 23 +++ mails/en/bankwire.html | 160 ------------------ mails/en/bankwire.txt | 32 ---- mails/en/cheque.txt | 30 ---- mails/en/order_canceled.html | 49 +++--- mails/en/order_canceled.txt | 14 +- mails/en/order_return_state.html | 49 +++--- mails/en/order_return_state.txt | 10 +- mails/en/outofstock.html | 49 +++--- mails/en/outofstock.txt | 14 +- mails/en/payment.html | 49 +++--- mails/en/payment.txt | 14 +- mails/en/payment_error.html | 49 +++--- mails/en/payment_error.txt | 14 +- mails/en/preparation.html | 49 +++--- mails/en/preparation.txt | 14 +- mails/en/refund.html | 49 +++--- mails/en/refund.txt | 14 +- modules/bankwire/bankwire.php | 29 +++- .../bankwire/controllers/front/validation.php | 2 +- modules/bankwire/mails/en/index.php | 29 ++++ .../bankwire/mails/en/mail_template_html.tpl | 26 +++ .../bankwire/mails/en/mail_template_text.tpl | 6 + modules/bankwire/mails/index.php | 29 ++++ modules/cheque/cheque.php | 30 +++- .../cheque/controllers/front/validation.php | 2 +- modules/cheque/mails/en/index.php | 29 ++++ .../cheque/mails/en/mail_template_html.tpl | 25 +++ .../cheque/mails/en/mail_template_text.tpl | 5 + modules/cheque/mails/index.php | 29 ++++ .../classes/WkPaypalCommerceDb.php | 57 ------- .../controllers/front/payment.php | 2 +- .../qlopaypalcommerce/qlopaypalcommerce.php | 4 +- 79 files changed, 1009 insertions(+), 1309 deletions(-) create mode 100644 install/data/img/os/Awaiting.gif create mode 100644 install/data/img/os/Overbooking.gif create mode 100644 install/data/img/os/Overbooking_unpaid.gif create mode 100644 install/data/img/os/Processing_in_progress.gif rename mails/en/{cheque.html => awating.html} (70%) create mode 100644 mails/en/awating.txt delete mode 100644 mails/en/bankwire.html delete mode 100644 mails/en/bankwire.txt delete mode 100644 mails/en/cheque.txt create mode 100644 modules/bankwire/mails/en/index.php create mode 100644 modules/bankwire/mails/en/mail_template_html.tpl create mode 100644 modules/bankwire/mails/en/mail_template_text.tpl create mode 100644 modules/bankwire/mails/index.php create mode 100644 modules/cheque/mails/en/index.php create mode 100644 modules/cheque/mails/en/mail_template_html.tpl create mode 100644 modules/cheque/mails/en/mail_template_text.tpl create mode 100644 modules/cheque/mails/index.php diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index 6922cff6d..56198fb3e 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -491,13 +491,14 @@ {/foreach}

{/if} -
+
+ @@ -509,6 +510,7 @@ + {/foreach} - - - - - - - - +
{l s='Date'} {l s='Payment method'}{l s='Payment source'} {l s='Transaction ID'} {l s='Amount'} {l s='Invoice'}
{dateFormat date=$payment->date_add full=true} {$payment->payment_method|escape:'html':'UTF-8'}{$payment_types[$payment->payment_type]['name']|escape:'html':'UTF-8'} {$payment->transaction_id|escape:'html':'UTF-8'} {displayPrice price=$payment->amount currency=$payment->id_currency} @@ -565,57 +567,91 @@
- {l s='No payment methods are available'} + {l s='No payment records'}
-
- -
- -
-
- 		- - - {foreach from=$payment_methods item=payment_method} - - - - - - - - {if count($invoices_collection) > 0} - - {/if} - - -
+
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+
+
+
+ +
+ + + {foreach from=$payment_methods item=payment_method} + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ {if count($invoices_collection) > 0} + +
+ +
+ {/if} +
+ + +
{if (!$order->valid && sizeof($currencies) > 1)}
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 205b853bb..75fbe8c84 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -33,6 +33,16 @@ abstract class PaymentModuleCore extends Module 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; + } + public function install() { if (!parent::install()) { @@ -305,6 +315,7 @@ abstract class PaymentModuleCore extends Module $order->secure_key = ($secure_key ? pSQL($secure_key) : pSQL($this->context->customer->secure_key)); $order->payment = $payment_method; + $order->payment_type = $this->payment_type; if (isset($this->name)) { $order->module = $this->name; } @@ -432,7 +443,7 @@ abstract class PaymentModuleCore extends Module $transaction_id = null; } - if (!isset($order) || !Validate::isLoadedObject($order) || !$order->addOrderPayment($amount_paid, null, $transaction_id)) { + if (!isset($order) || !Validate::isLoadedObject($order) || !$order->addOrderPayment($amount_paid, null, PaymentModule::PAYMENT_TYPE_ONLINE , $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 548e58610..e8fabab7a 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -71,6 +71,9 @@ class OrderCore extends ObjectModel /** @var string Payment method */ public $payment; + /** @var string Payment type */ + public $payment_type; + /** @var string Payment module */ public $module; @@ -210,6 +213,7 @@ class OrderCore extends ObjectModel 'current_state' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'secure_key' => array('type' => self::TYPE_STRING, 'validate' => 'isMd5'), 'payment' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true), + 'payment_type' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), 'module' => array('type' => self::TYPE_STRING, 'validate' => 'isModuleName', 'required' => true), 'recyclable' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), 'gift' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), @@ -885,7 +889,7 @@ class OrderCore extends ObjectModel public function isInPreparation() { - return count($this->getHistory((int)$this->id_lang, Configuration::get('PS_OS_PREPARATION'))); + return count($this->getHistory((int)$this->id_lang, Configuration::get('PS_OS_PROCESSING'))); } /** @@ -1608,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_WS_PAYMENT'), $this->total_paid, $this->payment, null, array(), null, false, $customer->secure_key); + $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); $this->id = $payment_module->currentOrder; return true; } @@ -1722,7 +1726,7 @@ class OrderCore extends ObjectModel * @param OrderInvoice $order_invoice * @return bool */ - public function addOrderPayment($amount_paid, $payment_method = null, $payment_transaction_id = null, $currency = null, $date = null, $order_invoice = null) + public function addOrderPayment($amount_paid, $payment_method = null, $payment_type = null, $payment_transaction_id = null, $currency = null, $date = null, $order_invoice = null) { $order_payment = new OrderPayment(); $order_payment->order_reference = $this->reference; @@ -1731,6 +1735,7 @@ class OrderCore extends ObjectModel $order_payment->conversion_rate = ($currency ? $currency->conversion_rate : 1); // if payment_method is define, we used this $order_payment->payment_method = ($payment_method ? $payment_method : $this->payment); + $order_payment->payment_type = ($payment_type ? $payment_type : $this->payment_type); $order_payment->transaction_id = $payment_transaction_id; $order_payment->amount = $amount_paid; $order_payment->date_add = ($date ? $date : null); diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php index 2da4bf501..d9f47288c 100644 --- a/classes/order/OrderHistory.php +++ b/classes/order/OrderHistory.php @@ -312,7 +312,7 @@ class OrderHistoryCore extends ObjectModel } // set orders as paid - if ($new_os->paid == 1) { + if ($new_os->paid == 1 || (Configuration::get('PS_OS_PARTIAL_PAYMENT') == $new_os->id && $new_os->logable == 1)) { $invoices = $order->getInvoicesCollection(); if ($order->total_paid != 0) { $payment_method = Module::getInstanceByName($order->module); @@ -322,10 +322,16 @@ 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; + } $payment = new OrderPayment(); $payment->order_reference = Tools::substr($order->reference, 0, 9); $payment->id_currency = $order->id_currency; $payment->amount = $rest_paid; + $payment->payment_type = $order->payment_type; if ($order->total_paid != 0) { $payment->payment_method = $payment_method->displayName; @@ -410,7 +416,7 @@ class OrderHistoryCore extends ObjectModel public function sendEmail($order, $template_vars = false) { $result = Db::getInstance()->getRow(' - SELECT osl.`template`, c.`lastname`, c.`firstname`, osl.`name` AS osname, c.`email`, os.`module_name`, os.`id_order_state`, os.`pdf_invoice`, os.`pdf_delivery` + SELECT osl.`template`, c.`lastname`, c.`firstname`, osl.`name` AS osname, c.`email`, o.`module` as `module_name`, os.`id_order_state`, os.`pdf_invoice`, os.`pdf_delivery` FROM `'._DB_PREFIX_.'order_history` oh LEFT JOIN `'._DB_PREFIX_.'orders` o ON oh.`id_order` = o.`id_order` LEFT JOIN `'._DB_PREFIX_.'customer` c ON o.`id_customer` = c.`id_customer` @@ -425,13 +431,17 @@ class OrderHistoryCore extends ObjectModel '{lastname}' => $result['lastname'], '{firstname}' => $result['firstname'], '{id_order}' => (int)$this->id_order, - '{order_name}' => $order->getUniqReference() + '{order_name}' => $order->getUniqReference(), + '{payment_module_detail_html}' => '', + '{payment_module_detail_text}' => '', + '{payment_method}' => '', ); if ($result['module_name']) { $module = Module::getInstanceByName($result['module_name']); - if (Validate::isLoadedObject($module) && isset($module->extra_mail_vars) && is_array($module->extra_mail_vars)) { - $data = array_merge($data, $module->extra_mail_vars); + if (Validate::isLoadedObject($module) && method_exists($module, 'getMailContent')) { + $data = array_merge($data, $module->getMailContent($result['id_order_state'], $order->id_lang)); + $data['{payment_method}'] = $module->displayName; } } diff --git a/classes/order/OrderPayment.php b/classes/order/OrderPayment.php index 748d8e280..bbd69a3c1 100644 --- a/classes/order/OrderPayment.php +++ b/classes/order/OrderPayment.php @@ -30,6 +30,7 @@ class OrderPaymentCore extends ObjectModel public $id_currency; public $amount; public $payment_method; + public $payment_type; public $conversion_rate; public $transaction_id; public $card_number; @@ -49,6 +50,7 @@ class OrderPaymentCore extends ObjectModel 'id_currency' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isNegativePrice', 'required' => true), 'payment_method' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName'), + 'payment_type' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'conversion_rate' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'), 'transaction_id' => array('type' => self::TYPE_STRING, 'validate' => 'isAnything', 'size' => 254), 'card_number' => array('type' => self::TYPE_STRING, 'validate' => 'isAnything', 'size' => 254), diff --git a/config/config.inc.php b/config/config.inc.php index c9b3f60ca..674ddc01e 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -238,21 +238,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_CHEQUE_', Configuration::get('PS_OS_CHEQUE')); +define('_PS_OS_AWATING_', Configuration::get('PS_OS_AWATING')); define('_PS_OS_PAYMENT_', Configuration::get('PS_OS_PAYMENT')); -define('_PS_OS_PREPARATION_', Configuration::get('PS_OS_PREPARATION')); -define('_PS_OS_SHIPPING_', Configuration::get('PS_OS_SHIPPING')); -define('_PS_OS_DELIVERED_', Configuration::get('PS_OS_DELIVERED')); +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_OUTOFSTOCK_', Configuration::get('PS_OS_OUTOFSTOCK')); -define('_PS_OS_OUTOFSTOCK_PAID_', Configuration::get('PS_OS_OUTOFSTOCK_PAID')); -define('_PS_OS_OUTOFSTOCK_UNPAID_', Configuration::get('PS_OS_OUTOFSTOCK_UNPAID')); -define('_PS_OS_BANKWIRE_', Configuration::get('PS_OS_BANKWIRE')); -define('_PS_OS_PAYPAL_', Configuration::get('PS_OS_PAYPAL')); -define('_PS_OS_WS_PAYMENT_', Configuration::get('PS_OS_WS_PAYMENT')); -define('_PS_OS_COD_VALIDATION_', Configuration::get('PS_OS_COD_VALIDATION')); +define('_PS_OS_OVERBOOKING_', Configuration::get('PS_OS_OVERBOOKING')); +define('_PS_OS_PARTIAL_PAYMENT_', Configuration::get('PS_OS_PARTIAL_PAYMENT')); 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 423285e70..36f4505b6 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -159,7 +159,7 @@ class AdminOrdersControllerCore extends AdminController 'remove_onclick' => true ) )); - + $this->shopLinkType = 'shop'; $this->shopShareDatas = Shop::SHARE_ORDER; @@ -232,8 +232,7 @@ class AdminOrdersControllerCore extends AdminController $this->addJqueryPlugin(array('autocomplete', 'fancybox', 'typewatch')); $defaults_order_state = array( - 'cheque' => (int)Configuration::get('PS_OS_CHEQUE'), - 'bankwire' => (int)Configuration::get('PS_OS_BANKWIRE'), + 'awating' => (int)Configuration::get('PS_OS_AWATING'), 'other' => (int)Configuration::get('PS_OS_PAYMENT')); $payment_modules = array(); foreach (PaymentModule::getInstalledPaymentModules() as $p_module) { @@ -321,7 +320,7 @@ class AdminOrdersControllerCore extends AdminController $this->addJqueryUI('ui.datepicker'); $this->addJS(_PS_JS_DIR_.'vendor/d3.v3.min.js'); - + if ($this->tabAccess['edit'] == 1 && $this->display == 'view') { $this->addJS(_PS_JS_DIR_.'admin/orders.js'); $this->addJS(_PS_JS_DIR_.'tools.js'); @@ -780,6 +779,7 @@ class AdminOrdersControllerCore extends AdminController if ($this->tabAccess['edit'] === '1') { $amount = str_replace(',', '.', Tools::getValue('payment_amount')); $currency = new Currency(Tools::getValue('payment_currency')); + $payment_type = Tools::getValue('payment_type'); $order_has_invoice = $order->hasInvoice(); if ($order_has_invoice) { $order_invoice = new OrderInvoice(Tools::getValue('payment_invoice')); @@ -801,8 +801,18 @@ class AdminOrdersControllerCore extends AdminController $this->errors[] = Tools::displayError('The invoice is invalid.'); } elseif (!Validate::isDate(Tools::getValue('payment_date'))) { $this->errors[] = Tools::displayError('The date is invalid'); + } elseif (!Validate::isUnsignedId($payment_type)) { + $this->errors[] = Tools::displayError('Payment source is invalid'); } else { - if (!$order->addOrderPayment($amount, Tools::getValue('payment_method'), Tools::getValue('payment_transaction_id'), $currency, Tools::getValue('payment_date'), $order_invoice)) { + if (!$order->addOrderPayment( + $amount, + Tools::getValue('payment_method'), + $payment_type, + Tools::getValue('payment_transaction_id'), + $currency, + Tools::getValue('payment_date'), + $order_invoice + )) { $this->errors[] = Tools::displayError('An error occurred during payment.'); } else { Tools::redirectAdmin(self::$currentIndex.'&id_order='.$order->id.'&vieworder&conf=4&token='.$this->token); @@ -1568,6 +1578,7 @@ class AdminOrdersControllerCore extends AdminController 'invoices_collection' => $order->getInvoicesCollection(), 'not_paid_invoices_collection' => $order->getNotPaidInvoicesCollection(), 'payment_methods' => $payment_methods, + 'payment_types' => $this->getPaymentsTypes(), 'invoice_management_active' => Configuration::get('PS_INVOICE', null, null, $order->id_shop), 'display_warehouse' => (int)Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'), 'HOOK_CONTENT_ORDER' => Hook::exec( @@ -2320,7 +2331,7 @@ class AdminOrdersControllerCore extends AdminController $product_quantity = (int) $obj_booking_detail->getNumberOfDays($new_date_from, $new_date_to); $old_product_quantity = (int) $obj_booking_detail->getNumberOfDays($old_date_from, $old_date_to); $qty_diff = $product_quantity - $old_product_quantity; - + /*By webkul to validate fields before deleting the cart and order data form the tables*/ if ($id_hotel == '') { die(json_encode(array( @@ -2991,6 +3002,27 @@ class AdminOrdersControllerCore extends AdminController return $products; } + protected function getPaymentsTypes() + { + return array( + PaymentModule::PAYMENT_TYPE_ONLINE => array( + 'key' => 'PAYMENT_TYPE_ONLINE', + 'value' => PaymentModule::PAYMENT_TYPE_ONLINE, + 'name' => $this->l('Online') + ), + PaymentModule::PAYMENT_TYPE_PAY_AT_HOTEL => array( + 'key' => 'PAYMENT_TYPE_PAY_AT_HOTEL', + 'value' => PaymentModule::PAYMENT_TYPE_PAY_AT_HOTEL, + 'name' => $this->l('Pay at hotel') + ), + PaymentModule::PAYMENT_TYPE_REMOTE_PAYMENT => array( + 'key' => 'PAYMENT_TYPE_REMOTE_PAYMENT', + 'value' => PaymentModule::PAYMENT_TYPE_REMOTE_PAYMENT, + 'name' => $this->l('Remote Payment') + ), + ); + } + /** * @param OrderDetail $order_detail * @param int $qty_cancel_product diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php index 97a66c919..9f05ead7a 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_AWAITING_REMOTE_PAYMENT'); + $orderStatus = Configuration::get('PS_OS_AWATING'); } else { $orderStatus = Configuration::get('PS_OS_PAYMENT'); } diff --git a/install/data/db_structure.sql b/install/data/db_structure.sql index a3aa8160d..a89cbc9e0 100644 --- a/install/data/db_structure.sql +++ b/install/data/db_structure.sql @@ -1106,6 +1106,7 @@ CREATE TABLE `PREFIX_orders` ( `current_state` int(10) unsigned NOT NULL, `secure_key` varchar(32) NOT NULL DEFAULT '-1', `payment` varchar(255) NOT NULL, + `payment_type` tinyint(10) UNSIGNED NOT NULL, `conversion_rate` decimal(13,6) NOT NULL DEFAULT 1, `module` varchar(255) DEFAULT NULL, `recyclable` tinyint(1) unsigned NOT NULL DEFAULT '0', @@ -1446,6 +1447,7 @@ CREATE TABLE `PREFIX_order_payment` ( `id_currency` INT UNSIGNED NOT NULL, `amount` DECIMAL(10,2) NOT NULL, `payment_method` varchar(255) NOT NULL, + `payment_type` INT UNSIGNED NOT NULL, `conversion_rate` decimal(13,6) NOT NULL DEFAULT 1, `transaction_id` VARCHAR(254) NULL, `card_number` VARCHAR(254) NULL, diff --git a/install/data/img/os/Awaiting.gif b/install/data/img/os/Awaiting.gif new file mode 100644 index 0000000000000000000000000000000000000000..2780d81e7e8126cb795a4400e331a4c2ad4fec98 GIT binary patch literal 1030 zcmd^;?N3s10EI7Esjbu$UlJ-TTc*~mT&c8X4ihU&%vDQQV`j_N)=F!Zt<7bbt;||2 zt(HL+ikX@dSmr=cL_q~{Itj(JM1133xEHv*++X^4boT7o`FcK_l+>ef@oYcH4=RNq zcN8N2manVy)w~E8dQBdw4(fXsr{nnRxc>Uj{)3!&WevTbM<4ze@$1WOeOv zXwF*IS@;kOAIict7Z5euI?Og}uA$oNb`2XJxrC2g!AGyzwK?`*mmOnynD(Y^tiU#L z1JmBe#|rR?n|5uXU3bShe#bFh1F^kvq`Wu7>u zO7ZE(>i_nR3VP7tZM_F!RvxMQRJys@1uW02Hkk>Rs@}i2unZC4>Ya^+(m(-D`t3&Z~ zwN0M&X|H{fLyz2;^f~ovi@I6L`6Qtf*Q{qX=RQb51ECt5?0Q@#-N?5 z%yfB;s{RZw+#QqOEwA!kmoLglp3A7+kbI^>@-mULA@fu0-i#8`)4*-HJ`wNtrj}Pm zUXAcNvN5U4(>Hh6?*)>P2;rJawasV2QC2eVJ;NHmWm(%KlZEIme&2tgzgME?hG CC(m{O literal 0 HcmV?d00001 diff --git a/install/data/img/os/Overbooking.gif b/install/data/img/os/Overbooking.gif new file mode 100644 index 0000000000000000000000000000000000000000..b8224b98f8d580f9e0e651a89ef79c930ad9202f GIT binary patch literal 1070 zcmeH`?@JS50Dv#uXssE`mL;f76SEjmaFEeOR?A;4gpk;W6%|KC?1RO92pN+0Cd;m& zaahQC;5vpJ$EdZ$#u#{9qsCYvFMW{rL#<=|;1U`yrt)Gx{)ayH`~lC02cFLEj<&;> zoRpLLIY!|%0ulk3@PP5DiJNvo+eF6p{N2PQqnGSLfAhzfyWQBClC*2Gy_ z&KX=R&nZ4p5y`T_Tn2$C!%Di4;lxxvIh%x~yivv=n#b!T7^U-ZFHoSF4SI$xP~+qj zlC!+HVBlrUNl9D?@~NPiqH$40izu0cs-k)aR8dRgGDeC=P|~tyBnyH!;tFXb7?I6& zf)@Zc2-v7s%<|@vNslv^qlX^O%qmmJf zF;HRD3{rCfUc=m^jx`VYmJ~E3D3H$}RK(507LZ^CNhFIQX4J(_=z5F^NDN$nfe~3Q z7$HRu#rx!#%v={)DKBV1oJHJ(E)Sjp9sb81M=r>qOL$cQDDud}bL7 zIg>1<&0J8MO8H_CsyG2TcWJ>r5zj2F1N0Son?e_Eh%)ncWnG0OAT z`uB-;+b^o|d+n1`T0@tu@qFv8){jGnda4hu9H6=?_iZq*wNZQLtE?AV{Hx{9Z+Eyt z?!Niwmd2?DdW&c7;fe5Ab3bwZxH$8w=J@U=>g=?(>Cx6>gXuQ^hiP+ON(hm644*4>0bVBjb0sSJc0-!J=N*z?8&(x>T@s zb)SBGBihpWX#X7uoz$nUleN7o{vmv|C;axtoH{=A)M2eYGiko5w1%5nZng@?!(S*{ zrDLYGdLC3w+wc3`-iNW?nxnqax&HBHN5OH?x!At@)q|<}Bd^)p+dz9g=&--o{A}Dg OeXn!Nl@C=m>d0^ODTd4d literal 0 HcmV?d00001 diff --git a/install/data/img/os/Overbooking_unpaid.gif b/install/data/img/os/Overbooking_unpaid.gif new file mode 100644 index 0000000000000000000000000000000000000000..b8224b98f8d580f9e0e651a89ef79c930ad9202f GIT binary patch literal 1070 zcmeH`?@JS50Dv#uXssE`mL;f76SEjmaFEeOR?A;4gpk;W6%|KC?1RO92pN+0Cd;m& zaahQC;5vpJ$EdZ$#u#{9qsCYvFMW{rL#<=|;1U`yrt)Gx{)ayH`~lC02cFLEj<&;> zoRpLLIY!|%0ulk3@PP5DiJNvo+eF6p{N2PQqnGSLfAhzfyWQBClC*2Gy_ z&KX=R&nZ4p5y`T_Tn2$C!%Di4;lxxvIh%x~yivv=n#b!T7^U-ZFHoSF4SI$xP~+qj zlC!+HVBlrUNl9D?@~NPiqH$40izu0cs-k)aR8dRgGDeC=P|~tyBnyH!;tFXb7?I6& zf)@Zc2-v7s%<|@vNslv^qlX^O%qmmJf zF;HRD3{rCfUc=m^jx`VYmJ~E3D3H$}RK(507LZ^CNhFIQX4J(_=z5F^NDN$nfe~3Q z7$HRu#rx!#%v={)DKBV1oJHJ(E)Sjp9sb81M=r>qOL$cQDDud}bL7 zIg>1<&0J8MO8H_CsyG2TcWJ>r5zj2F1N0Son?e_Eh%)ncWnG0OAT z`uB-;+b^o|d+n1`T0@tu@qFv8){jGnda4hu9H6=?_iZq*wNZQLtE?AV{Hx{9Z+Eyt z?!Niwmd2?DdW&c7;fe5Ab3bwZxH$8w=J@U=>g=?(>Cx6>gXuQ^hiP+ON(hm644*4>0bVBjb0sSJc0-!J=N*z?8&(x>T@s zb)SBGBihpWX#X7uoz$nUleN7o{vmv|C;axtoH{=A)M2eYGiko5w1%5nZng@?!(S*{ zrDLYGdLC3w+wc3`-iNW?nxnqax&HBHN5OH?x!At@)q|<}Bd^)p+dz9g=&--o{A}Dg OeXn!Nl@C=m>d0^ODTd4d literal 0 HcmV?d00001 diff --git a/install/data/img/os/Processing_in_progress.gif b/install/data/img/os/Processing_in_progress.gif new file mode 100644 index 0000000000000000000000000000000000000000..56d6cefc50d660779daca2a11fd78675b4a853be GIT binary patch literal 1046 zcmdUu{Zra?0LPh9Ls!n6Kdif5Ti3(3YrBlQQs-9Ri74za*<9Wptk|r()~?fPHS20K z`Ob+?BPMliHtP;;;t2zRjdiH#S44b5PGCG}e39ob&kBk-KINa$`(F3@`Sr`Yj9OYy zcp)2?jk}4%)ovE6nh#F29#(f8Qn%+#vWc48Z)-Z=n&RebelApZ7R}y0y3|dy^YiU} z1N|Wrg{yxJZzGxO-wn)ENR4^9hm#p&7 z4Ug(9(r>MbtLR^lQ&{B?kzJxPm$cX+qPZU*_eyA91>_kbc@<>O-xZ!=N=yOSAJ)2L zmz~44j=?KFWvLG#`NzvJ6(ux5NsLkw2qmJdvMKA(k*`ps&NlL+T~%*WU5ia#ip^b* zY3pO!>p*`sWvEY?ez1(OmL|FA80LxY~`!z5& zb1SH64ryAPa~!w!H;;}J&~ZHTT|RwRWUeVZ+Y-^WhP7>Lde)k;HED&D=5}Chi|E-= z12<-5CoP=RKiqZ8@80eI<$rA2l@e4rjg5_@D-~mSu zaP}ln{>CyNxCemeKJfI1QQ4Y99I+3_ox>ZB2f#N7yfT121U@;y9s^7P0z*;f2nZ@c zNVyrD03jrS%_IX;8~#}kQpYgeT5ukOCqZ-?L}$V3G+0>xD|)bM1Thm>HG{YX#1}W? z_NQ@sD!%-5-JV)UH`iUMq#LBd0K{?s&%K<$r*D-X+S1l1aD)}yHo_i4LuT$N{H{!R z@M6}BSv9$tNAY7bZ+_H5B)<@8+V}dw52`bE^tP1Tqh34Lb^s62GDrhC-+76zsJh>1 zJkXa2kHW&!U+Q)r|C7NzO#ewzqWc;m3(t0WK2eI9xA&KwZ=!ja`^E+5B_*gxSF>~P z{#+O@ud%^`bD}dh(pGuYXI_J@I2e@-rr@lw^cy~MgUZ>P^U{+%5|sX+y7%1=8y7xf z-6CY|&Mn*pmA02ZIzjy&A!NYM=4Z_hJ>W;D9PEL6V+Z|k2c_n{srma6A}Ob literal 0 HcmV?d00001 diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml index eaa524deb..b549e3245 100644 --- a/install/data/xml/configuration.xml +++ b/install/data/xml/configuration.xml @@ -371,13 +371,13 @@ 1 - + 1 2 - + 3 @@ -392,12 +392,12 @@ 7 - + + 10 @@ -407,14 +407,23 @@ 11 - - 12 + + 9 - + + 10 + + + + 7 + + + 11 - 14 + 8 0 diff --git a/install/data/xml/order_state.xml b/install/data/xml/order_state.xml index 7923ec57c..cbc8a1978 100644 --- a/install/data/xml/order_state.xml +++ b/install/data/xml/order_state.xml @@ -3,7 +3,6 @@ - @@ -15,47 +14,27 @@ - diff --git a/install/langs/bg/data/order_state.xml b/install/langs/bg/data/order_state.xml index 460756457..516a2e42d 100644 --- a/install/langs/bg/data/order_state.xml +++ b/install/langs/bg/data/order_state.xml @@ -1,8 +1,8 @@ - - Awaiting check payment - + + Awaiting payment + Payment accepted @@ -24,22 +24,6 @@ Payment error - - On backorder (paid) - - - - On backorder (not paid) - - - - Awaiting bank wire payment - - - - Awaiting PayPal payment -