dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #352 from sdevilcry/development

Browse Source 
[-] CORE : Fix issue after a payment redirection error, delivery_option is not sent
This commit is contained in:
Gregory Roussac committed 2013-07-25 06:11:51 -07:00
2 parents bff2844adf 312e16a926
commit 3896453c7c
1 file changed
+6 -2
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderController.php
+6 -2
View File
@@ -155,14 +155,18 @@ class OrderControllerCore extends ParentOrderController
Tools::redirect('index.php?controller=order&step=2'); Tools::redirect('index.php?controller=order&step=2');
Context::getContext()->cookie->check_cgv = true; Context::getContext()->cookie->check_cgv = true;
// Check the delivery option is setted // Check the delivery option is set
if (!$this->context->cart->isVirtualCart()) if (!$this->context->cart->isVirtualCart())
{ {
if (!Tools::getValue('delivery_option') && !Tools::getValue('id_carrier') && !$this->context->cart->delivery_option && !$this->context->cart->id_carrier) if (!Tools::getValue('delivery_option') && !Tools::getValue('id_carrier') && !$this->context->cart->delivery_option && !$this->context->cart->id_carrier)
Tools::redirect('index.php?controller=order&step=2'); Tools::redirect('index.php?controller=order&step=2');
elseif (!Tools::getValue('id_carrier') && !$this->context->cart->id_carrier) elseif (!Tools::getValue('id_carrier') && !$this->context->cart->id_carrier)
{ {
foreach (Tools::getValue('delivery_option') as $delivery_option) $deliveries_options = Tools::getValue('delivery_option');
if (!$deliveries_options) {
$deliveries_options = $this->context->cart->delivery_option;
}
foreach ($deliveries_options as $delivery_option)
if (empty($delivery_option)) if (empty($delivery_option))
Tools::redirect('index.php?controller=order&step=2'); Tools::redirect('index.php?controller=order&step=2');
} }