diff --git a/admin-dev/tabs/AdminPayment.php b/admin-dev/tabs/AdminPayment.php
deleted file mode 100644
index a0433371e..000000000
--- a/admin-dev/tabs/AdminPayment.php
+++ /dev/null
@@ -1,240 +0,0 @@
-
-* @copyright 2007-2011 PrestaShop SA
-* @version Release: $Revision: 7307 $
-* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
-* International Registered Trademark & Property of PrestaShop SA
-*/
-
-class AdminPayment extends AdminTab
-{
- public $paymentModules = array();
-
- public function __construct()
- {
- $shopID = Context::getContext()->shop->getID(true);
-
- /* Get all modules then select only payment ones*/
- $modules = Module::getModulesOnDisk();
- foreach ($modules AS $module)
-
- if ($module->tab == 'payments_gateways')
- {
- if ($module->id)
- {
- if(!get_class($module) == 'SimpleXMLElement')
- $module->country = array();
- $countries = DB::getInstance()->executeS('SELECT id_country FROM '._DB_PREFIX_.'module_country WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID);
- foreach ($countries as $country)
- $module->country[] = $country['id_country'];
-
- if(!get_class($module) == 'SimpleXMLElement')
- $module->currency = array();
- $currencies = DB::getInstance()->executeS('SELECT id_currency FROM '._DB_PREFIX_.'module_currency WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID);
- foreach ($currencies as $currency)
- $module->currency[] = $currency['id_currency'];
-
- if(!get_class($module) == 'SimpleXMLElement')
- $module->group = array();
- $groups = DB::getInstance()->executeS('SELECT id_group FROM '._DB_PREFIX_.'module_group WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID);
- foreach ($groups as $group)
- $module->group[] = $group['id_group'];
- }
- else
- {
- $module->country = NULL;
- $module->currency = NULL;
- $module->group = NULL;
- }
-
- $this->paymentModules[] = $module;
- }
-
- parent::__construct();
- }
-
- public function postProcess()
- {
- if (Tools::isSubmit('submitModulecountry'))
- $this->saveRestrictions('country');
- elseif (Tools::isSubmit('submitModulecurrency'))
- $this->saveRestrictions('currency');
- elseif (Tools::isSubmit('submitModulegroup'))
- $this->saveRestrictions('group');
- }
-
- private function saveRestrictions($type)
- {
- Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'module_'.$type.' WHERE id_shop = '.Context::getContext()->shop->getID(true));
- foreach ($this->paymentModules as $module)
- if ($module->active AND isset($_POST[$module->name.'_'.$type.'']))
- foreach ($_POST[$module->name.'_'.$type.''] as $selected)
- $values[] = '('.(int)$module->id.', '.Context::getContext()->shop->getID(true).', '.(int)$selected.')';
- if (sizeof($values))
- Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'module_'.$type.' (`id_module`, `id_shop`, `id_'.$type.'`) VALUES '.implode(',', $values));
- Tools::redirectAdmin(self::$currentIndex.'&conf=4'.'&token='.$this->token);
- }
-
- public function display()
- {
- $this->context = Context::getContext();
- $displayRestrictions = false;
-
- $currencies = Currency::getCurrencies();
- $countries = Country::getCountries($this->context->language->id);
- $groups = Group::getGroups($this->context->language->id);
-
- $tokenModules = Tools::getAdminToken('AdminModules'.(int)(Tab::getIdFromClassName('AdminModules')).(int)$this->context->employee->id);
- echo '
'.$this->l('Payment modules list').'
';
- if (isset($this->paymentModules[0]))
- echo ' ';
-
- foreach ($this->paymentModules as $module)
- if ($module->active)
- $displayRestrictions= true;
- if ($displayRestrictions)
- {
-
- echo '
'.$this->l('Payment module restrictions').'
';
- $textCurrencies = $this->l('Please mark the checkbox(es) for the currency or currencies for which you want the payment module(s) to be available.');
- $textCountries = $this->l('Please mark the checkbox(es) for the country or countries for which you want the payment module(s) to be available.');
- $textGroups = $this->l('Please mark the checkbox(es) for the groups for which you want the payment module(s) available.');
- $this->displayModuleRestrictions($currencies, $this->l('Currencies restrictions'), 'currency', $textCurrencies, 'dollar');
- echo ' ';
- $this->displayModuleRestrictions($groups, $this->l('Groups restrictions'), 'group', $textGroups, 'group');
- echo ' ';
- $this->displayModuleRestrictions($countries, $this->l('Countries restrictions'), 'country', $textCountries, 'world');
- }
- else
- {
- echo ' ';
- echo $this->displayWarning($this->l('No payment module installed'));
- }
-
- }
-
- public function displayModuleRestrictions($items, $title, $nameId, $desc, $icon)
- {
- $irow = 0;
-
- echo '
- ';
-
- }
-
-}
-
diff --git a/admin-dev/themes/template/payment/content.tpl b/admin-dev/themes/template/payment/content.tpl
new file mode 100644
index 000000000..3fce05c3e
--- /dev/null
+++ b/admin-dev/themes/template/payment/content.tpl
@@ -0,0 +1,44 @@
+{*
+* 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$
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*}
+
+
+{/if}
+
diff --git a/admin-dev/themes/template/payment/restrictions.tpl b/admin-dev/themes/template/payment/restrictions.tpl
new file mode 100644
index 000000000..be5183c12
--- /dev/null
+++ b/admin-dev/themes/template/payment/restrictions.tpl
@@ -0,0 +1,99 @@
+{*
+* 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$
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*}
+
+
\ No newline at end of file
diff --git a/controllers/admin/AdminPaymentController.php b/controllers/admin/AdminPaymentController.php
new file mode 100644
index 000000000..872858e45
--- /dev/null
+++ b/controllers/admin/AdminPaymentController.php
@@ -0,0 +1,172 @@
+
+* @copyright 2007-2011 PrestaShop SA
+* @version Release: $Revision: 7307 $
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+class AdminPaymentControllerCore extends AdminController
+{
+ public $paymentModules = array();
+
+ public function __construct()
+ {
+ $shopID = Context::getContext()->shop->getID(true);
+
+ /* Get all modules then select only payment ones*/
+ $modules = Module::getModulesOnDisk();
+ foreach ($modules AS $module)
+
+ if ($module->tab == 'payments_gateways')
+ {
+ if ($module->id)
+ {
+ if(!get_class($module) == 'SimpleXMLElement')
+ $module->country = array();
+ $countries = DB::getInstance()->executeS('SELECT id_country FROM '._DB_PREFIX_.'module_country WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID);
+ foreach ($countries as $country)
+ $module->country[] = $country['id_country'];
+
+ if(!get_class($module) == 'SimpleXMLElement')
+ $module->currency = array();
+ $currencies = DB::getInstance()->executeS('SELECT id_currency FROM '._DB_PREFIX_.'module_currency WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID);
+ foreach ($currencies as $currency)
+ $module->currency[] = $currency['id_currency'];
+
+ if(!get_class($module) == 'SimpleXMLElement')
+ $module->group = array();
+ $groups = DB::getInstance()->executeS('SELECT id_group FROM '._DB_PREFIX_.'module_group WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID);
+ foreach ($groups as $group)
+ $module->group[] = $group['id_group'];
+ }
+ else
+ {
+ $module->country = NULL;
+ $module->currency = NULL;
+ $module->group = NULL;
+ }
+
+ $this->paymentModules[] = $module;
+ }
+
+ parent::__construct();
+ }
+
+ public function postProcess()
+ {
+ if (Tools::isSubmit('submitModulecountry'))
+ $this->saveRestrictions('country');
+ elseif (Tools::isSubmit('submitModulecurrency'))
+ $this->saveRestrictions('currency');
+ elseif (Tools::isSubmit('submitModulegroup'))
+ $this->saveRestrictions('group');
+ }
+
+ private function saveRestrictions($type)
+ {
+ Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'module_'.$type.' WHERE id_shop = '.Context::getContext()->shop->getID(true));
+ foreach ($this->paymentModules as $module)
+ if ($module->active AND isset($_POST[$module->name.'_'.$type.'']))
+ foreach ($_POST[$module->name.'_'.$type.''] as $selected)
+ $values[] = '('.(int)$module->id.', '.Context::getContext()->shop->getID(true).', '.(int)$selected.')';
+
+ if (sizeof($values))
+ Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'module_'.$type.' (`id_module`, `id_shop`, `id_'.$type.'`) VALUES '.implode(',', $values));
+ Tools::redirectAdmin(self::$currentIndex.'&conf=4'.'&token='.$this->token);
+ }
+
+ public function initContent()
+ {
+ // link to modules page
+ if (isset($this->paymentModules[0]))
+ $token_modules = Tools::getAdminToken('AdminModules'.(int)(Tab::getIdFromClassName('AdminModules')).(int)$this->context->employee->id);
+
+ $display_restrictions = false;
+ foreach ($this->paymentModules as $module)
+ if ($module->active)
+ {
+ $display_restrictions= true;
+ break;
+ }
+
+ $lists = array('currencies' =>
+ array('items' => Currency::getCurrencies(),
+ 'title' => $this->l('Currencies restrictions'),
+ 'desc' => $this->l('Please mark the checkbox(es) for the currency or currencies for which you want the payment module(s) to be available.'),
+ 'name_id' => 'currency',
+ 'identifier' => 'id_currency',
+ 'icon' => 'dollar',
+ ),
+ array('items' => Group::getGroups($this->context->language->id),
+ 'title' => $this->l('Groups restrictions'),
+ 'desc' => $this->l('Please mark the checkbox(es) for the groups for which you want the payment module(s) available.'),
+ 'name_id' => 'group',
+ 'identifier' => 'id_group',
+ 'icon' => 'group',
+ ),
+ array('items' =>Country::getCountries($this->context->language->id),
+ 'title' => $this->l('Countries restrictions'),
+ 'desc' => $this->l('Please mark the checkbox(es) for the country or countries for which you want the payment module(s) to be available.'),
+ 'name_id' => 'country',
+ 'identifier' => 'id_country',
+ 'icon' => 'world',
+ ),
+ );
+
+ foreach ($lists as $key_list => $list)
+ {
+ $list['check_list'] = array();
+ foreach ($list['items'] as $key_item => $item)
+ {
+ $name_id = $list['name_id'];
+ foreach ($this->paymentModules as $key_module => $module)
+ {
+ if (isset($module->$name_id) && in_array($item['id_'.$name_id], $module->$name_id))
+ $list['items'][$key_item]['check_list'][$key_module] = 'checked';
+ else
+ $list['items'][$key_item]['check_list'][$key_module] = 'unchecked';
+
+ // If is a country list and the country is limited, remove it from list
+ if ($name_id == 'country'
+ && isset($module->limited_countries)
+ && !empty($module->limited_countries)
+ && !(in_array(strtoupper($item['iso_code']), array_map('strtoupper', $module->limited_countries))))
+ $list['check_list'][$key_module] = null;
+ }
+ }
+ // update list
+ $lists[$key_list] = $list;
+ }
+
+ $this->context->smarty->assign(array(
+ 'url_modules' => isset($token_modules) ? 'index.php?tab=AdminModules&token='.$token_modules.'&module_name='.$this->paymentModules[0]->name.'&tab_module=payments_gateways' : null,
+ 'display_restrictions' => $display_restrictions,
+ 'lists' => $lists,
+ 'ps_base_uri' => __PS_BASE_URI__,
+ 'payment_modules' => $this->paymentModules,
+ 'url_submit' => self::$currentIndex.'&token='.$this->token,
+ ));
+
+ }
+}
+