diff --git a/admin-dev/tabs/AdminEmployees.php b/admin-dev/tabs/AdminEmployees.php deleted file mode 100644 index 2e88c8059..000000000 --- a/admin-dev/tabs/AdminEmployees.php +++ /dev/null @@ -1,273 +0,0 @@ - -* @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 7210 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -class AdminEmployees extends AdminTab -{ - /** @var array profiles list */ - private $profilesArray = array(); - - public function __construct() - { - $this->context = Context::getContext(); - $this->table = 'employee'; - $this->className = 'Employee'; - $this->lang = false; - $this->edit = true; - $this->delete = true; - $this->_select = 'pl.`name` AS profile'; - $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'profile` p ON a.`id_profile` = p.`id_profile` - LEFT JOIN `'._DB_PREFIX_.'profile_lang` pl ON (pl.`id_profile` = p.`id_profile` AND pl.`id_lang` = '.(int)$this->context->language->id.')'; - - $profiles = Profile::getProfiles($this->context->language->id); - if (!$profiles) - $this->_errors[] = Tools::displayError('No profile'); - else - foreach ($profiles as $profile) - $this->profilesArray[$profile['name']] = $profile['name']; - - $this->fieldsDisplay = array( - 'id_employee' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), - 'lastname' => array('title' => $this->l('Last name'), 'width' => 130), - 'firstname' => array('title' => $this->l('First name'), 'width' => 130), - 'email' => array('title' => $this->l('E-mail address'), 'width' => 180), - 'profile' => array('title' => $this->l('Profile'), 'width' => 90, 'type' => 'select', 'select' => $this->profilesArray, 'filter_key' => 'pl!name'), - 'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool'), - ); - - $this->optionsList = array( - 'general' => array( - 'title' => $this->l('Employees options'), - 'fields' => array( - 'PS_PASSWD_TIME_BACK' => array('title' => $this->l('Password regenerate:'), 'desc' => $this->l('Security minimum time to wait to regenerate a new password'), 'cast' => 'intval', 'size' => 5, 'type' => 'text', 'suffix' => ' '.$this->l('minutes'), 'visibility' => Shop::CONTEXT_ALL), - 'PS_BO_ALLOW_EMPLOYEE_FORM_LANG' => array('title' => $this->l('Memorize form language:'), 'desc' => $this->l('Allow employees to save their own default form language'), 'cast' => 'intval', 'type' => 'select', 'identifier' => 'value', 'list' => array( - '0' => array('value' => 0, 'name' => $this->l('No')), - '1' => array('value' => 1, 'name' => $this->l('Yes')) - ), 'visibility' => Shop::CONTEXT_ALL) - ), - ), - ); - - parent::__construct(); - } - - protected function _childValidation() - { - if (!($obj = $this->loadObject(true))) - return false; - $email = $this->getFieldValue($obj, 'email'); - if (!Validate::isEmail($email)) - $this->_errors[] = Tools::displayError('Invalid e-mail'); - else if (Employee::employeeExists($email) && !Tools::getValue('id_employee')) - $this->_errors[] = Tools::displayError('An account already exists for this e-mail address:').' '.$email; - } - - public function displayForm($isMainTab = true) - { - parent::displayForm(); - - if (!($obj = $this->loadObject(true))) - return; - $profiles = Profile::getProfiles($this->context->language->id); - - echo ' - - - -
- '.($obj->id ? '' : '').' - '.((int)$this->tabAccess['view'] ? '' : '').' -
'.$this->l('Employees').' - -
- * -
- -
- * -
- -
- * -

'.($obj->id ? $this->l('Leave blank if you do not want to change your password') : $this->l('Min. 8 characters; use only letters, numbers or').' -_').'

-
- -
- * -
 
- -
'; - // Note : width= fix Firefox 4 display bug related to colorpicker librarie - echo ' -

'.$this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")

-
 
- -
- * -
 
- -
- * -
'; - if ((int)$this->tabAccess['edit']) - { - echo '
 
- -
- getFieldValue($obj, 'bo_uimode') == 'hover' ? 'checked="checked" ' : '').'/> - - getFieldValue($obj, 'bo_uimode') == 'click' ? 'checked="checked" ' : '').'/> - -
 
- -
- getFieldValue($obj, 'bo_show_screencast') ? 'checked="checked" ' : '').'/> - - getFieldValue($obj, 'bo_show_screencast') ? 'checked="checked" ' : '').'/> - -

