Release 3.3.6

Author: andrewrowanwallee

README.md

@@ -14,7 +14,7 @@ This repository contains the PostFinance Checkout plugin that enables WooCommerc
 
 ## Documentation
 
-* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.5/docs/en/documentation.html)
+* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.6/docs/en/documentation.html)
 
 ## Support
 
@@ -31,7 +31,7 @@ ____________________________________________________________________________
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/woocommerce/blob/3.3.5/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/woocommerce/blob/3.3.6/LICENSE) for more information.
 
 ## Privacy Policy
 

changelog.txt

@@ -902,3 +902,6 @@ Please ensure that in woocommerce->settings->tax, the "Round tax at subtotal lev
 - [Tested Against] Woocommerce 9.7.0
 - [Tested Against] PHP SDK 4.6.0
 
+= 3.3.6 - Mar 4 2025 =
+- [Bugfix] Correct default status for confirmed and fulfill
+

docs/en/documentation.html

@@ -23,7 +23,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/woocommerce/releases/tag/3.3.5/">
+		<a href="https://github.com/pfpayments/woocommerce/releases/tag/3.3.6/">
 			Source
 		</a>
 	</li>

docs/en/resource/method.png

@@ -205,7 +205,7 @@ public function get_default_settings() {
 		$settings = array(
 			array(
 				'links' => array(
-					'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.5/docs/en/documentation.html' => esc_html__( 'Documentation', 'woo-postfinancecheckout' ),
+					'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.6/docs/en/documentation.html' => esc_html__( 'Documentation', 'woo-postfinancecheckout' ),
 					'https://checkout.postfinance.ch/en-ch/user/signup' => esc_html__( 'Sign Up', 'woo-postfinancecheckout' ),
 				),
 				'type'  => 'postfinancecheckout_links',

docs/en/resource/settings.png

@@ -53,6 +53,7 @@ class WC_PostFinanceCheckout_Migration {
 		'1.0.6' => 'update_1_0_6_shorten_table_names',
 		'1.0.7' => 'update_1_0_7_migrate_plugin_name_and_tables',
 		'1.0.8' => 'update_1_0_8_store_default_status_mappings',
+		'1.0.9' => 'update_1_0_9_restore_default_status_mappings',
 	);
 
 	/**
@@ -267,7 +268,7 @@ public static function check_version() {
 	public static function plugin_row_meta( $links, $file ) {
 		if ( WC_POSTFINANCECHECKOUT_PLUGIN_BASENAME === $file ) {
 			$row_meta = array(
-				'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.5/docs/en/documentation.html" aria-label="' . esc_html__( 'View Documentation', 'woo-postfinancecheckout' ) . '">' . esc_html__( 'Documentation', 'woo-postfinancecheckout' ) . '</a>',
+				'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.6/docs/en/documentation.html" aria-label="' . esc_html__( 'View Documentation', 'woo-postfinancecheckout' ) . '">' . esc_html__( 'Documentation', 'woo-postfinancecheckout' ) . '</a>',
 			);
 
 			return array_merge( $links, $row_meta );
@@ -754,6 +755,17 @@ public static function update_1_0_8_store_default_status_mappings() {
 		$status_adapter = new WC_PostFinanceCheckout_Order_Status_Adapter();
 		$status_adapter->store_default_status_mappings_on_database();
 	}
+
+
+
+	/**
+	 * Store default order status mappings in the database during migration.
+	 * Ensures that the default order statuses are properly set.
+	 */
+	public static function update_1_0_9_restore_default_status_mappings() {
+		$status_adapter = new WC_PostFinanceCheckout_Order_Status_Adapter();
+		$status_adapter->store_default_status_mappings_on_database();
+	}
 }
 
 WC_PostFinanceCheckout_Migration::init();

includes/admin/class-wc-postfinancecheckout-admin-settings-page.php

@@ -202,9 +202,7 @@ public function store_default_status_mappings_on_database(): void
 		$default_mappings = $this->get_default_status_mappings();
 
 		foreach ( $default_mappings as $key => $value ) {
-			if ( get_option( self::POSTFINANCECHECKOUT_ORDER_STATUS_MAPPING_PREFIX . $key, false ) === false ) {
-				update_option( self::POSTFINANCECHECKOUT_ORDER_STATUS_MAPPING_PREFIX . $key, $value );
-			}
+			$result = update_option( self::POSTFINANCECHECKOUT_ORDER_STATUS_MAPPING_PREFIX . $key, $value );
 		}
 	}
 
@@ -226,10 +224,10 @@ public function store_default_status_mappings_on_database(): void
 	 * - postfinancecheckout_order_status_mapping_confirmed -> wc-on-hold -> OrderInternalStatus::ON_HOLD
 	 * - postfinancecheckout_order_status_mapping_processing -> wc-on-hold -> OrderInternalStatus::ON_HOLD
 	 * - postfinancecheckout_order_status_mapping_authorized -> wc-on-hold -> OrderInternalStatus::ON_HOLD
-	 * - postfinancecheckout_order_status_mapping_completed -> wc-processing -> OrderInternalStatus::PROCESSING
+	 * - postfinancecheckout_order_status_mapping_completed -> wc-on-hold -> OrderInternalStatus::ON_HOLD
 	 * - postfinancecheckout_order_status_mapping_failed -> wc-failed -> OrderInternalStatus::FAILED
 	 * - postfinancecheckout_order_status_mapping_voided -> wc-cancelled or 'wc-refunded' -> OrderInternalStatus::CANCELLED
-	 * - postfinancecheckout_order_status_mapping_fulfill -> wc-completed -> OrderInternalStatus::COMPLETED
+	 * - postfinancecheckout_order_status_mapping_fulfill -> wc-processing -> OrderInternalStatus::PROCESSING
 	 *
 	 * These defaults are used if no custom mappings are provided by the user.
 	 *
@@ -242,10 +240,10 @@ public function get_default_status_mappings() : array
 			self::POSTFINANCECHECKOUT_STATUS_CONFIRMED => 'wc-on-hold',
 			self::POSTFINANCECHECKOUT_STATUS_PROCESSING => 'wc-on-hold',
 			self::POSTFINANCECHECKOUT_STATUS_AUTHORIZED => 'wc-on-hold',
-			self::POSTFINANCECHECKOUT_STATUS_COMPLETED => 'wc-processing',
+			self::POSTFINANCECHECKOUT_STATUS_COMPLETED => 'wc-postfi-waiting',
 			self::POSTFINANCECHECKOUT_STATUS_FAILED => 'wc-failed',
 			self::POSTFINANCECHECKOUT_STATUS_VOIDED => 'wc-cancelled',
-			self::POSTFINANCECHECKOUT_STATUS_FULFILL => 'wc-completed',
+			self::POSTFINANCECHECKOUT_STATUS_FULFILL => 'wc-processing',
 			self::POSTFINANCECHECKOUT_STATUS_DECLINE => 'wc-cancelled',
 		);
 	}

