Release 1.0.19

Author: sbossert

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.0/1.0.18/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.19/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.18/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.19/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.0/releases/tag/1.0.18/">
+		<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.19/">
 			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.0/releases/tag/1.0.18/">Download</a> the extension.</p>
+<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.19/">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/admin/model/extension/wallee/dynamic.php

@@ -119,7 +119,7 @@ private function createLanguageFiles(array $configuration, $type){
 
 			$title = array_values($configuration['title'])[0];
 			if (isset($configuration['title'][$restLang->getIetfCode()])) {
-				$title = \Wallee\Provider\Language::instance($this->registry)->find($code);
+				$title = $configuration['title'][$restLang->getIetfCode()];
 			}
 			$target = str_replace('#code#', WalleeVersionHelper::extractLanguageDirectory($language), $target_base);
 

upload/catalog/view/theme/journal2/template/payment/wallee/iframe.tpl

@@ -1,9 +1,27 @@
+<style>
+.panel-heading {
+	background-color: initial;
+}
+
+.route-checkout-checkout .panel-heading:hover {
+	background-color: initial;
+}
+
+.wallee-container {
+	padding: 15px;
+}
+
+#wallee-iframe-spinner {
+	display: none;
+	margin: auto;
+}
+</style>
 <div class="panel panel-default">
 	<div class="panel-heading">
 		<h4><?php echo $text_payment_title; ?></h4>
 		<span><?php echo $text_further_details; ?></span>
 	</div>
-	<div style="padding: 15px;">
+	<div class="wallee-container">
 		<div id="wallee-iframe-spinner" class="text-center">
 			<i style="font-size: 12em;" class='fa fa-spinner fa-spin '></i>
 		</div>
@@ -21,6 +39,10 @@
 	<script type="text/javascript" src="<?php echo $external_js; ?>"></script>
 	<script type="text/javascript" src="<?php echo $opencart_js; ?>"></script>
 	<script type="text/javascript">
+    $('#journal-checkout-confirm-button').attr('disabled', 'disabled');
+    if(typeof Window.walleeTimeout !== 'undefined') {
+        clearTimeout(Window.walleeTimeout);
+    }
 	function initAddressUpdates() {
 		if(typeof window.addressUpdateEventsSet === 'undefined') {
 			window.addressUpdateEventsSet = true;
@@ -57,18 +79,26 @@
 			registerAddressUpdates('shipping');
 		}
 	}
-	
     function initWalleeIframe(){
-    	if(typeof Wallee === 'undefined') {
-    		Window.loadWalleeTimeout = setTimeout(initWalleeIframe, 500);
-    	} else {
-    		Wallee.init('<?php echo $configuration_id; ?>');
-    		initAddressUpdates();
-    	}
+        jQuery('#wallee-iframe-spinner').css("display", "block");
+        if(typeof jQuery === 'undefined' || typeof Wallee === 'undefined') {
+            Window.walleeTimeout = setTimeout(initWalleeIframe, 500);
+        } else {
+            Wallee.init('<?php echo $configuration_id; ?>');
+            initAddressUpdates();
+        }
     }
-    if(typeof Window.loadWalleeTimeout !== 'undefined') {
-		clearTimeout(Window.loadWalleeTimeout);
+    var checked = $('[data-wallee-original-checked=true]').val();
+    if(checked && checked.startsWith('wallee_')) {
+        if (typeof Window.loadCounter === 'undefined') {
+            Window.loadCounter = 1;
+        } else if (Window.loadCounter == 1) {
+            Window.loadCounter++;
+        } else if (Window.loadCounter == 2) {
+            jQuery().ready(initWalleeIframe);
+        }
+    } else {
+        jQuery().ready(initWalleeIframe);
     }
-    jQuery().ready(initWalleeIframe);
     </script>
-</div>
+</div>

upload/system/library/wallee/autoload.php

@@ -3,7 +3,7 @@
 /**
  * Autoload function.
  * 
- * Includes the plugin classes as well as wallee sdk classes.
+ * Includes the plugin classes as well as Wallee sdk classes.
  *
  * After registering this autoload function with SPL, the following line
  * would cause the function to attempt to load the \Wallee\Sdk\Baz\Qux class