Merge pull request #596 from krokedil/develop

Version 2.12.7
krokedil · Jul 5, 2024 · 1ba3626 · 1ba3626
2 parents 0cf000c + f1b14ea
commit 1ba3626
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/includes/kco-functions.php b/includes/kco-functions.php
@@ -732,7 +732,11 @@ function ( $order_line ) {
 	} elseif ( ! empty( $klarna_shipping ) && ! empty( $shipping ) ) {
 		// If KSA is enabled, we'll skip the control.
 		$is_ksa = strpos( $shipping['reference'], 'klarna_kss' ) !== false;
-		if ( ! $is_ksa && $shipping['reference'] !== $klarna_shipping['reference'] ) {
+
+		$klarna_reference = explode( ':', $klarna_shipping['reference'] ?? '' )[0];
+		$woo_reference    = explode( ':', $shipping['reference'] ?? '' )[0];
+
+		if ( ! $is_ksa && strpos( $woo_reference, $klarna_reference ) === false ) {
 			$mismatch = true;
 		}
 	}

diff --git a/klarna-checkout-for-woocommerce.php b/klarna-checkout-for-woocommerce.php
@@ -5,7 +5,7 @@
  * Description: Klarna Checkout payment gateway for WooCommerce.
  * Author: Klarna
  * Author URI: https://klarna.com/
- * Version: 2.12.6
+ * Version: 2.12.7
  * Text Domain: klarna-checkout-for-woocommerce
  * Domain Path: /languages
  *
@@ -35,7 +35,7 @@
 /**
  * Required minimums and constants
  */
-define( 'KCO_WC_VERSION', '2.12.6' );
+define( 'KCO_WC_VERSION', '2.12.7' );
 define( 'KCO_WC_MIN_PHP_VER', '5.6.0' );
 define( 'KCO_WC_MIN_WC_VER', '3.9.0' );
 define( 'KCO_WC_MAIN_FILE', __FILE__ );

diff --git a/languages/klarna-checkout-for-woocommerce.pot b/languages/klarna-checkout-for-woocommerce.pot
@@ -8,7 +8,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: Krokedil <info@krokedil.se>\n"
 "Last-Translator: Krokedil <info@krokedil.se>\n"
-"POT-Creation-Date: 2024-07-04 10:01+0000\n"
+"POT-Creation-Date: 2024-07-05 15:24+0000\n"
 "Report-Msgid-Bugs-To: http://krokedil.se\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c\n"
@@ -528,7 +528,7 @@ msgstr ""
 msgid "Klarna order total (%1$s) does not match WooCommerce order total (%2$s). Please verify the order with Klarna before processing."
 msgstr ""
 
-#: ../includes/kco-functions.php:746
+#: ../includes/kco-functions.php:750
 msgid "A mismatch between the WooCommerce and Klarna orders was identified. Please verify the order in the Klarna merchant portal before processing."
 msgstr ""
 

diff --git a/readme.txt b/readme.txt
@@ -54,6 +54,9 @@ Klarna Checkout works for merchants in Sweden, Finland, Norway, Germany, Austria
 For help setting up and configuring Klarna Checkout for WooCommerce please refer to our [documentation](https://docs.krokedil.com/klarna-checkout-for-woocommerce/).
 
 == Changelog ==
+= 2024.07.05    - version 2.12.7 =
+* Fix           - Fixed an issue where orders would be set to on-hold due to mismatch in shipping reference.
+
 = 2024.07.04    - version 2.12.6 =
 * Tweak         - WooCommerce checkout error messages will now also appear in the Klarna modal, replacing the generic "Something went wrong" message. Previously, they only appeared on the checkout page as notices, requiring the customer to close the modal before they can see them.
 * Tweak         - Added a discrepancy check for when the Woo and Klarna order may differ in total order amount.