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

// Display of payment modules per shop #PSTEST-833

Browse Source
This commit is contained in:
rMalie
2012-02-27 15:18:51 +00:00
parent 77774d0d94
commit 45cd48afb4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+2 -2
View File
@@ -309,6 +309,8 @@ class AdminControllerCore extends Controller
$this->tpl_folder = Tools::toUnderscoreCase(substr($this->controller_name, 5)).'/'; $this->tpl_folder = Tools::toUnderscoreCase(substr($this->controller_name, 5)).'/';
$this->context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT')); $this->context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
$this->initShopContext();
} }
/** /**
@@ -1645,8 +1647,6 @@ class AdminControllerCore extends Controller
$this->lite_display = true; $this->lite_display = true;
} }
$this->initShopContext();
if ($this->ajax && method_exists($this, 'ajaxPreprocess')) if ($this->ajax && method_exists($this, 'ajaxPreprocess'))
$this->ajaxPreProcess(); $this->ajaxPreProcess();
controllers/admin/AdminPaymentController.php
+2 -2
View File
@@ -31,6 +31,8 @@ class AdminPaymentControllerCore extends AdminController
public function __construct() public function __construct()
{ {
parent::__construct();
$shop_id = Context::getContext()->shop->id; $shop_id = Context::getContext()->shop->id;
/* Get all modules then select only payment ones */ /* Get all modules then select only payment ones */
@@ -80,8 +82,6 @@ class AdminPaymentControllerCore extends AdminController
$this->payment_modules[] = $module; $this->payment_modules[] = $module;
} }
parent::__construct();
} }
public function postProcess() public function postProcess()