'.$this->l('Show the welcome video on the dashbord of the back office').'

-
- -
- getFieldValue($obj, 'active') ? 'checked="checked" ' : '').'/> - - getFieldValue($obj, 'active') ? 'checked="checked" ' : '').'/> - -

'.$this->l('Allow or disallow this employee to log into this Back Office').'

-
- -
- * -
'; - if (Shop::isFeatureActive()) - { - echo ' - - '; - echo '
'; - $this->displayAssoShop(); - echo '
'; - } - } - echo '
 
-
- -
 
-
* '.$this->l('Required field').'
-
-
'; - } - - public function postProcess() - { - $this->context = Context::getContext(); - if (Tools::isSubmit('deleteemployee') || Tools::isSubmit('status') || Tools::isSubmit('statusemployee')) - { - /* PrestaShop demo mode */ - if (_PS_MODE_DEMO_ && $id_employee = Tools::getValue('id_employee') && (int)$id_employee == _PS_DEMO_MAIN_BO_ACCOUNT_) - { - $this->_errors[] = Tools::displayError('This functionnality has been disabled.'); - return; - } - /* PrestaShop demo mode*/ - - if ($this->context->employee->id == Tools::getValue('id_employee')) - { - $this->_errors[] = Tools::displayError('You cannot disable or delete your own account.'); - return false; - } - - $employee = new Employee(Tools::getValue('id_employee')); - if ($employee->isLastAdmin()) - { - $this->_errors[] = Tools::displayError('You cannot disable or delete the last administrator account.'); - return false; - } - } - else if (Tools::isSubmit('submitAddemployee')) - { - $employee = new Employee((int)Tools::getValue('id_employee')); - if (!(int)$this->tabAccess['edit']) - $_POST['id_profile'] = $_GET['id_profile'] = $employee->id_profile; - - if ($employee->isLastAdmin()) - { - if (Tools::getValue('id_profile') != (int)_PS_ADMIN_PROFILE_) - { - $this->_errors[] = Tools::displayError('You should have at least one employee in the administrator group.'); - return false; - } - - if (Tools::getvalue('active') == 0) - { - $this->_errors[] = Tools::displayError('You cannot disable or delete the last administrator account.'); - return false; - } - } - - $assos = self::getAssoShop($this->table); - - if (count($assos[0]) == 0 && $this->table = 'employee') - if (Shop::isFeatureActive() && _PS_ADMIN_PROFILE_ != $_POST['id_profile']) - $this->_errors[] = Tools::displayError('The employee must be associated with at least one shop'); - } - return parent::postProcess(); - } -} \ No newline at end of file diff --git a/admin-dev/themes/template/employees/form.tpl b/admin-dev/themes/template/employees/form.tpl new file mode 100644 index 000000000..796c275ea --- /dev/null +++ b/admin-dev/themes/template/employees/form.tpl @@ -0,0 +1,321 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 8971 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +{if $firstCall} + + +{/if} +{if isset($fields.title)}

{$fields.title}

{/if} +
+ {if $form_id} + + {/if} +
+ {foreach $fields as $key => $field} + {if $key == 'legend'} + + {if isset($field.image)}{$field.title}{/if} + {$field.title} + + {elseif $key == 'input'} + {foreach $field as $input} + {if $input.name == 'id_state'} +
+ {/if} + {if isset($input.label)} + + {/if} + {if $input.type == 'hidden'} + + {else} +
+ {if $input.type == 'text'} + {if isset($input.lang) && isset($input.attributeLang)} + {foreach $languages as $language} +
+ + {if isset($input.hint)}{$input.hint} {/if} +
+ {/foreach} + {if count($languages) > 1} +
+ +
+
+ {l s='Choose language:'}

+ {foreach $languages as $language} + {$language.name} + {/foreach} +
+ {/if} + {else} + + {if isset($input.hint)}{$input.hint} {/if} + {/if} + {elseif $input.type == 'select'} + + {if isset($input.hint)}{$input.hint} {/if} + {elseif $input.type == 'radio'} + {foreach $input.values as $value} + + + {if isset($input.br) && $input.br}
{/if} + {/foreach} + {elseif $input.type == 'textarea'} + {if isset($input.lang) && isset($input.attributeLang)} + {foreach $languages as $language} +
+ +
+ {/foreach} + {if count($languages) > 1} +
+ +
+
+ {l s='Choose language:'}

