[*] BO : #PSTEST-381 - Checkbox "Send available products first" must not be present if there is only product "out of stock", or to check states of virtual products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12962 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-02-03 09:46:34 +00:00
parent 5ba2e5e330
commit 14c318bead
4 changed files with 35 additions and 7 deletions
@@ -292,6 +292,9 @@ class ParentOrderControllerCore extends FrontController
else
$product['is_discounted'] = $product['price_without_specific_price'] != $product['price_wt'];
}
$show_option_allow_sparate_package = !$this->context->cart->isAllProductsInStock(true)
&& Configuration::get('PS_SHIP_WHEN_AVAILABLE');
$this->context->smarty->assign($summary);
$this->context->smarty->assign(array(
@@ -310,6 +313,8 @@ 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,
));
$this->context->smarty->assign(array(