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

[*] BO : reorganization of admin tabs

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13820 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-03-02 14:44:07 +00:00
parent a32fc0cc5b
commit 0f865fd2d6
74 changed files with 10384 additions and 11234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
controllers/admin/AdminLocalizationController.php
View File

@@ -32,7 +32,43 @@ class AdminLocalizationControllerCore extends AdminController
$this->className = 'Configuration';
$this->table = 'configuration';
parent::__construct();
$this->options = array(
'general' => array(
'title' => $this->l('Configuration'),
'fields' => array(
'PS_LANG_DEFAULT' => array(
'title' => $this->l('Default language:'),
'desc' => $this->l('The default language used in shop'),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'id_lang',
'list' => Language::getlanguages(false)
),
'PS_COUNTRY_DEFAULT' => array(
'title' => $this->l('Default country:'),
'desc' => $this->l('The default country used in shop'),
'cast' => 'intval',
'type' => 'select',
'identifier' => 'id_country',
'list' => Country::getCountries($this->context->language->id)
),
'PS_CURRENCY_DEFAULT' => array(
'title' => $this->l('Default currency:'),
'desc' =>
$this->l('The default currency used in shop')
.'<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()
),
),
'submit' => array()
),
'localization' => array(
'title' => $this->l('Localization'),
'width' => 'width2',
@@ -88,11 +124,20 @@ class AdminLocalizationControllerCore extends AdminController
'type' => 'text',
'visibility' => Shop::CONTEXT_ALL
)
)
),
'submit' => array('title' => $this->l(' Save '), 'class' => 'button')
)
);
parent::__construct();
if (function_exists('date_default_timezone_set'))
$this->options['general']['fields']['PS_TIMEZONE'] = array(
'title' => $this->l('Time Zone:'),
'validation' => 'isAnything',
'type' => 'select',
'list' => Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT name FROM '._DB_PREFIX_.'timezone'),
'identifier' => 'name',
'visibility' => Shop::CONTEXT_ALL
);
}
public function postProcess()
@@ -231,18 +276,29 @@ class AdminLocalizationControllerCore extends AdminController
public function initContent()
{
// toolbar (save, cancel, new, ..)
$this->initToolbar();
$this->content .= $this->renderOptions();
if (!$this->loadObject(true))
return;
$this->content .= $this->renderForm();
// toolbar (save, cancel, new, ..)
$this->initToolbar();
$this->context->smarty->assign(array(
'content' => $this->content,
'localization_form' => $this->renderForm(),
'localization_options' => $this->renderOptions(),
'url_post' => self::$currentIndex.'&token='.$this->token,
));
}
public function beforeUpdateOptions()
{
$lang = new Language((int)Tools::getValue('PS_LANG_DEFAULT'));
if (!$lang->active)
$this->errors[] = Tools::displayError('You cannot set this language as default language because it\'s disabled');
}
public function updateOptionPsCurrencyDefault($value)
{
Configuration::updateValue('PS_CURRENCY_DEFAULT', $value);
Currency::refreshCurrencies();
}
}