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

// Revert normalization

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-11 10:20:59 +00:00
parent a01a13274a
commit d1d4d57eca
48 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/ParentOrderController.php
+3 -3
View File
@@ -141,7 +141,7 @@ class ParentOrderControllerCore extends FrontController
if ((Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 AND Tools::getValue('step') == 1) OR Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
$this->addJS(_THEME_JS_DIR_.'order-address.js');
$this->addJS(_PS_JS_DIR_.'jquery/jquery.fancybox-1.3.4.js');
if (Configuration::get('PS_BLOCK_CART_AJAX') OR Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')) OR Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
{
$this->addJS(_THEME_JS_DIR_.'cart-summary.js');
$this->addJS(_PS_JS_DIR_.'jquery/jquery-typewatch.pack.js');
@@ -200,7 +200,7 @@ class ParentOrderControllerCore extends FrontController
{
$this->context->cart->recyclable = (int)(Tools::getValue('recyclable'));
$this->context->cart->gift = (int)(Tools::getValue('gift'));
if (Tools::getValue('gift'))
if ((int)(Tools::getValue('gift')))
{
if (!Validate::isMessage($_POST['gift_message']))
$this->errors[] = Tools::displayError('Invalid gift message');
@@ -427,7 +427,7 @@ class ParentOrderControllerCore extends FrontController
if (sizeof($carriers))
{
$defaultCarrierIsPresent = false;
if ($this->context->cart->id_carrier)
if ((int)$this->context->cart->id_carrier != 0)
foreach ($carriers AS $carrier)
if ($carrier['id_carrier'] == (int)$this->context->cart->id_carrier)
$defaultCarrierIsPresent = true;