Merge branch 'master' into feature/PLUG-4263

Author: woutse

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

@@ -24,7 +24,7 @@ class PPMFWC_Helper_Data
     public static function ppmfwc_payLogger($message, $payTransactionId = null, $infoFields = array(), $type = 'info')
     {
         if (self::$paylog === null) {
-            self::$paylog = get_option('paynl_paylogger') == 'yes';
+            self::$paylog = get_option('paynl_paylogger', 'yes') === 'yes';
         }
 
         if (self::$paylog === true || strtolower($type) == 'critical') {
@@ -298,7 +298,7 @@ private static function parseDefaultLanguage($http_accept, $deflang = "en")
      */
     public static function getVersion()
     {
-        return '4.0.1';
+        return '4.0.2';
     }
 
     /**

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 =

vendor/paynl/php-sdk/src/Model/Products.php

@@ -55,7 +55,7 @@ public function setProducts(array $products): self
      */
     public function addProduct(Product $product): self
     {
-        $this->set($product->getId(), $product);
+        $this->add($product);
         return $this;
     }
 

vendor/paynl/php-sdk/src/Util/Exchange.php

@@ -200,7 +200,7 @@ private function legacyReturn(array $request)
     public function getPayLoad()
     {
         if (!empty($this->payload)) {
-            # Payload already initilized, then return payload.
+            # Payload already initialized, then return payload.
             return $this->payload;
         }
 

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