Release 1.2.35

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.6/1.2.37/docs/en/documentation.html)
+* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/prestashop-1.6/1.2.35/docs/en/documentation.html)
 
 ## Support
 
 Support queries can be issued on the [PostFinance Checkout support site](https://www.postfinance.ch/en/business/support.html).
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/prestashop-1.6/blob/1.2.37/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/prestashop-1.6/blob/1.2.35/LICENSE) for more information.
 
 ## Other PrestaShop Versions
 

docs/en/documentation.html

@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/prestashop-1.6/releases/tag/1.2.37/">
+		<a href="https://github.com/pfpayments/prestashop-1.6/releases/tag/1.2.35/">
 			Source
 		</a>
 	</li>
@@ -54,7 +54,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/pfpayments/prestashop-1.6/releases/tag/1.2.37/">Download</a> the module.</p>
+<p><a href="https://github.com/pfpayments/prestashop-1.6/releases/tag/1.2.35/">Download</a> the module.</p>
 </li>
 <li>
 <p>Login to the backend of your PrestsShop store.</p>

inc/Backend/Defaultstrategy.php

@@ -1019,10 +1019,7 @@ public function getRefundTotal(array $parsedData)
 
     public function isVoucherOnlyPostFinanceCheckout(Order $order, array $postData)
     {
-        if (method_exists('PostFinanceCheckoutVersionadapter', 'isVoucherOnlyPostFinanceCheckout')) {
-            return PostFinanceCheckoutVersionadapter::isVoucherOnlyPostFinanceCheckout($postData);
-        }
-        return FALSE;
+        return PostFinanceCheckoutVersionadapter::isVoucherOnlyPostFinanceCheckout($postData);
     }
 
     public function isCancelRequest(Order $order, array $postData)

inc/Basemodule.php

@@ -150,7 +150,7 @@ public static function installHooks(PostFinanceCheckout $module)
             $module->registerHook('displayAdminOrderMain') && $module->registerHook('displayAdminOrderTabLink') &&
             $module->registerHook('displayBackOfficeHeader') && $module->registerHook('displayOrderDetail') &&
             $module->registerHook('actionProductCancel') && $module->registerHook('postFinanceCheckoutSettingsChanged') &&
-            $module->registerHook('actionOrderSlipAdd');
+            $module->registerHook('actionAfterUpdateCancelProductFormHandler');
     }
 
     public static function installConfigurationValues()
@@ -1843,7 +1843,7 @@ public static function hookDisplayBackOfficeHeader(PostFinanceCheckout $module,
         }
         self::handleVoucherAddRequest($module);
         self::handleVoucherDeleteRequest($module);
-        self::handleRefundRequest($module);
+        // self::handleRefundRequest($module);
         self::handleCancelProductRequest($module);
     }
 

inc/Exception/Incompleteconfig.php

@@ -24,7 +24,7 @@ class PostFinanceCheckoutExceptionIncompleteconfig extends Exception
      * @param Throwable|null $previous
      *   The previously thrown exception.
      */
-    public function __construct($message = "The configuration is not complete", $code = 0, Throwable $previous = null) {
+    public function __construct($message = "The configuration is not complete", int $code = 0, ?Throwable $previous = null) {
         parent::__construct($message, $code, $previous);
     }
 }

inc/Helper.php

@@ -11,9 +11,9 @@
 
 class PostFinanceCheckoutHelper
 {
-	protected static $shop_system = 'x-meta-shop-system';
-	protected static $shop_system_version = 'x-meta-shop-system-version';
-	protected static $shop_system_and_version = 'x-meta-shop-system-and-version';
+	public const SHOP_SYSTEM = 'x-meta-shop-system';
+	public const SHOP_SYSTEM_VERSION = 'x-meta-shop-system-version';
+	public const SHOP_SYSTEM_AND_VERSION = 'x-meta-shop-system-and-version';
 
     private static $apiClient;
 
@@ -675,18 +675,11 @@ public static function getMaxExecutionTime()
 	protected static function getDefaultHeaderData()
 	{
 		$shop_version = _PS_VERSION_;
-        $version_array = explode('.', $shop_version, 3);
-        if (count($version_array) < 2) {
-            // The format in _PS_VERSION_ has changed and it's unknown to us.
-            return [];
-
-        }
-        $major_version = current($version_array);
-        $minor_version = next($version_array);
+		[$major_version, $minor_version, $_] = explode('.', $shop_version, 3);
 		return [
-			self::$shop_system             => 'prestashop',
-			self::$shop_system_version     => $shop_version,
-			self::$shop_system_and_version => 'prestashop-' . $major_version . '.' . $minor_version,
+			self::SHOP_SYSTEM             => 'prestashop',
+			self::SHOP_SYSTEM_VERSION     => $shop_version,
+			self::SHOP_SYSTEM_AND_VERSION => 'prestashop-' . $major_version . '.' . $minor_version,
 		];
 	}
 }

inc/Service/Refund.php

@@ -47,6 +47,16 @@ public function getRefundByExternalId($spaceId, $externalId)
         }
     }
 
+    /**
+     * Executes the refund, saving it in the database (via database transaction)
+     * and then sending the refund information to the portal.
+     *
+     * @param Order $order
+     * @param array $parsedParameters
+     * @return void
+     * 
+     * @see hookActionProductCancel
+     */
     public function executeRefund(Order $order, array $parsedParameters)
     {
         $currentRefundJob = null;
@@ -177,6 +187,15 @@ protected function sendRefund($refundJobId)
         }
     }
 
+    /**
+     * This functionality is called from a webhook, triggered by the portal.
+     * Updates the status of the order in the shop.
+     *
+     * @param [type] $refundJobId
+     * @return void
+     * 
+     * @see PostFinanceCheckoutWebhookRefund::process
+     */
     public function applyRefundToShop($refundJobId)
     {
         $refundJob = new PostFinanceCheckoutModelRefundjob($refundJobId);

inc/Versionadapter.php

@@ -29,15 +29,4 @@ public static function getAdminOrderTemplate()
     {
         return 'views/templates/admin/hook/admin_order.tpl';
     }
-
-    /**
-     * Returns true if the refund is only voucher, not required to be sent to PostFinanceCheckout.
-     *
-     * @param [] $postData
-     * @return boolean
-     */
-    public static function isVoucherOnlyPostFinanceCheckout($postData)
-    {
-        return isset($postData['generateDiscountRefund']) && ! isset($postData['postfinancecheckout_offline']);
-    }
 }

postfinancecheckout.php

@@ -34,7 +34,7 @@ public function __construct()
         $this->author = 'Customweb GmbH';
         $this->bootstrap = true;
         $this->need_instance = 0;
-        $this->version = '1.2.37';
+        $this->version = '1.2.35';
         $this->displayName = 'PostFinance Checkout';
         $this->description = $this->l('This PrestaShop module enables to process payments with %s.');
         $this->description = sprintf($this->description, 'PostFinance Checkout');

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/en-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.6/1.2.37/docs/en/documentation.html" target="_blank">{l s='Documentation' mod='postfinancecheckout'}</a></p>
+<p><a class="btn btn-default" href="https://checkout.postfinance.ch/en-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.6/1.2.35/docs/en/documentation.html" target="_blank">{l s='Documentation' mod='postfinancecheckout'}</a></p>
 </div>