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

// Cart rules fixed in admin customers

Browse Source
This commit is contained in:
dMetzger
2011-11-23 19:22:23 +00:00
parent 34c5a7a71f
commit d35d751c88
3 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/customers/view.tpl
+6 -10
View File
@@ -296,29 +296,25 @@
{/if} {/if}
<div class="clear">&nbsp;</div> <div class="clear">&nbsp;</div>
<h2>{l s='Discounts'} ({count($discounts)})</h2> <h2>{l s='Vouchers'} ({count($discounts)})</h2>
{if count($discounts)} {if count($discounts)}
<table cellspacing="0" cellpadding="0" class="table"> <table cellspacing="0" cellpadding="0" class="table">
<tr> <tr>
<th>{l s='ID'}</th> <th>{l s='ID'}</th>
<th>{l s='Code'}</th> <th>{l s='Code'}</th>
<th>{l s='Type'}</th> <th>{l s='Name'}</th>
<th>{l s='Value'}</th>
<th>{l s='Qty available'}</th>
<th>{l s='Status'}</th> <th>{l s='Status'}</th>
<th>{l s='Actions'}</th> <th>{l s='Actions'}</th>
</tr> </tr>
{foreach $discounts AS $key => $discount} {foreach $discounts AS $key => $discount}
<tr {if $key %2}class="alt_row"{/if}> <tr {if $key %2}class="alt_row"{/if}>
<td align="center">{$discount['id_discount']}</td> <td align="center">{$discount['id_cart_rule']}</td>
<td>{$discount['code']}</td>
<td>{$discount['name']}</td> <td>{$discount['name']}</td>
<td>{$discount['type']}</td>
<td align="right">{$discount['value']}</td>
<td align="center">{$discount['quantity_for_user']}</td>
<td align="center"><img src="../img/admin/{if $discount['active']}enabled.gif{else}disabled.gif{/if}" alt="{l s='Status'}" title="{l s='Status'}" /></td> <td align="center"><img src="../img/admin/{if $discount['active']}enabled.gif{else}disabled.gif{/if}" alt="{l s='Status'}" title="{l s='Status'}" /></td>
<td align="center"> <td align="center">
<a href="?tab=AdminDiscounts&id_discount={$discount['id_discount']}&adddiscount&token={getAdminToken tab='AdminDiscounts'}"><img src="../img/admin/edit.gif" /></a> <a href="?tab=AdminCartRules&id_cart_rule={$discount['id_cart_rule']}&addcart_rule&token={getAdminToken tab='AdminCartRules'}"><img src="../img/admin/edit.gif" /></a>
<a href="?tab=AdminDiscounts&id_discount={$discount['id_discount']}&deletediscount&token={getAdminToken tab='AdminDiscounts'}"><img src="../img/admin/delete.gif" /></a> <a href="?tab=AdminCartRules&id_cart_rule={$discount['id_cart_rule']}&deletecart_rule&token={getAdminToken tab='AdminCartRules'}"><img src="../img/admin/delete.gif" /></a>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}
classes/CartRule.php
+1 -1
View File
@@ -192,7 +192,7 @@ class CartRuleCore extends ObjectModel
if (!CartRule::isFeatureActive()) if (!CartRule::isFeatureActive())
return array(); return array();
Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT * SELECT *
FROM `'._DB_PREFIX_.'cart_rule` cr FROM `'._DB_PREFIX_.'cart_rule` cr
LEFT JOIN `'._DB_PREFIX_.'cart_rule_lang` crl ON (cr.`id_cart_rule` = crl.`id_cart_rule` AND crl.`id_lang` = '.(int)$id_lang.') LEFT JOIN `'._DB_PREFIX_.'cart_rule_lang` crl ON (cr.`id_cart_rule` = crl.`id_cart_rule` AND crl.`id_lang` = '.(int)$id_lang.')
controllers/admin/AdminCartRulesController.php
+1 -11
View File
@@ -194,7 +194,7 @@ class AdminCartRulesControllerCore extends AdminController
Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content); Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content);
break; break;
case 'categories': case 'categories':
// Todo: Consider optimization (with code below) // Todo: Consider optimization
$categories = array('selected' => array(), 'unselected' => array()); $categories = array('selected' => array(), 'unselected' => array());
$result = Db::getInstance()->ExecuteS(' $result = Db::getInstance()->ExecuteS('
SELECT name, id_category as id SELECT name, id_category as id
@@ -206,16 +206,6 @@ class AdminCartRulesControllerCore extends AdminController
Context::getContext()->smarty->assign('product_rule_itemlist', $categories); Context::getContext()->smarty->assign('product_rule_itemlist', $categories);
$choose_content = Context::getContext()->smarty->fetch('cart_rules/product_rule_itemlist.tpl'); $choose_content = Context::getContext()->smarty->fetch('cart_rules/product_rule_itemlist.tpl');
Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content); Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content);
// $translations = array(
// 'Home' => $this->l('Home'),
// 'selected' => $this->l('selected'),
// 'Collapse All' => $this->l('Collapse All'),
// 'Expand All' => $this->l('Expand All'),
// 'Check All' => $this->l('Check All'),
// 'Uncheck All' => $this->l('Uncheck All'),
// 'search' => $this->l('Search a category')
// );
// Context::getContext()->smarty->assign('product_rule_choose_content', Helper::renderAdminCategorieTree($translations, $selected, 'categoryBox', false, true));
break; break;
default: default:
die; die;