Merge branch 'master' into feature/PLUG-5038

Author: woutse

assets/logos/19.png

@@ -694,8 +694,8 @@ protected function startTransaction(WC_Order $order, $pickupLocation = null)
         $clean = preg_replace('/[^A-Za-z0-9]/u', '', $raw);
         $request->setReference($clean);
 
-        if ($this->getOptionId() == 1927) {
-            $request->setTerminal(PPMFWC_Helper_Data::getPostTextField('terminal_id'));
+        if ($this->getOptionId() == PayNL\Sdk\Model\Method::PIN) {
+            $request->setTerminal($this->getTerminal());
         }
 
         $extra1 = apply_filters('paynl-extra1', $order->get_order_number(), $order);
@@ -733,6 +733,30 @@ protected function startTransaction(WC_Order $order, $pickupLocation = null)
         return $payOrder;
     }
 
+    /**
+     * @return false|string
+     */
+    private function getTerminal()
+    {
+        $terminalThCode = PPMFWC_Helper_Data::getPostTextField('terminal_id');
+        $terminal_setting = $this->get_option('paynl_instore_terminal');
+
+        if ($terminal_setting == 'checkout') {
+            # do nothing, just use terminalThCode
+        }
+        if ($terminal_setting == 'checkout_save') {
+            # Only save the tg-code in the cookie. This will then later be integrated in the checkout-view(hidden).
+            setcookie('paynl_instore_terminal_id', $terminalThCode, time() + (60 * 60 * 24 * 365));
+
+        } elseif (str_starts_with(strtoupper($terminal_setting), 'TH')) {
+            # A designated TH-code is selected as preferred terminal, so always use this one.
+            $terminalThCode = $terminal_setting;
+        }
+
+
+        return $terminalThCode ?? '';
+    }
+
     /**
      * @return boolean
      */

includes/classes/PPMFWC/Gateway/Abstract.php

@@ -21,7 +21,7 @@ public static function getId()
      */
     public static function getName()
     {
-        return 'iDEAL in3';
+        return 'in3';
     }
 
     /**

includes/classes/PPMFWC/Gateway/CapayableGespreid.php

@@ -903,13 +903,15 @@ public static function ppmfwc_onReturn()
     public static function getOrderReturnUrl(WC_Order $order, $newStatus, $orderStatusId)
     {
         $payStatus = new PayStatus();
+        $method = $order->get_payment_method() ?? '';
 
-        if ($payStatus->get($orderStatusId) === PayStatus::CANCEL)
-        {
+        if ($method == 'pay_gateway_instore' && (in_array($newStatus, [PPMFWC_Gateways::STATUS_CANCELED, PPMFWC_Gateways::STATUS_PENDING]))) {
             $url = add_query_arg('paynl_status', PPMFWC_Gateways::STATUS_CANCELED, wc_get_checkout_url());
-        } elseif ($payStatus->get($orderStatusId) === PayStatus::DENIED ||
-                  $newStatus == PPMFWC_Gateways::STATUS_DENIED)
-        {
+
+        } elseif ($payStatus->get($orderStatusId) === PayStatus::CANCEL) {
+            $url = add_query_arg('paynl_status', PPMFWC_Gateways::STATUS_CANCELED, wc_get_checkout_url());
+
+        } elseif ($payStatus->get($orderStatusId) === PayStatus::DENIED || $newStatus == PPMFWC_Gateways::STATUS_DENIED) {
             $methodName = $order->get_payment_method_title();
             if (!empty($methodName)) {
                 wc_add_notice(

includes/classes/PPMFWC/Gateways.php

@@ -298,7 +298,7 @@ private static function parseDefaultLanguage($http_accept, $deflang = "en")
      */
     public static function getVersion()
     {
-        return '4.0.2';
+        return '4.0.3';
     }
 
     /**

includes/classes/PPMFWC/Helper/Data.php

@@ -4,9 +4,9 @@ Donate link: https://www.pay.nl/webshops/plugin-woocommerce
 Link: https://www.pay.nl
 Tags: paynl, paymentmethods, iDEAL, betaalmethoden, pay
 Requires at least: 6.1.0
-Stable tag: 4.0.2
-Tested up to: 6.8.3
-WC tested up to: 10.3.3
+Stable tag: 4.0.3
+Tested up to: 6.9.0
+WC tested up to: 10.3.5
 WC requires at least: 3.0
 Requires PHP: 8.1
 License: GPLv2
@@ -188,6 +188,8 @@ Paid accounts have better tariffs! see: [tariffs](https://pay.nl/tarieven)
 8. One platform for all payments.
 
 == Changelog ==
+= 4.0.3 =
+Improved handling paid order data
 = 4.0.2 =
 Added option expire-time for transactions
 Fixed Klarna issue

readme.txt

@@ -4,7 +4,7 @@
  * Plugin Name: Pay. Payment Methods for WooCommerce
  * Plugin URI: https://wordpress.org/plugins/woocommerce-paynl-payment-methods/
  * Description: Pay. Payment Methods for WooCommerce
- * Version: 4.0.2
+ * Version: 4.0.3
  * Author: Pay.
  * Author URI: https://www.pay.nl
  * Requires at least: 6.1.0