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

// Fix installer && not displaying Shop fields on specific price when multishop is disabled

Browse Source
This commit is contained in:
rGaillard committed 2011-12-21 10:36:54 +00:00
1 parent cb33f1b292
commit af848cfd28
3 files changed
+18 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/template/products/prices.tpl
+14 -11
View File
@@ -260,16 +260,19 @@ jQuery(document).ready(Customer.init);
{/foreach} {/foreach}
</script> </script>
<div id="add_specific_price" style="display: none;"> <div id="add_specific_price" style="display: none;">
<input type="hidden" name="sp_id_shop" value="0" /> {if !$multi_shop}
<label>{l s='For:'}</label> <input type="hidden" name="sp_id_shop" value="0" />
<div class="margin-form"> {else}
<select name="sp_id_shop"> <label>{l s='For:'}</label>
<option value="0">{l s='All shops'}</option> <div class="margin-form">
{foreach from=$shops item=shop} <select name="sp_id_shop">
<option value="{$shop.id_shop}">{$shop.name|htmlentitiesUTF8}</option> <option value="0">{l s='All shops'}</option>
{/foreach} {foreach from=$shops item=shop}
</select> <option value="{$shop.id_shop}">{$shop.name|htmlentitiesUTF8}</option>
&gt; {/foreach}
</select>
&gt;
{/if}
<select name="sp_id_currency" id="spm_currency_0" onchange="changeCurrencySpecificPrice(0);"> <select name="sp_id_currency" id="spm_currency_0" onchange="changeCurrencySpecificPrice(0);">
<option value="0">{l s='All currencies'}</option> <option value="0">{l s='All currencies'}</option>
{foreach from=$currencies item=curr} {foreach from=$currencies item=curr}
@@ -380,7 +383,7 @@ jQuery(document).ready(Customer.init);
<tr> <tr>
<th class="cell border" style="width: 12%;">{l s='Rule'}</th> <th class="cell border" style="width: 12%;">{l s='Rule'}</th>
<th class="cell border" style="width: 12%;">{l s='Combination'}</th> <th class="cell border" style="width: 12%;">{l s='Combination'}</th>
<th class="cell border" style="width: 12%;">{l s='Shop'}</th> {if $multi_shop}<th class="cell border" style="width: 12%;">{l s='Shop'}</th>{/if}
<th class="cell border" style="width: 12%;">{l s='Currency'}</th> <th class="cell border" style="width: 12%;">{l s='Currency'}</th>
<th class="cell border" style="width: 11%;">{l s='Country'}</th> <th class="cell border" style="width: 11%;">{l s='Country'}</th>
<th class="cell border" style="width: 13%;">{l s='Group'}</th> <th class="cell border" style="width: 13%;">{l s='Group'}</th>
controllers/admin/AdminProductsController.php
+3 -2
View File
@@ -2589,7 +2589,8 @@ class AdminProductsControllerCore extends AdminController
'groups' => $groups, 'groups' => $groups,
'combinations' => $combinations, 'combinations' => $combinations,
'product' => $product, 'product' => $product,
'link' => new Link 'multi_shop' => Shop::isFeatureActive(),
'link' => new Link()
)); ));
} }
else else
@@ -2838,7 +2839,7 @@ class AdminProductsControllerCore extends AdminController
<tr '.($i%2 ? 'class="alt_row"' : '').'> <tr '.($i%2 ? 'class="alt_row"' : '').'>
<td class="cell border">'.$rule_name.'</td> <td class="cell border">'.$rule_name.'</td>
<td class="cell border">'.$attributes_name.'</td> <td class="cell border">'.$attributes_name.'</td>
<td class="cell border">'.($specific_price['id_shop'] ? $shops[$specific_price['id_shop']]['name'] : $this->l('All shops')).'</td> '.(Shop::isFeatureActive() ? '<td class="cell border">'.($specific_price['id_shop'] ? $shops[$specific_price['id_shop']]['name'] : $this->l('All shops')).'</td>' : '').'
<td class="cell border">'.($specific_price['id_currency'] ? $currencies[$specific_price['id_currency']]['name'] : $this->l('All currencies')).'</td> <td class="cell border">'.($specific_price['id_currency'] ? $currencies[$specific_price['id_currency']]['name'] : $this->l('All currencies')).'</td>
<td class="cell border">'.($specific_price['id_country'] ? $countries[$specific_price['id_country']]['name'] : $this->l('All countries')).'</td> <td class="cell border">'.($specific_price['id_country'] ? $countries[$specific_price['id_country']]['name'] : $this->l('All countries')).'</td>
<td class="cell border">'.($specific_price['id_group'] ? $groups[$specific_price['id_group']]['name'] : $this->l('All groups')).'</td> <td class="cell border">'.($specific_price['id_group'] ? $groups[$specific_price['id_group']]['name'] : $this->l('All groups')).'</td>
install-dev/sql/db_settings_lite.sql
+1 -2
View File
@@ -1606,5 +1606,4 @@ INSERT INTO `PREFIX_supply_order_state_lang` (`id_supply_order_state`, `id_lang`
(6, 4, 'order fenced'), (6, 4, 'order fenced'),
(6, 5, 'order fenced'); (6, 5, 'order fenced');
INSERT INTO `PREFIX_category_shop` (`id_category`, `id_shop`) VALUES INSERT INTO `PREFIX_category_shop` (`id_category`, `id_shop`) VALUES (1, 1);
(1, 1);