Release 2.1.15

Author: root

README.md

@@ -15,7 +15,7 @@ This repository contains the PostFinance Checkout plugin that enables WooCommerc
 
 ## Documentation
 
-* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/2.1.14/docs/en/documentation.html)
+* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/2.1.15/docs/en/documentation.html)
 
 ## Support
 
@@ -24,4 +24,4 @@ Support queries can be issued on the [PostFinance Checkout support site](https:/
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/woocommerce/blob/2.1.14/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/woocommerce/blob/2.1.15/LICENSE) for more information.

changelog.txt

@@ -589,3 +589,13 @@ Tested against:
 * [Tested Against] Woocommerce 7.6.1
 * [Tested Against] PHP SDK 3.2.0
 
+* [Features] Provide a fallback to handle payment when Woocommerce latest release break the iframe / lightbox 
+* [Features] Support of Woocommerce 7.7.0
+* [BugFix] Fix the line item inconsistency when using Taxes and a Coupon
+* [BugFix] Fix the parameter organisation name when using the payment method **Powerpay Invoice**
+
+* [Tested Against] PHP 8.0.28
+* [Tested Against] Wordpress 6.2.0
+* [Tested Against] Woocommerce 7.7.0
+* [Tested Against] PHP SDK 3.2.0
+

docs/en/documentation.html

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

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

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

includes/class-wc-postfinancecheckout-migration.php

@@ -249,7 +249,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/2.1.14/docs/en/documentation.html" aria-label="' . esc_attr__( 'View Documentation', 'woo-postfinancecheckout' ) . '">' . esc_html__( 'Documentation', 'woo-postfinancecheckout' ) . '</a>',
+				'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/2.1.15/docs/en/documentation.html" aria-label="' . esc_attr__( 'View Documentation', 'woo-postfinancecheckout' ) . '">' . esc_html__( 'Documentation', 'woo-postfinancecheckout' ) . '</a>',
 			);
 
 			return array_merge( $links, $row_meta );

includes/service/class-wc-postfinancecheckout-service-line-item.php

@@ -270,7 +270,7 @@ protected function create_coupons_line_items_from_session() {
 			}
 			/** @var WC_Coupon $coupon_applied */
 			$coupon_applied = $wp_coupons[ $coupon_code ];
-			$amount = $this->round_amount( $cart->get_coupon_discount_amount( $coupon_code ), $currency );
+			$amount = $this->round_amount( $cart->get_coupon_discount_amount( $coupon_code, false ), $currency );
 			$line_item = $this->create_coupon_line_item( $coupon_applied, $amount );
 			$coupons[] = $this->clean_line_item( $line_item );
 		}
