From 3b221c3b446df370c4f036af0b79aaa0763266fe Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Tue, 19 Jun 2012 07:15:40 +0000 Subject: [PATCH] // Correct bad named vars "sparate" instead of "separate" git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16072 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/front/ParentOrderController.php | 4 ++-- themes/default/shopping-cart.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php index f17aee6ae..1785082ff 100644 --- a/controllers/front/ParentOrderController.php +++ b/controllers/front/ParentOrderController.php @@ -295,7 +295,7 @@ class ParentOrderControllerCore extends FrontController $product['is_discounted'] = $product['price_without_specific_price'] != $product['price_wt']; } - $show_option_allow_sparate_package = !$this->context->cart->isAllProductsInStock(true) + $show_option_allow_separate_package = !$this->context->cart->isAllProductsInStock(true) && Configuration::get('PS_SHIP_WHEN_AVAILABLE'); $this->context->smarty->assign($summary); @@ -315,7 +315,7 @@ class ParentOrderControllerCore extends FrontController 'currencyRate' => $this->context->currency->conversion_rate, 'currencyFormat' => $this->context->currency->format, 'currencyBlank' => $this->context->currency->blank, - 'show_option_allow_sparate_package' => $show_option_allow_sparate_package, + 'show_option_allow_separate_package' => $show_option_allow_separate_package, )); diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl index 09155e22b..3a7373c4c 100644 --- a/themes/default/shopping-cart.tpl +++ b/themes/default/shopping-cart.tpl @@ -325,7 +325,7 @@ -{if $show_option_allow_sparate_package} +{if $show_option_allow_separate_package}

allow_seperated_package}checked="checked"{/if} />