+ {foreach $languages as $language} + {$language.name} + {/foreach} +
+ {/if} + {else} + + {/if} + {elseif $input.type == 'checkbox'} + {foreach $input.values.query as $value} + {assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]} + +
+ {/foreach} + {elseif $input.type == 'file'} + + + {elseif $input.type == 'password'} + + {elseif $input.type == 'group'} + {assign var=groups value=$input.values} + {include file='form_group.tpl'} + {elseif $input.type == 'shop' OR $input.type == 'group_shop'} + + {include file='form_shop.tpl'} + {elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop} + +
+ {$asso_shop} +
+ {elseif $input.type == 'color'} + + + {/if} + {if isset($input.required) && $input.required} *{/if} + {if isset($input.p)} +

+ {if is_array($input.p)} + {foreach $input.p as $p} + {if is_array($p)} + {$p.text}
+ {else} + {$p}
+ {/if} + {/foreach} + {else} + {$input.p} + {/if} +

+ {/if} + {if isset($languages)}
{/if} +
+ {/if} + {if $input.name == 'id_state'} +
+ {/if} + {/foreach} + {elseif $key == 'submit'} +
+ +
+ {/if} + {/foreach} + {if $required_fields} +
* {l s ='Required field'}
+ {/if} +
+
+ +

