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

// small fixes to BO and norm

Browse Source
This commit is contained in:
lLefevre
2011-11-22 09:03:03 +00:00
parent 10308d6410
commit 0449749ec9
4 changed files with 114 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/groups/view.tpl
+34 -28
View File
@@ -24,32 +24,38 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<fieldset style="width: 400px">
<span style="font-weight: bold; font-size: 14px;">{l s='Name:'}</span>
<div class="clear">&nbsp;</div>
<span style="font-weight: bold; font-size: 14px;">{l s='Discount:'}</span> {$group->reduction} {l s='%'}
<div class="clear">&nbsp;</div>
<span style="font-weight: bold; font-size: 14px;">{l s='Current category discount:'}</span>
{if !$categorieReductions}
{l s='None'}
{else}
<table cellspacing="0" cellpadding="0" class="table" style="margin-top:10px">
{foreach $categorieReductions key=key item=category }
<tr class="alt_row">
<td>{$category.path}</td>
<td>{l s='Discount:'} {$category.reduction}{l s='%'}</td>
</tr>
{/foreach}
</table>
{/if}
<div class="clear">&nbsp;</div>
<span style="font-weight: bold; font-size: 14px;">{l s='Price display method:'}</span>
{if $group->price_display_method}
{l s='Tax excluded'}
{else}
{l s='Tax included'}
{extends file="helper/view/view.tpl"}
{block name="override_tpl"}
<fieldset style="width: 400px">
<span style="font-weight: bold; font-size: 14px;">{l s='Name:'}</span>
<div class="clear">&nbsp;</div>
<span style="font-weight: bold; font-size: 14px;">{l s='Discount:'}</span> {$group->reduction} {l s='%'}
<div class="clear">&nbsp;</div>
<span style="font-weight: bold; font-size: 14px;">{l s='Current category discount:'}</span>
{if !$categorieReductions}
{l s='None'}
{else}
<table cellspacing="0" cellpadding="0" class="table" style="margin-top:10px">
{foreach $categorieReductions key=key item=category }
<tr class="alt_row">
<td>{$category.path}</td>
<td>{l s='Discount:'} {$category.reduction}{l s='%'}</td>
</tr>
{/foreach}
</table>
{/if}
<div class="clear">&nbsp;</div>
</fieldset>
<h2>{l s='Customer members of this group'}</h2>
{$customerList}
<div class="clear">&nbsp;</div>
<span style="font-weight: bold; font-size: 14px;">{l s='Price display method:'}</span>
{if $group->price_display_method}
{l s='Tax excluded'}
{else}
{l s='Tax included'}
{/if}
<div class="clear">&nbsp;</div>
</fieldset>
<h2>{l s='Customer members of this group'}</h2>
{$customerList}
{/block}
controllers/admin/AdminCountriesController.php
+1 -2
View File
@@ -1,4 +1,4 @@
*<?php
<?php
/*
* 2007-2011 PrestaShop
*
@@ -106,7 +106,6 @@ class AdminCountriesControllerCore extends AdminController
'orderby' => false,
'filter_key' => 'a!active',
'width' => 25
)
);
controllers/admin/AdminCurrenciesController.php
+11 -10
View File
@@ -32,7 +32,7 @@ class AdminCurrenciesControllerCore extends AdminController
public function __construct()
{
$this->table = 'currency';
$this->className = 'Currency';
$this->className = 'Currency';
$this->lang = false;
$this->fieldsDisplay = array(
@@ -52,13 +52,13 @@ class AdminCurrenciesControllerCore extends AdminController
'PS_CURRENCY_DEFAULT' => array(
'title' => $this->l('Default currency:'),
'desc' => $this->l('The default currency used in shop')
.'<div class=warn"><img src="../img/admin/warn2.png" />'.
.'<div class="warn">'.
$this->l('If you change default currency, you will have to manually edit every product price.').'</div>',
'cast' => 'intval',
'type' => 'select',
'identifier' => 'id_currency',
'list' => Currency::getCurrencies()
),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'id_currency',
'list' => Currency::getCurrencies()
)
),
'submit' => array()
),
@@ -70,14 +70,14 @@ class AdminCurrenciesControllerCore extends AdminController
'title' => $this->l('Update currency rates'),
'class' => 'button',
'name' => 'SubmitExchangesRates'
),
)
),
'cron' => array(
'title' => $this->l('Currency rates update'),
'image' => '../img/admin/tab-tools.gif',
'info' => $this->l('Place this URL in crontab or call it manually daily').':<br />
<b>'.Tools::getShopDomain(true, true).__PS_BASE_URI__.basename(_PS_ADMIN_DIR_).'/cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'</b></p>',
),
)
);
parent::__construct();
}
@@ -274,7 +274,8 @@ class AdminCurrenciesControllerCore extends AdminController
if ($object->active && $object->id == Configuration::get('PS_CURRENCY_DEFAULT'))
$this->_errors[] = $this->l('You can\'t disable the default currency');
else if ($object->toggleStatus())
Tools::redirectAdmin(self::$currentIndex.'&conf=5'.((($id_category = (int)Tools::getValue('id_category')) && Tools::getValue('id_product')) ? '&id_category='.$id_category : '').'&token='.$this->token);
Tools::redirectAdmin(self::$currentIndex.'&conf=5'.((($id_category =
(int)Tools::getValue('id_category')) && Tools::getValue('id_product')) ? '&id_category='.$id_category : '').'&token='.$this->token);
else
$this->_errors[] = Tools::displayError('An error occurred while updating status.');
}
controllers/admin/AdminGroupsController.php
+68 -51
View File
@@ -43,8 +43,11 @@ class AdminGroupsController extends AdminController
WHERE jc.`deleted` != 1
AND jcg.`id_group` = a.`id_group`) AS nb';
$groups_to_keep = array(Configuration::get('PS_UNIDENTIFIED_GROUP'), Configuration::get('PS_GUEST_GROUP'), Configuration::get('PS_CUSTOMER_GROUP'));
$this->_listSkipDelete = $groups_to_keep;
$groups_to_keep = array(
Configuration::get('PS_UNIDENTIFIED_GROUP'),
Configuration::get('PS_GUEST_GROUP'),
Configuration::get('PS_CUSTOMER_GROUP')
);
$this->fieldsDisplay = array(
'id_group' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
@@ -52,10 +55,9 @@ class AdminGroupsController extends AdminController
'reduction' => array('title' => $this->l('Discount'), 'width' => 50, 'align' => 'right'),
'nb' => array('title' => $this->l('Members'), 'width' => 25, 'align' => 'center'),
'date_add' => array('title' => $this->l('Creation date'), 'width' => 60, 'type' => 'date', 'align' => 'right'));
//$this->addRowActionSkipList('delete', array(1));
$this->addRowActionSkipList('delete', $groups_to_keep);
parent::__construct();
}
@@ -89,7 +91,7 @@ class AdminGroupsController extends AdminController
$genders_icon[$gender->id] = '../genders/'.(int)$gender->id.'.jpg';
$genders[$gender->id] = $gender->name;
}
$customerFieldsDisplay = (array(
$customer_fields_display = (array(
'id_customer' => array('title' => $this->l('ID'), 'align' => 'center'),
'id_gender' => array('title' => $this->l('Gender'), 'align' => 'center', 'icon' => $genders_icon, 'list' => $genders),
'firstname' => array('title' => $this->l('Name'), 'align' => 'center'),
@@ -101,7 +103,7 @@ class AdminGroupsController extends AdminController
'active' => array('title' => $this->l('Enabled'),'align' => 'center','active' => 'status','type' => 'bool')
));
$customerList = $group->getCustomers(false);
$customer_list = $group->getCustomers(false);
$helper = new HelperList();
$helper->currentIndex = self::$currentIndex;
@@ -111,14 +113,14 @@ class AdminGroupsController extends AdminController
$helper->actions = array('edit', 'view');
$helper->show_toolbar = false;
return $helper->generateList($customerList, $customerFieldsDisplay);
return $helper->generateList($customer_list, $customer_fields_display);
}
public function initForm()
{
if (!($group = $this->loadObject(true)))
return;
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Customer group'),
@@ -151,7 +153,16 @@ class AdminGroupsController extends AdminController
'name' => 'price_display_method',
'desc' => $this->l('How the prices are displayed on order summary for this customer group (tax included or excluded).'),
'options' => array(
'query' => array(array('id_method' => PS_TAX_EXC, 'name' => $this->l('Tax excluded'), array('id_method' => PS_TAX_INC, 'name' => $this->l('Tax included')))),
'query' => array(
array(
'id_method' => PS_TAX_EXC,
'name' => $this->l('Tax excluded'),
array(
'id_method' => PS_TAX_INC,
'name' => $this->l('Tax included')
)
)
),
'id' => 'id_method',
'name' => 'name'
)
@@ -171,7 +182,7 @@ class AdminGroupsController extends AdminController
)
)
);
$trads = array(
'Home' => $this->l('Home'),
'selected' => $this->l('selected'),
@@ -181,8 +192,8 @@ class AdminGroupsController extends AdminController
'Uncheck All' => $this->l('Uncheck All'),
'search' => $this->l('Search a category')
);
$this->tpl_form_vars['categoryTreeView'] = Helper::renderAdminCategorieTree($trads, array(), 'id_category', true);
$this->tpl_form_vars['categoryTreeView'] = Helper::renderAdminCategorieTree($trads, array(), 'id_category', true);
return parent::initForm();
}
@@ -190,45 +201,45 @@ class AdminGroupsController extends AdminController
protected function formatCategoryDiscountList($id)
{
$categorie = GroupReduction::getGroupReductions((int)$id, $this->context->language->id);
$categorieReductions = array();
$categorie_reductions = array();
$category_reduction = Tools::getValue('category_reduction');
foreach($categorie as $category)
foreach ($categorie as $category)
{
if (is_array($category_reduction) AND array_key_exists($category['id_category'], $category_reduction))
if (is_array($category_reduction) && array_key_exists($category['id_category'], $category_reduction))
$category['reduction'] = $category_reduction[$category['id_category']];
$tmp = array();
$tmp['path'] = getPath(self::$currentIndex.'?tab=AdminCatalog', (int)$category['id_category']);
$tmp['reduction'] = (float)$category['reduction'] * 100;
$tmp['id_category'] = (int)$category['id_category'];
$categorieReductions[(int)$category['id_category']] = $tmp;
$categorie_reductions[(int)$category['id_category']] = $tmp;
}
if (is_array($category_reduction))
foreach($category_reduction as $key => $val)
foreach ($category_reduction as $key => $val)
{
if (!array_key_exists($key, $categorieReductions))
if (!array_key_exists($key, $categorie_reductions))
{
$tmp = array();
$tmp['path'] = getPath(self::$currentIndex.'?tab=AdminCatalog', (int)$key);
$tmp['reduction'] = (float)$val * 100;
$tmp['id_category'] = (int)$key;
$categorieReductions[(int)$category['id_category']] = $tmp;
$categorie_reductions[(int)$category['id_category']] = $tmp;
}
}
return $categorieReductions;
return $categorie_reductions;
}
public function formatModuleListAuth($id_group)
{
$modules = Module::getModulesInstalled();
$authorized_modules = '';
$auth_modules = array();
$unauth_modules = array();
if ($id_group)
$authorized_modules = Module::getAuthorizedModules($id_group);
@@ -250,22 +261,22 @@ class AdminGroupsController extends AdminController
else
$auth_modules = $modules;
$auth_modules_tmp = array();
foreach($auth_modules as $key => $val)
foreach ($auth_modules as $key => $val)
$auth_modules_tmp[] = Module::getInstanceById($val['id_module']);
$auth_modules = $auth_modules_tmp;
$unauth_modules_tmp = array();
foreach($unauth_modules as $key => $val)
foreach ($unauth_modules as $key => $val)
$unauth_modules_tmp[] = Module::getInstanceById($val['id_module']);
$unauth_modules = $unauth_modules_tmp;
return array('unauth_modules' => $unauth_modules, 'auth_modules' => $auth_modules);
}
public function postProcess()
{
{
if (Tools::isSubmit('submitAddgroup'))
{
if ($this->tabAccess['add'] === '1')
@@ -285,7 +296,7 @@ class AdminGroupsController extends AdminController
else
parent::postProcess();
}
protected function validateDiscount($reduction)
{
if (!Validate::isPrice($reduction) || $reduction > 100 || $reduction < 0)
@@ -293,12 +304,12 @@ class AdminGroupsController extends AdminController
else
return true;
}
public function ajaxProcessAddCategoryReduction()
{
$category_reduction = Tools::getValue('category_reduction');
$id_category = Tools::getValue('id_category'); //no cast validation is done with Validate::isUnsignedId($id_category)
$result = array();
if (!Validate::isUnsignedId($id_category))
{
@@ -319,8 +330,7 @@ class AdminGroupsController extends AdminController
}
die(Tools::jsonEncode($result));
}
/**
* Update (or create) restrictions for modules by group
*/
@@ -332,14 +342,14 @@ class AdminGroupsController extends AdminController
$return = true;
if ($id_group)
Group::truncateModulesRestrictions((int)$id_group);
if (is_array($auth_modules))
$return &= Group::addModulesRestrictions($id_group, $auth_modules, 1);
if (is_array($unauth_modules))
$return &= Group::addModulesRestrictions($id_group, $unauth_modules, 0);
return $return;
}
protected function updateCategoryReduction()
{
$category_reduction = Tools::getValue('category_reduction');
@@ -351,15 +361,22 @@ class AdminGroupsController extends AdminController
$this->_errors[] = Tools::displayError('Discount value is incorrect');
else
{
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'group_reduction` WHERE `id_group` = '.(int)Tools::getValue('id_group').' AND `id_category` = '.(int)$cat);
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_group` = '.(int)Tools::getValue('id_group'));
$category = new Category((int)($cat));
Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'group_reduction`
WHERE `id_group` = '.(int)Tools::getValue('id_group').'
AND `id_category` = '.(int)$cat
);
Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache`
WHERE `id_group` = '.(int)Tools::getValue('id_group')
);
$category = new Category((int)$cat);
$category->addGroupsIfNoExist((int)Tools::getValue('id_group'));
$groupReduction = new GroupReduction();
$groupReduction->id_group = (int)Tools::getValue('id_group');
$groupReduction->reduction = (float)($reduction/100);
$groupReduction->id_category = (int)$cat;
if (!$groupReduction->save())
$group_reduction = new GroupReduction();
$group_reduction->id_group = (int)Tools::getValue('id_group');
$group_reduction->reduction = (float)($reduction / 100);
$group_reduction->id_category = (int)$cat;
if (!$group_reduction->save())
$this->_errors[] = Tools::displayError('Cannot save group reductions');
}
}