Merge branch 'master' into feature/PLUG-5038

Author: woutse

includes/classes/PPMFWC/Gateway/Abstract.php

@@ -682,6 +682,11 @@ protected function startTransaction(WC_Order $order, $pickupLocation = null)
         $request->setDescription(str_replace('__', ' ', $prefix) . $order->get_order_number());
         $request->setAmount($order->get_total());
 
+        $expireTime = get_option('paynl_payment_expire_time');
+        if (!empty($expireTime)) {
+            $request->setExpire(date('c', time() + ($expireTime * 60)));
+        }
+
         $raw = (string)($order->get_order_number() ?? '');
         $clean = preg_replace('/[^A-Za-z0-9]/u', '', $raw);
         $request->setReference($clean);

includes/classes/PPMFWC/Gateways.php

@@ -613,6 +613,15 @@ public static function ppmfwc_addGlobalSettings()
               'text' => '<h2 class="paynl_advanced_settings_title">' . esc_html(__('Advanced settings', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)) . '</h2>'
             );
 
+
+            $addedSettings[] = array(
+                'name' => esc_html(__('Expire time', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)),
+                'type' => 'number',
+                'placeholder' => '',
+                'desc' => esc_html(__('Enter your desired transaction expire time in minutes', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)),
+                'id' => 'paynl_payment_expire_time',
+                'desc_tip' => __('Automatically cancel transactions and orders sooner than the default 4-hour expiry by setting your own time in minutes.', PPMFWC_WOOCOMMERCE_TEXTDOMAIN),
+            );
             $addedSettings[] = array(
                 'name' => esc_html(__('Test IP address', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)),
                 'type' => 'text',

includes/classes/PPMFWC/Helper/Config.php

@@ -219,7 +219,7 @@ public static function getPayProducts(WC_Order $order): \PayNL\Sdk\Model\Product
                         $fee['name'],
                         $fee['line_total'],
                         null,
-                        PayNL\Sdk\Model\Product::TYPE_DISCOUNT,
+                        PayNL\Sdk\Model\Product::TYPE_HANDLING,
                         1,
                         null,
                         null

includes/classes/PPMFWC/Helper/Data.php

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

includes/classes/PPMFWC/Helper/Transaction.php

@@ -298,11 +298,18 @@ public static function processTransaction(\PayNL\Sdk\Model\Pay\PayOrder $payOrde
                         $order->save();
                     } else {
                         $order->payment_complete($transactionId);
-                        $order->add_order_note(sprintf(esc_html(__('Pay.: Payment complete (%s).', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)), $payApiStatus));
+                        if (!empty($payOrder->getCustomerId())) {
+                            $order->add_order_note(sprintf(esc_html(__('Pay.: Payment complete (%s). customerkey: %s', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)), $payApiStatus, $payOrder->getCustomerId())); // phpcs:ignore
+                        } else {
+                            $order->add_order_note(sprintf(esc_html(__('Pay.: Payment complete (%s).', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)), $payApiStatus));
+                        }
                     }
                 }
 
-                break;
+            update_post_meta($orderId, 'CustomerName', esc_attr($payOrder->getCustomerName() ?? ''));
+            update_post_meta($orderId, 'CustomerKey', esc_attr($payOrder->getCustomerId() ?? ''));
+
+            break;
 
             case PPMFWC_Gateways::STATUS_DENIED:
                 $order->add_order_note(esc_html(__('Pay.: Payment denied. ', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)));

readme.txt

@@ -4,7 +4,7 @@ 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.1
+Stable tag: 4.0.2
 Tested up to: 6.8.3
 WC tested up to: 10.3.3
 WC requires at least: 3.0
@@ -188,6 +188,10 @@ Paid accounts have better tariffs! see: [tariffs](https://pay.nl/tarieven)
 8. One platform for all payments.
 
 == Changelog ==
+= 4.0.2 =
+Added option expire-time for transactions
+Fixed Klarna issue
+Fixed passing products to Pay with same productId
 = 4.0.1 =
 Fixed processing issues
 = 4.0.0 =

woocommerce-payment-paynl.php

@@ -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.1
+ * Version: 4.0.2
  * Author: Pay.
  * Author URI: https://www.pay.nl
  * Requires at least: 6.1.0