From 6cc46d77367c814b7a3e0045bc93c22ca4bc697d Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <thomas.hunziker@customweb.com>
Date: Fri, 22 Mar 2019 13:48:08 +0100
Subject: [PATCH] Release 1.0.12

---
 README.md                                       |   4 ++--
 docs/en/documentation.html                      |   4 ++--
 upload/admin/view/image/payment/wallee.png      | Bin 437 -> 439 bytes
 .../wallee/controller/abstract_controller.php   |   9 ++-------
 .../wallee/modification/WalleeCore.ocmod.xml    |   6 ++++++
 upload/system/library/wallee/version_helper.php |   2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 7825510..63ab5ca 100644
--- a/README.md
+++ b/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.
\ No newline at end of file
+Please see the [license file](https://github.com/wallee-payment/opencart-2.2/blob/1.0.12/LICENSE) for more information.
\ No newline at end of file
diff --git a/docs/en/documentation.html b/docs/en/documentation.html
index 368365e..eeff08a 100644
--- a/docs/en/documentation.html
+++ b/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>
diff --git a/upload/admin/view/image/payment/wallee.png b/upload/admin/view/image/payment/wallee.png
index b5c0e79e981bdebfaaed5a972073a63189ad7bc8..d6ea5baddd6293438d64c3070899c6aab8f5120e 100644
GIT binary patch
delta 413
zcmV;O0b>5O1GfW^B!7NML_t(|UbT=(PXa*@h3khZE~p@&#)vT{Ui~k6@MiStu52=_
zo=l9WM`5}#Y(m*@U<N3Nx31(%US3zdHyPS_sk2RJyV_uz&{n0vHlakh!8V~p$q0*3
zyx3ryP^{pxO=#0`S#nTTd{ouETT+1+Gr$ATzK<PvxRE)4qJMdpB^A|U%;`rf@b*oR
zKhVC99Sm+{4xq@h%aV#aDyX#rFIgNHK>I#+yaID0a{xthMhK<~MqaWoQDC(1PZi9`
zqK&M}lJcnF<h>Pmd(OB3+V`=8!HvuTw4QNU;?#!)XSH_VB_|4?eIGlR?00u22hdtt
zvE=fr;~l-~Uw=;IG)FUvFGd~)8Xn%TgE{}~%;W$HrxZ()dCl$qz&q^rhhUn$frs?5
ziyN5(DEwr^9FEIB{MH<P9U_b7w;ei759nbHdpp>b_dc}xsQ5qPY0Z(;tPc-w(wET6
zgJPS|^1Wi4(9)e|n^5RhvrQ;;V}wO$@mjM@XyHn;O&0zDw1Gch4JZ*%00000NkvXX
Hu0mjfm>kFC

delta 411
zcmV;M0c8HS1GNK?B!7HKL_t(|+O?2LPr^_Xh3^kl98eKOOw^5-7}ov?UAl0iEZv|8
z3J3@VjJi;9Bx-2;7-|`g9pur}s;hUCFS+@8drn$fzHC4w6t2n;2`yD*h=f9A86u&O
zWGn)q#gYt>&_YpxNGN!rKqNF@P~hf@bz#oVeVe<D3d3-mw|}u0&2p&^9bQ=!$SZKe
z3+~$7MarWB=WXnHRN$3Gft<0pxKbSj-!39K3LLk*;9ZAT7R{Y2a5F5}zHM{2UK$lR
zZx5dAf}~O4l|{2z1#YT}U9em0a2Iv_qEJrd{_yqFa)~z`URgAgQQ;<D*R7XsSP$VG
z!)k$XXU_hk#(#ZX>sxN`L4#Ko`O_-gM5QMB13OIb+nCep4fw7Z`|!rxSMm&AS>!)6
z77w<nEz~=9ni(WDx>z$pHj7PMt3CcTwN~G9zva;Msfxb{XBh(NpFWsj2pP}*d!MFK
zDnvq)NfjcYi4z8qkT1a?67n4zi$G}nh(RPY7H1I27ZjxvKH@zyfB*mh002ovPDHLk
FV1nFCxz7Lq

diff --git a/upload/system/library/wallee/controller/abstract_controller.php b/upload/system/library/wallee/controller/abstract_controller.php
index 86ba761..9c2d2c3 100644
--- a/upload/system/library/wallee/controller/abstract_controller.php
+++ b/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(){
diff --git a/upload/system/library/wallee/modification/WalleeCore.ocmod.xml b/upload/system/library/wallee/modification/WalleeCore.ocmod.xml
index 2334641..9a62ef9 100644
--- a/upload/system/library/wallee/modification/WalleeCore.ocmod.xml
+++ b/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)?\(([^)]+)~
diff --git a/upload/system/library/wallee/version_helper.php b/upload/system/library/wallee/version_helper.php
index e7374d5..c86d349 100644
--- a/upload/system/library/wallee/version_helper.php
+++ b/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;
 	}