Release 1.2.11

pfpayments · Nov 15, 2021 · cc86abb · cc86abb
1 parent 87bc9ef
commit cc86abb
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -15,15 +15,15 @@ This repository contains the PrestaShop PostFinance Checkout payment module that
 
 ## Documentation
 
-* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/prestashop-1.7/1.2.10/docs/en/documentation.html)
+* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/prestashop-1.7/1.2.11/docs/en/documentation.html)
 
 ## Support
 
 Support queries can be issued on the [PostFinance Checkout support site](https://www.postfinance.ch/en/business/support/written-contact/contact-form.html).
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/prestashop-1.7/blob/1.2.10/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/prestashop-1.7/blob/1.2.11/LICENSE) for more information.
 
 ## Other PrestaShop Versions
 

diff --git a/docs/en/documentation.html b/docs/en/documentation.html
@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/prestashop-1.7/releases/tag/1.2.10/">
+		<a href="https://github.com/pfpayments/prestashop-1.7/releases/tag/1.2.11/">
 			Source
 		</a>
 	</li>
@@ -51,7 +51,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/pfpayments/prestashop-1.7/releases/tag/1.2.10/">Download</a> the module.</p>
+<p><a href="https://github.com/pfpayments/prestashop-1.7/releases/tag/1.2.11/">Download</a> the module.</p>
 </li>
 <li>
 <p>Login to the backend of your PrestsShop store.</p>

diff --git a/postfinancecheckout.php b/postfinancecheckout.php
@@ -32,7 +32,7 @@ public function __construct()
         $this->author = 'Customweb GmbH';
         $this->bootstrap = true;
         $this->need_instance = 0;
-        $this->version = '1.2.10';
+        $this->version = '1.2.11';
         $this->displayName = 'PostFinance Checkout';
         $this->description = $this->l('This PrestaShop module enables to process payments with %s.');
         $this->description = sprintf($this->description, 'PostFinance Checkout');

diff --git a/views/js/admin/order.js b/views/js/admin/order.js
@@ -14,9 +14,20 @@ jQuery(function ($) {
         if (_PS_VERSION_ === undefined) {
             return false;
         } else {
-            return _PS_VERSION_.startsWith('1.7.7');
+            return compareVersions(_PS_VERSION_, "1.7.7");
         }
     }
+
+    function compareVersions (currentVersion, minVersion)
+    {
+        currentVersion = currentVersion.split('.');
+        minVersion = minVersion.split('.');
+        // we only care about the 3rd digit of the version as 1.8 will be a whole different kettle of fish
+        if (typeof currentVersion[2] === 'undefined') {
+            return false;
+        }
+        return (currentVersion[2] >= minVersion[2]) ? true : false;
+    }
 
     function movePostFinanceCheckoutDocuments()
     {

diff --git a/views/js/frontend/checkout.js b/views/js/frontend/checkout.js
@@ -144,7 +144,7 @@ jQuery(function ($) {
         },
 
         process_submit_button : function (method_id) {
-            if (!this.processing) {
+            if(!this.processing) {
                 this.disable_pay_button();
                 if (this.payment_methods[method_id].handler == null) {
                     this.create_order(method_id);
@@ -165,7 +165,7 @@ jQuery(function ($) {
             this.processing = false;
             this.hide_loading_spinner();
             this.remove_existing_errors();
-            if (errors) {
+            if(errors) {
                 this.show_new_errors(errors);
             }
         },

diff --git a/views/templates/admin/admin_help_buttons.tpl b/views/templates/admin/admin_help_buttons.tpl
@@ -10,5 +10,5 @@
 <div class="alert alert-info">
 <img src="../modules/postfinancecheckout/logo.png" style="float:left; margin-right:15px;" height="50">
 <p><strong>{l s='This module requires an %s account.' sprintf='PostFinance Checkout' mod='postfinancecheckout'}</strong></p>
-<p><a class="btn btn-default" href="https://checkout.postfinance.ch/user/signup" target="_blank">{l s='Sign Up' mod='postfinancecheckout'}</a> <a class="btn btn-default" href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/prestashop-1.7/1.2.10/docs/en/documentation.html" target="_blank">{l s='Documentation' mod='postfinancecheckout'}</a></p>
+<p><a class="btn btn-default" href="https://checkout.postfinance.ch/user/signup" target="_blank">{l s='Sign Up' mod='postfinancecheckout'}</a> <a class="btn btn-default" href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/prestashop-1.7/1.2.11/docs/en/documentation.html" target="_blank">{l s='Documentation' mod='postfinancecheckout'}</a></p>
 </div>
diff --git a/views/templates/admin/hook/admin_order177.tpl b/views/templates/admin/hook/admin_order177.tpl
@@ -7,7 +7,7 @@
  * @copyright 2017 - 2021 customweb GmbH
  * @license http://www.apache.org/licenses/LICENSE-2.0 Apache Software License (ASL 2.0)
 *}
-
+{if (isset($showAuthorizedActions) && $showAuthorizedActions)}
 	<div style="display:none;" class="hidden-print">
 		<a class="btn btn-action postfinancecheckout-management-btn"  id="postfinancecheckout_void">
 			<i class="icon-remove"></i>
@@ -68,7 +68,7 @@
 			{l s='This finalizes the order, it no longer can be changed.' mod='postfinancecheckout'}			
 		{/if}		
 	</div>
-
+{/if}
 
 {if (isset($showUpdateActions) && $showUpdateActions)}
 <div style="display:none;" class="hidden-print">