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

// Fixed #PSFV-464

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13743 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-02-29 14:45:34 +00:00
parent 625e6824d2
commit 78237c7f48
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/quantities.tpl
+4
View File
@@ -160,7 +160,11 @@
<input {if $product->out_of_stock == 2} checked="checked" {/if} id="out_of_stock_3" type="radio" value="2" class="out_of_stock" name="out_of_stock"> <input {if $product->out_of_stock == 2} checked="checked" {/if} id="out_of_stock_3" type="radio" value="2" class="out_of_stock" name="out_of_stock">
<label id="label_out_of_stock_3" class="t" for="out_of_stock_3"> <label id="label_out_of_stock_3" class="t" for="out_of_stock_3">
{l s='Default'}: {l s='Default'}:
{if $order_out_of_stock == 1}
<i>{l s='Allow orders'}</i>
{else}
<i>{l s='Deny orders'}</i> <i>{l s='Deny orders'}</i>
{/if}
<a class="confirm_leave" href="index.php?tab=AdminPPreferences&token={$token_preferences}"> <a class="confirm_leave" href="index.php?tab=AdminPPreferences&token={$token_preferences}">
{l s='as set in Preferences'} {l s='as set in Preferences'}
</a> </a>
controllers/admin/AdminProductsController.php
+5 -4
View File
@@ -190,7 +190,7 @@ class AdminProductsControllerCore extends AdminController
LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (a.`id_category_default` = cl.`id_category` AND b.`id_lang` = cl.`id_lang`) LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (a.`id_category_default` = cl.`id_category` AND b.`id_lang` = cl.`id_lang`)
LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = a.`id_product` AND i.`cover` = 1) LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = a.`id_product` AND i.`cover` = 1)
LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = a.`id_product`) LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = a.`id_product`)
LEFT JOIN `'._DB_PREFIX_.'product_tax_rules_group_shop` ptrgs ON (a.`id_product` = ptrgs.`id_product` LEFT JOIN `'._DB_PREFIX_.'product_tax_rules_group_shop` ptrgs ON (a.`id_product` = ptrgs.`id_product`
AND ptrgs.id_shop='.(int)$this->context->shop->id.') AND ptrgs.id_shop='.(int)$this->context->shop->id.')
LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (ptrgs.`id_tax_rules_group` = tr.`id_tax_rules_group` LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (ptrgs.`id_tax_rules_group` = tr.`id_tax_rules_group`
AND tr.`id_country` = '.(int)$this->context->country->id.' AND tr.`id_state` = 0) AND tr.`id_country` = '.(int)$this->context->country->id.' AND tr.`id_state` = 0)
@@ -775,7 +775,7 @@ class AdminProductsControllerCore extends AdminController
$to = Tools::getValue('sp_to'); $to = Tools::getValue('sp_to');
if (!$to) if (!$to)
$to = '0000-00-00 00:00:00'; $to = '0000-00-00 00:00:00';
if ($this->_validateSpecificPrice($id_shop, $id_currency, $id_country, $id_group, $id_customer, $price, $from_quantity, $reduction, $reduction_type, $from, $to, $id_product_attribute)) if ($this->_validateSpecificPrice($id_shop, $id_currency, $id_country, $id_group, $id_customer, $price, $from_quantity, $reduction, $reduction_type, $from, $to, $id_product_attribute))
{ {
$specificPrice = new SpecificPrice(); $specificPrice = new SpecificPrice();
@@ -1517,7 +1517,7 @@ class AdminProductsControllerCore extends AdminController
$this->_removeTaxFromEcotax(); $this->_removeTaxFromEcotax();
$this->copyFromPost($object, $this->table); $this->copyFromPost($object, $this->table);
$object->indexed = 0; $object->indexed = 0;
if ($object->update()) if ($object->update())
{ {
$this->addCarriers(); $this->addCarriers();
@@ -3571,6 +3571,7 @@ class AdminProductsControllerCore extends AdminController
'product_designation' => $product_designation, 'product_designation' => $product_designation,
'product' => $obj, 'product' => $obj,
'show_quantities' => $show_quantities, 'show_quantities' => $show_quantities,
'order_out_of_stock' => Configuration::get('PS_ORDER_OUT_OF_STOCK'),
'token_preferences' => Tools::getAdminTokenLite('AdminPPreferences'), 'token_preferences' => Tools::getAdminTokenLite('AdminPPreferences'),
'token' => $this->token, 'token' => $this->token,
'languages' => $languages, 'languages' => $languages,
@@ -3860,7 +3861,7 @@ class AdminProductsControllerCore extends AdminController
{ {
$id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($this->tab_display_module).'\''); $id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($this->tab_display_module).'\'');
$this->tpl_form_vars['custom_form'] = Hook::exec('displayAdminProductsExtra', array(), (int)$id_module); $this->tpl_form_vars['custom_form'] = Hook::exec('displayAdminProductsExtra', array(), (int)$id_module);
} }