+{if $firstCall && !$no_back} + {if $back} + {l s='Back'} + {else} + {l s='Back to list'} + {/if} +
+{/if} diff --git a/admin-dev/themes/template/form.tpl b/admin-dev/themes/template/form.tpl index fadb4a7f9..c40284455 100644 --- a/admin-dev/themes/template/form.tpl +++ b/admin-dev/themes/template/form.tpl @@ -217,6 +217,11 @@ {elseif $input.type == 'file'} + {elseif $input.type == 'password'} + {elseif $input.type == 'group'} {assign var=groups value=$input.values} {include file='form_group.tpl'} diff --git a/classes/AdminController.php b/classes/AdminController.php index 60a703574..57561e77e 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -1790,6 +1790,34 @@ class AdminControllerCore extends Controller } } + /** + * Returns an array with selected shops and type (group or boutique shop) + * + * @param string $table + * @param int $id_object + */ + protected static function getAssoShop($table, $id_object = false) + { + $shopAsso = Shop::getAssoTables(); + $groupShopAsso = GroupShop::getAssoTables(); + if (isset($shopAsso[$table]) && $shopAsso[$table]['type'] == 'shop') + $type = 'shop'; + else if (isset($groupShopAsso[$table]) && $groupShopAsso[$table]['type'] == 'group_shop') + $type = 'group_shop'; + else + return; + + $assos = array(); + foreach ($_POST as $k => $row) + { + if (!preg_match('/^checkBox'.Tools::toCamelCase($type, true).'Asso_'.$table.'_([0-9]+)?_([0-9]+)$/Ui', $k, $res)) + continue; + $id_asso_object = (!empty($res[1]) ? $res[1] : $id_object); + $assos[] = array('id_object' => (int)$id_asso_object, 'id_'.$type => (int)$res[2]); + } + return array($assos, $type); + } + /** * Update the associations of shops * diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php new file mode 100644 index 000000000..831170ec5 --- /dev/null +++ b/controllers/admin/AdminEmployeesController.php @@ -0,0 +1,366 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 8971 $ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +class AdminEmployeesControllerCore extends AdminController +{ + /** @var array profiles list */ + private $profiles_array = array(); + + /** @var array themes list*/ + private $themes = array(); + + public function __construct() + { + $this->table = 'employee'; + $this->className = 'Employee'; + $this->lang = false; + + $this->addRowAction('edit'); + $this->addRowAction('delete'); + + $this->requiredDatabase = true; + + $this->context = Context::getContext(); + + $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); + + $profiles = Profile::getProfiles($this->context->language->id); + if (!$profiles) + $this->_errors[] = Tools::displayError('No profile'); + else + foreach ($profiles as $profile) + $this->profiles_array[$profile['name']] = $profile['name']; + + $this->fieldsDisplay = array( + 'id_employee' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), + 'lastname' => array('title' => $this->l('Last name'), 'width' => 130), + 'firstname' => array('title' => $this->l('First name'), 'width' => 130), + 'email' => array('title' => $this->l('E-mail address'), 'width' => 180), + 'profile' => array('title' => $this->l('Profile'), 'width' => 90, 'type' => 'select', 'select' => $this->profiles_array, 'filter_key' => 'pl!name'), + 'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool'), + ); + + $this->options = array( + 'general' => array( + 'title' => $this->l('Employees options'), + 'fields' => array( + 'PS_PASSWD_TIME_BACK' => array( + 'title' => $this->l('Password regenerate:'), + 'desc' => $this->l('Security minimum time to wait to regenerate a new password'), + 'cast' => 'intval', + 'size' => 5, + 'type' => 'text', + 'suffix' => ' '.$this->l('minutes'), + 'visibility' => Shop::CONTEXT_ALL + ), + 'PS_BO_ALLOW_EMPLOYEE_FORM_LANG' => array( + 'title' => $this->l('Memorize form language:'), + 'desc' => $this->l('Allow employees to save their own default form language'), + 'cast' => 'intval', + 'type' => 'select', + 'identifier' => 'value', + 'list' => array( + '0' => array('value' => 0, 'name' => $this->l('No')), + '1' => array('value' => 1, 'name' => $this->l('Yes') + ) + ), 'visibility' => Shop::CONTEXT_ALL) + ), + 'submit' => array() + ) + ); + + parent::__construct(); + } + + public function initList() + { + $this->_select = 'pl.`name` AS profile'; + $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'profile` p ON a.`id_profile` = p.`id_profile` + LEFT JOIN `'._DB_PREFIX_.'profile_lang` pl ON (pl.`id_profile` = p.`id_profile` AND pl.`id_lang` = '.(int)$this->context->language->id.')'; + + parent::initList(); + } + + public function initForm() + { + if (!($obj = $this->loadObject(true))) + return; + + $path = _PS_ADMIN_DIR_.'/themes/'; + foreach (scandir($path) as $theme) + if (file_exists($path.$theme.'/admin.css')) + $this->themes[] = $theme; + + $this->fields_form = array( + 'legend' => array( + 'title' => $this->l('Employees'), + 'image' => '../img/admin/nav-user.gif' + ), + 'input' => array( + array( + 'type' => 'text', + 'label' => $this->l('Last name:'), + 'name' => 'lastname', + 'size' => 33, + 'required' => true + ), + array( + 'type' => 'text', + 'label' => $this->l('First name:'), + 'name' => 'firstname', + 'size' => 33, + 'required' => true + ), + array( + 'type' => 'password', + 'label' => $this->l('Password:'), + 'name' => 'passwd', + 'required' => true, + 'size' => 33, + 'p' => ($obj->id ? + $this->l('Leave blank if you do not want to change your password') : + $this->l('Min. 8 characters; use only letters, numbers or').' -_') + ), + array( + 'type' => 'text', + 'label' => $this->l('E-mail address:'), + 'name' => 'email', + 'size' => 33, + 'required' => true + ), + array( + 'type' => 'color', + 'label' => $this->l('Back office color:'), + 'name' => 'bo_color', + 'class' => 'color mColorPickerInput', + 'size' => 20, + 'p' => $this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")' + ), + array( + 'type' => 'select', + 'label' => $this->l('Language:'), + 'name' => 'id_lang', + 'required' => true, + 'options' => array( + 'query' => Language::getLanguages(), + 'id' => 'id_lang', + 'name' => 'name' + ) + ), + array( + 'type' => 'select', + 'label' => $this->l('Theme:'), + 'name' => 'bo_theme', + 'options' => array('query' => $this->themes), + 'p' => $this->l('Out-of-range behavior when none is defined (e.g., when a customer\'s cart weight is greater than the highest range limit)') + ) + ) + ); + + if ((int)$this->tabAccess['edit']) + { + $this->fields_form['input'][] = array( + 'type' => 'radio', + 'label' => $this->l('UI mode:'), + 'name' => 'bo_uimode', + 'required' => false, + 'class' => 't', + 'values' => array( + array( + 'id' => 'uimode_on', + 'value' => 'hover', + 'label' => $this->l('Hover on tabs') + ), + array( + 'id' => 'uimode_off', + 'value' => 'click', + 'label' => $this->l('Click on tabs') + ) + ) + ); + + $this->fields_form['input'][] = array( + 'type' => 'radio', + 'label' => $this->l('Show screencast:'), + 'name' => 'bo_show_screencast', + 'required' => false, + 'class' => 't', + 'is_bool' => true, + 'values' => array( + array( + 'id' => 'bo_show_screencast_on', + 'value' => 1, + 'label' => $this->l('Enabled') + ), + array( + 'id' => 'bo_show_screencast_off', + 'value' => 0, + 'label' => $this->l('Disabled') + ) + ), + 'p' => $this->l('Show the welcome video on the dashbord of the back office') + ); + + $this->fields_form['input'][] = array( + 'type' => 'radio', + 'label' => $this->l('Status:'), + 'name' => 'active', + 'required' => false, + 'class' => 't', + 'is_bool' => true, + 'values' => array( + array( + 'id' => 'active_on', + 'value' => 1, + 'label' => $this->l('Enabled') + ), + array( + 'id' => 'active_off', + 'value' => 0, + 'label' => $this->l('Disabled') + ) + ), + 'p' => $this->l('Allow or disallow this employee to log into this Back Office') + ); + + $this->fields_form['input'][] = array( + 'type' => 'select', + 'label' => $this->l('Profile:'), + 'name' => 'id_profile', + 'required' => true, + 'options' => array( + 'query' => Profile::getProfiles($this->context->language->id), + 'id' => 'id_profile', + 'name' => 'name', + 'default' => array( + 'value' => '', + 'label' => $this->l('-- Choose --') + ) + ) + ); + + if (Shop::isFeatureActive()) + { + $this->context->smarty->assign('_PS_ADMIN_PROFILE_', (int)_PS_ADMIN_PROFILE_); + $this->fields_form['input'][] = array( + 'type' => 'shop', + 'label' => $this->l('Shop association:'), + 'name' => 'checkBoxShopAsso', + 'values' => Shop::getTree() + ); + } + } + + $this->fields_form['submit'] = array( + 'title' => $this->l(' Save '), + 'class' => 'button' + ); + + $this->fields_value['passwd'] = false; + + //Added values of object Shop + if ($obj->id) + { + $assos = array(); + $sql = 'SELECT `id_shop`, `'.pSQL($this->identifier).'` + FROM `'._DB_PREFIX_.pSQL($this->table).'_shop` + WHERE `'.pSQL($this->identifier).'` = '.(int)$obj->id; + foreach (Db::getInstance()->executeS($sql) as $row) + $this->fields_value['shop'][$row['id_shop']][] = $row[$this->identifier]; + } + + parent::initForm(); + } + + protected function _childValidation() + { + if (!($obj = $this->loadObject(true))) + return false; + $email = $this->getFieldValue($obj, 'email'); + if (!Validate::isEmail($email)) + $this->_errors[] = Tools::displayError('Invalid e-mail'); + else if (Employee::employeeExists($email) && !Tools::getValue('id_employee')) + $this->_errors[] = Tools::displayError('An account already exists for this e-mail address:').' '.$email; + } + + public function postProcess() + { + if (Tools::isSubmit('deleteemployee') || Tools::isSubmit('status') || Tools::isSubmit('statusemployee')) + { + /* PrestaShop demo mode */ + if (_PS_MODE_DEMO_ && $id_employee = Tools::getValue('id_employee') && (int)$id_employee == _PS_DEMO_MAIN_BO_ACCOUNT_) + { + $this->_errors[] = Tools::displayError('This functionnality has been disabled.'); + return; + } + /* PrestaShop demo mode*/ + + if ($this->context->employee->id == Tools::getValue('id_employee')) + { + $this->_errors[] = Tools::displayError('You cannot disable or delete your own account.'); + return false; + } + + $employee = new Employee(Tools::getValue('id_employee')); + if ($employee->isLastAdmin()) + { + $this->_errors[] = Tools::displayError('You cannot disable or delete the last administrator account.'); + return false; + } + } + else if (Tools::isSubmit('submitAddemployee')) + { + $employee = new Employee((int)Tools::getValue('id_employee')); + if (!(int)$this->tabAccess['edit']) + $_POST['id_profile'] = $_GET['id_profile'] = $employee->id_profile; + + if ($employee->isLastAdmin()) + { + if (Tools::getValue('id_profile') != (int)_PS_ADMIN_PROFILE_) + { + $this->_errors[] = Tools::displayError('You should have at least one employee in the administrator group.'); + return false; + } + + if (Tools::getvalue('active') == 0) + { + $this->_errors[] = Tools::displayError('You cannot disable or delete the last administrator account.'); + return false; + } + } + + $assos = self::getAssoShop($this->table); + + if (count($assos[0]) == 0 && $this->table = 'employee') + if (Shop::isFeatureActive() && _PS_ADMIN_PROFILE_ != $_POST['id_profile']) + $this->_errors[] = Tools::displayError('The employee must be associated with at least one shop'); + } + return parent::postProcess(); + } +} + +