Release 1.0.12

README.md

@@ -11,8 +11,8 @@ This repository contains the OpenCart  wallee payment module that enables the sh
 
 ## Documentation
 
-* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.2/1.0.11/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.2/1.0.12/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/opencart-2.2/blob/1.0.11/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/opencart-2.2/blob/1.0.12/LICENSE) for more information.

docs/en/documentation.html

@@ -21,7 +21,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/opencart-2.2/releases/tag/1.0.11/">
+		<a href="https://github.com/wallee-payment/opencart-2.2/releases/tag/1.0.12/">
 			Source
 		</a>
 	</li>
@@ -48,7 +48,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/wallee-payment/opencart-2.2/releases/tag/1.0.11/">Download</a> the extension.</p>
+<p><a href="https://github.com/wallee-payment/opencart-2.2/releases/tag/1.0.12/">Download</a> the extension.</p>
 </li>
 <li>
 <p>Extract the files and upload the content of the <code>Upload</code> directory into the root directory of your store using FTP/SSH.</p>

upload/system/library/wallee/controller/abstract_controller.php

@@ -13,13 +13,8 @@
 abstract class AbstractController extends \Controller {
 
 	protected function loadView($template, $data = array()){
-		$template = \WalleeVersionHelper::getTemplate($template);
-		if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/' . $template)) {
-			return $this->load->view($this->config->get('config_template') . '/template/' . $template, $data);
-		}
-		else {
-			return $this->load->view($template, $data);
-		}
+	    $template = \WalleeVersionHelper::getTemplate($this->config->get('config_template'), $template);
+	    return $this->load->view($template, $data);
 	}
 
 	protected function validate(){

upload/system/library/wallee/modification/WalleeCore.ocmod.xml

@@ -48,6 +48,8 @@
 				is_file(modification($file))
             ]]></add>
 		</operation>
+	</file>	
+	<file path="system/library/language.php">
 		<operation>
 			<search><![CDATA[
 				file_exists($file)
@@ -56,6 +58,8 @@
 				file_exists(modification($file))
             ]]></add>
 		</operation>
+	</file>	
+	<file path="system/library/language.php">
 		<operation>
 			<search regex="true"><![CDATA[
 	~(require|include)(_once)?\(([^)]+)~
@@ -75,6 +79,8 @@
 	is_file(modification($file))
             ]]></add>
 		</operation>
+	</file>	
+	<file path="system/engine/action.php">
 		<operation>
 			<search regex="true"><![CDATA[
 	~(require|include)(_once)?\(([^)]+)~

upload/system/library/wallee/version_helper.php

@@ -62,7 +62,7 @@ public static function extractPaymentSettingCode($code) {
 	public static function persistPluginStatus(\Registry $registry, array $post) {
 	}
 
-	public static function getTemplate($template){
+	public static function getTemplate($theme, $template){
 		return $template;
 	}