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

classes/controller/AdminController.php

@@ -309,6 +309,8 @@ class AdminControllerCore extends Controller
 		$this->tpl_folder = Tools::toUnderscoreCase(substr($this->controller_name, 5)).'/';
 
 		$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->initShopContext();
-
 		if ($this->ajax && method_exists($this, 'ajaxPreprocess'))
 			$this->ajaxPreProcess();
 

controllers/admin/AdminPaymentController.php

@@ -31,6 +31,8 @@ class AdminPaymentControllerCore extends AdminController
 
 	public function __construct()
 	{
+		parent::__construct();
+
 		$shop_id = Context::getContext()->shop->id;
 
 		/* Get all modules then select only payment ones */
@@ -80,8 +82,6 @@ class AdminPaymentControllerCore extends AdminController
 
 				$this->payment_modules[] = $module;
 			}
-
-		parent::__construct();
 	}
 
 	public function postProcess()