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

[-] BO : #PSCFV-3055 - Part 1 : Improving displaying of resume cart (payment step)

Browse Source 
[-] BO : #PSCFV-3055 - Part 1 : If there is a rules with free shipping, shipping prices are not displayed

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16234 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-07-05 12:40:40 +00:00
parent 98a0e4ddc1
commit a1311dba2d
7 changed files with 77 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderController.php
+16 -3
View File
@@ -238,7 +238,7 @@ class OrderControllerCore extends ParentOrderController
}
}
/*
/**
* Manage address
*/
public function processAddress()
@@ -328,8 +328,21 @@ class OrderControllerCore extends ParentOrderController
parent::_assignCarrier();
// Assign wrapping and TOS
$this->_assignWrappingAndTOS();
$this->context->smarty->assign('is_guest', (isset($this->context->customer->is_guest) ? $this->context->customer->is_guest : 0));
// If a rule offer free-shipping, force hidding shipping prices
$free_shipping = false;
foreach ($this->context->cart->getCartRules() as $rule)
if ($rule['free_shipping'])
{
$free_shipping = true;
break;
}
$this->context->smarty->assign(
array(
'free_shipping' => $free_shipping,
'is_guest' => (isset($this->context->customer->is_guest) ? $this->context->customer->is_guest : 0)
));
}
/**