@@ -549,7 +549,7 @@ protected function create_coupons_line_items_from_order( WC_Order $order ) {
 		//all wp coupons available
 		foreach ( $order->get_coupons() as $coupon ) {
 			/** @var WC_Order_Item_Coupon $coupon */
-			$line_item = $this->create_coupon_line_item( $coupon, $coupon->get_discount() );
+			$line_item = $this->create_coupon_line_item( $coupon, $coupon->get_discount() + $coupon->get_discount_tax() );
 			$coupons[] = $this->clean_line_item( $line_item );
 		}
 		return $coupons;

includes/service/class-wc-postfinancecheckout-service-transaction.php

@@ -1036,7 +1036,10 @@ protected function get_session_shipping_address() {
 		$address->setCountry( $customer->get_shipping_country() );
 		$address->setFamilyName( $this->fix_length( $customer->get_shipping_last_name(), 100 ) );
 		$address->setGivenName( $this->fix_length( $customer->get_shipping_first_name(), 100 ) );
-		$address->setOrganizationName( $this->fix_length( $customer->get_shipping_company(), 100 ) );
+		// Because of a problem with WC, we don't get the shipping_company value from the checkout.
+		// We use the billing_company if shipping_company is empty.
+		$shipping_company = !empty($customer->get_shipping_company()) ?  $customer->get_shipping_company() : $customer->get_billing_company();
+		$address->setOrganizationName( $this->fix_length( $shipping_company, 100 ) );
 		if ( ! empty( $customer->get_shipping_state() ) ) {
 			$address->setPostalState( $customer->get_shipping_country() . '-' . $customer->get_shipping_state() );
 		}

readme.txt

@@ -3,7 +3,7 @@ Contributors: customwebgmbh
 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.2
-Stable tag: 2.1.14
+Stable tag: 2.1.15
 License: Apache 2
 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/2.1.14/docs/en/documentation.html).
+Additional documentation for this plugin is available [here](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/2.1.15/docs/en/documentation.html).
 
 == Support ==
 
@@ -56,11 +56,12 @@ Support queries can be issued on the [PostFinance Checkout support site](https:/
 == Changelog ==
 
 
-= 2.1.14 - April 27, 2023 =
+* [Features] Provide a fallback to handle payment when Woocommerce latest release break the iframe / lightbox 
+* [Features] Support of Woocommerce 7.7.0
+* [BugFix] Fix the line item inconsistency when using Taxes and a Coupon
+* [BugFix] Fix the parameter organisation name when using the payment method **Powerpay Invoice**
 
-* [Features] Support of Woocommerce 7.6.1
-
-* [Tested Against] PHP 8.1
+* [Tested Against] PHP 8.0.28
 * [Tested Against] Wordpress 6.2.0
-* [Tested Against] Woocommerce 7.6.1
+* [Tested Against] Woocommerce 7.7.0
 * [Tested Against] PHP SDK 3.2.0

woocommerce-postfinancecheckout.php

@@ -3,15 +3,15 @@
  * Plugin Name: PostFinance Checkout
  * Plugin URI: https://wordpress.org/plugins/woo-postfinancecheckout
  * Description: Process WooCommerce payments with PostFinance Checkout.
- * Version: 2.1.14
+ * Version: 2.1.15
  * License: Apache2
  * License URI: http://www.apache.org/licenses/LICENSE-2.0
  * Author: wallee AG
  * Author URI: https://www.wallee.com
  * Requires at least: 4.7
  * Tested up to: 6.2
  * WC requires at least: 3.0.0
- * WC tested up to: 7.6.1
+ * WC tested up to: 7.7.0
  *
  * Text Domain: postfinancecheckout
  * Domain Path: /languages/
@@ -39,14 +39,14 @@ final class WooCommerce_PostFinanceCheckout {
 		const CK_INTEGRATION = 'wc_postfinancecheckout_integration';
 		const CK_ORDER_REFERENCE = 'wc_postfinancecheckout_order_reference';
 		const CK_ENFORCE_CONSISTENCY = 'wc_postfinancecheckout_enforce_consistency';
-		const WC_MAXIMUM_VERSION = '7.6.1';
+		const WC_MAXIMUM_VERSION = '7.7.0';
 
 		/**
 		 * WooCommerce PostFinanceCheckout version.
 		 *
 		 * @var string
 		 */
-		private $version = '2.1.14';
+		private $version = '2.1.15';
 
 		/**
 		 * The single instance of the class.
@@ -158,6 +158,14 @@ protected function init_hooks() {
 				)
 			);
 
+			add_action(
+				'woocommerce_thankyou',
+				array(
+					$this,
+					'secure_redirect_order_confirmed',
+					)
+			);
+
 			add_action(
 				'plugins_loaded',
 				array(
@@ -205,6 +213,27 @@ protected function init_hooks() {
 			);
 		}
 
+
+		/**
+		 * Secirity check in the thank you page.
+		 *
+		 * Note: If for some reason order status is still pending, it will redirect you to the payment form.
+		 *
+		 */
+
+		 public function secure_redirect_order_confirmed($order_id) {
+			$order = wc_get_order( $order_id );
+			$wc_service_transaction = WC_PostFinanceCheckout_Service_Transaction::instance();
+			$sdk_service_transaction = new \PostFinanceCheckout\Sdk\Service\TransactionService(WC_PostFinanceCheckout_Helper::instance()->get_api_client());
+			$wc_transaction_info = WC_PostFinanceCheckout_Entity_Transaction_Info::load_by_order_id($order_id);
+			$state = $sdk_service_transaction->read(get_option(self::CK_SPACE_ID), $wc_transaction_info->get_transaction_id())->getState();
+
+			if ($state == \PostFinanceCheckout\Sdk\Model\TransactionState::CONFIRMED) {
+				wp_redirect($wc_service_transaction->get_payment_page_url(get_option(self::CK_SPACE_ID), $wc_transaction_info->get_transaction_id()));
+				exit;
+			}
+		}
+
 		/**
 		 * Load Localization files.
 		 *