Release 1.0.14

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.13/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.14/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.13/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.14/LICENSE) for more information.

docs/en/assets/base.css

@@ -253,6 +253,30 @@ table td[class*="col-"],table th[class*="col-"] {
   display: table-cell;
 }
 
+ol.glossary {
+    counter-reset: glossary-counter;
+    list-style: none;
+    padding-left: 40px;
+}
+
+ol.glossary li {
+    counter-increment: glossary-counter;
+    position: relative;
+}
+
+ol.glossary li::before {
+    content: counter(glossary-counter);
+    position: absolute;
+    background-color: #73EAA9;
+    color: #fff;
+    border-radius: 100px;
+    width: 24px;
+    left: -40px;
+    text-align: center;
+    font-weight: bold;
+    line-height: 24px;
+}
+
 .layout-wrapper {
   position: relative;
   width: 100%;

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.13/">
+		<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.14/">
 			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.13/">Download</a> the extension.</p>
+<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.14/">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/modification.php

@@ -6,8 +6,15 @@ class ModelExtensionWalleeModification extends AbstractModel {
 
 	public function install(){
 		$path = DIR_SYSTEM . "library/wallee/modification/";
+		$installedModifications = $this->getModificationModel()->getModifications();
 		foreach (WalleeVersionHelper::getModifications() as $code => $modification) {
-			$this->importModification($path . $modification['file'], $modification['default_status']);
+			$status = 0;
+			foreach($installedModifications as $installedModification) {
+				if($installedModification['code'] == $code) {
+					$status = $installedModification['status'];
+				}
+			}
+			$this->importModification($path . $modification['file'], $status);
 		}
 	}
 

upload/admin/model/extension/wallee/setup.php

@@ -36,8 +36,8 @@ public function uninstall($purge = true){
 		$this->model_extension_wallee_dynamic->uninstall();
 		if ($purge) {
 			$this->model_extension_wallee_migration->purge();
+			$this->model_extension_wallee_modification->uninstall();
 		}
-		$this->model_extension_wallee_modification->uninstall();
 
 		$this->removeEvents();
 		$this->removePermissions();

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

@@ -8,34 +8,24 @@
 	<link>http://github.com/wallee-payment/opencart</link>
 	<file path="admin/controller/extension/payment.php">
 		<operation>
-			<search><![CDATA[
-       				$this->model_extension_extension->uninstall('payment', $value);
-            ]]></search>
-			<add position="replace" offset="2"><![CDATA[
-		            if (strpos($value, 'wallee_') === false) {
+			<search><![CDATA[$this->model_extension_extension->uninstall('payment', $value);]]></search>
+			<add position="replace" offset="2"><![CDATA[if (strpos($value, 'wallee_') === false) {
 		            	$this->model_extension_extension->uninstall('payment', $value);
-		            }
-            ]]></add>
+		            }]]></add>
 		</operation>
+	</file>
+	<file path="admin/controller/extension/payment.php">
 		<operation>
-			<search><![CDATA[
-       				unset($extensions[$key]);
-            ]]></search>
-			<add position="replace" offset="2"><![CDATA[
-		            if (strpos($value, 'wallee_') === false) {
+			<search><![CDATA[unset($extensions[$key]);]]></search>
+			<add position="replace" offset="2"><![CDATA[if (strpos($value, 'wallee_') === false) {
 		            	unset($extensions[$key]);
-		            }
-            ]]></add>
+		            }]]></add>
 		</operation>
 	</file>
 	<file path="admin/controller/error/permission.php">
 		<operation>
-			<search><![CDATA[
-				$ignore = array(
-            ]]></search>
-			<add position="after"><![CDATA[
-					'extension/wallee',
-            ]]></add>
+			<search><![CDATA[$ignore = array(]]></search>
+			<add position="after"><![CDATA['extension/wallee',]]></add>
 		</operation>
 	</file>
 	<!-- order info -->
@@ -59,12 +49,8 @@
 	</file>
 	<file path="admin/controller/sale/order.php">
 		<operation>
-			<search><![CDATA[
-				if (is_file(DIR_CATALOG . 'controller/payment/' . $order_info['payment_code'] . '.php')) {
-            ]]></search>
-			<add position="replace"><![CDATA[
-				if (is_file(DIR_CATALOG . 'controller/payment/' . $order_info['payment_code'] . '.php') || strpos($order_info['payment_code'], 'wallee_') === 0) {
-            ]]></add>
+			<search><![CDATA[if (is_file(DIR_CATALOG . 'controller/payment/' . $order_info['payment_code'] . '.php')) {]]></search>
+			<add position="replace"><![CDATA[if (is_file(DIR_CATALOG . 'controller/payment/' . $order_info['payment_code'] . '.php') || strpos($order_info['payment_code'], 'wallee_') === 0) {]]></add>
 		</operation>
 	</file>