includes/class-wc-postfinancecheckout-migration.php

@@ -3,7 +3,7 @@ Contributors: postfinancecheckout AG
 Tags: woocommerce PostFinance Checkout, woocommerce, PostFinance Checkout, payment, e-commerce, webshop, psp, invoice, packing slips, pdf, customer invoice, processing
 Requires at least: 4.7
 Tested up to: 6.7
-Stable tag: 3.3.5
+Stable tag: 3.3.6
 License: Apache-2.0
 License URI: http://www.apache.org/licenses/LICENSE-2.0
 
@@ -23,7 +23,7 @@ To use this extension, a PostFinance Checkout account is required. Sign up on [P
 
 == Documentation ==
 
-Additional documentation for this plugin is available [here](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.5/docs/en/documentation.html).
+Additional documentation for this plugin is available [here](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.3.6/docs/en/documentation.html).
 
 == External Services ==
 
@@ -81,10 +81,5 @@ Enquiries about our terms of use can be made on the [PostFinance Checkout terms
 == Changelog ==
 
 
-= 3.3.5 - Mar 4 2025 =
-- [Feature] Status mapping feature introduced
-- [Bugfix] Fixed discount rate and amount calculation
-- [Tested Against] PHP 8.2
-- [Tested Against] Wordpress 6.7
-- [Tested Against] Woocommerce 9.7.0
-- [Tested Against] PHP SDK 4.6.0
+= 3.3.6 - Mar 4 2025 =
+- [Bugfix] Correct default status for confirmed and fulfill

includes/class-wc-postfinancecheckout-order-status-adapter.php

@@ -3,7 +3,7 @@
  * Plugin Name: PostFinance Checkout
  * Plugin URI: https://wordpress.org/plugins/woo-postfinance-checkout
  * Description: Process WooCommerce payments with PostFinance Checkout.
- * Version: 3.3.5
+ * Version: 3.3.6
  * Author: postfinancecheckout AG
  * Author URI: https://postfinance.ch/en/business/products/e-commerce/postfinance-checkout-all-in-one.html
  * Text Domain: postfinancecheckout
@@ -46,7 +46,7 @@ final class WooCommerce_PostFinanceCheckout {
 		 *
 		 * @var string
 		 */
-		private $version = '3.3.5';
+		private $version = '3.3.6';
 
 		/**
 		 * The single instance of the class.