From a2e58149f9326e65ba992ab1da37baca21128d82 Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Wed, 24 Jan 2024 15:24:34 +0100
Subject: [PATCH] SP-787 Verify WooCommerce modal is working

---
 BitPayLib/Blocks/class-bitpaypaymentsblocks.php | 2 +-
 BitPayLib/class-bitpaycancelorder.php           | 2 +-
 BitPayLib/class-bitpaycart.php                  | 2 +-
 BitPayLib/class-bitpaycheckouttransactions.php  | 2 +-
 BitPayLib/class-bitpayclientfactory.php         | 2 +-
 BitPayLib/class-bitpayinvoicecreate.php         | 2 +-
 BitPayLib/class-bitpayipnprocess.php            | 2 +-
 BitPayLib/class-bitpaylogger.php                | 2 +-
 BitPayLib/class-bitpaypages.php                 | 4 ++--
 BitPayLib/class-bitpaypaymentsettings.php       | 2 +-
 BitPayLib/class-bitpaypluginsetup.php           | 4 ++--
 BitPayLib/class-wcgatewaybitpay.php             | 2 +-
 BitPayLib/trait-wpdbhelper.php                  | 2 +-
 CHANGELOG.md                                    | 3 +++
 index.php                                       | 2 +-
 js/bitpay_thank_you.js                          | 2 +-
 readme.txt                                      | 5 ++++-
 17 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/BitPayLib/Blocks/class-bitpaypaymentsblocks.php b/BitPayLib/Blocks/class-bitpaypaymentsblocks.php
index 564ea26c..2433d1eb 100644
--- a/BitPayLib/Blocks/class-bitpaypaymentsblocks.php
+++ b/BitPayLib/Blocks/class-bitpaypaymentsblocks.php
@@ -12,7 +12,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpaycancelorder.php b/BitPayLib/class-bitpaycancelorder.php
index 8bb93656..1bc9c44d 100644
--- a/BitPayLib/class-bitpaycancelorder.php
+++ b/BitPayLib/class-bitpaycancelorder.php
@@ -8,7 +8,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpaycart.php b/BitPayLib/class-bitpaycart.php
index 3be6db2b..55ea1e59 100644
--- a/BitPayLib/class-bitpaycart.php
+++ b/BitPayLib/class-bitpaycart.php
@@ -8,7 +8,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpaycheckouttransactions.php b/BitPayLib/class-bitpaycheckouttransactions.php
index 24d76941..019d8e43 100644
--- a/BitPayLib/class-bitpaycheckouttransactions.php
+++ b/BitPayLib/class-bitpaycheckouttransactions.php
@@ -11,7 +11,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpayclientfactory.php b/BitPayLib/class-bitpayclientfactory.php
index 28bbfbcc..c92b8430 100644
--- a/BitPayLib/class-bitpayclientfactory.php
+++ b/BitPayLib/class-bitpayclientfactory.php
@@ -13,7 +13,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpayinvoicecreate.php b/BitPayLib/class-bitpayinvoicecreate.php
index 943a7b5a..264b487d 100644
--- a/BitPayLib/class-bitpayinvoicecreate.php
+++ b/BitPayLib/class-bitpayinvoicecreate.php
@@ -13,7 +13,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpayipnprocess.php b/BitPayLib/class-bitpayipnprocess.php
index 257744bf..c08ceea6 100644
--- a/BitPayLib/class-bitpayipnprocess.php
+++ b/BitPayLib/class-bitpayipnprocess.php
@@ -13,7 +13,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpaylogger.php b/BitPayLib/class-bitpaylogger.php
index 161be2ea..a0341021 100644
--- a/BitPayLib/class-bitpaylogger.php
+++ b/BitPayLib/class-bitpaylogger.php
@@ -8,7 +8,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpaypages.php b/BitPayLib/class-bitpaypages.php
index 1f02728c..e858f654 100644
--- a/BitPayLib/class-bitpaypages.php
+++ b/BitPayLib/class-bitpaypages.php
@@ -7,7 +7,7 @@
 /**
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
@@ -39,7 +39,7 @@ public function checkout_thank_you( int $order_id ): void {
 		$invoice_id = $_COOKIE['bitpay-invoice-id'] ?? null; // phpcs:ignore
 
 		wp_enqueue_script( 'remote-bitpay-js', $js_script, null, null, false ); // phpcs:ignore
-		wp_enqueue_script( 'bitpay_thank_you', plugins_url( '../js/bitpay_thank_you.js', __FILE__ ), null, 1, false );
+		wp_enqueue_script( 'bitpay_thank_you', plugins_url( '../../js/bitpay_thank_you.js', __FILE__ ), null, 1, false );
 		?>
 		<script type="text/javascript">
 			const testMode = '<?php echo esc_js( $test_mode ); ?>';
diff --git a/BitPayLib/class-bitpaypaymentsettings.php b/BitPayLib/class-bitpaypaymentsettings.php
index de7e0cf6..053cff6f 100644
--- a/BitPayLib/class-bitpaypaymentsettings.php
+++ b/BitPayLib/class-bitpaypaymentsettings.php
@@ -8,7 +8,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpaypluginsetup.php b/BitPayLib/class-bitpaypluginsetup.php
index f8df946a..a6e7fa79 100644
--- a/BitPayLib/class-bitpaypluginsetup.php
+++ b/BitPayLib/class-bitpaypluginsetup.php
@@ -11,13 +11,13 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
 class BitPayPluginSetup {
 
-	public const VERSION = '5.4.0';
+	public const VERSION = '5.4.1';
 
 	private BitPayIpnProcess $bitpay_ipn_process;
 	private BitPayCancelOrder $bitpay_cancel_order;
diff --git a/BitPayLib/class-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php
index 169d7b59..962283a9 100644
--- a/BitPayLib/class-wcgatewaybitpay.php
+++ b/BitPayLib/class-wcgatewaybitpay.php
@@ -8,7 +8,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/trait-wpdbhelper.php b/BitPayLib/trait-wpdbhelper.php
index 124e5077..6a3ed01f 100644
--- a/BitPayLib/trait-wpdbhelper.php
+++ b/BitPayLib/trait-wpdbhelper.php
@@ -10,7 +10,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6600d2f..5468846a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# 5.4.1
+* Fixed Checkout Flow (BitPay Modal)
+
 # 5.4.0
 * Added compatibility with Checkout Blocks
 * Tested compatibility with WordPress 6.4.2
diff --git a/index.php b/index.php
index b6ccf5b2..bf0fdb49 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.0
+ * Version: 5.4.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/js/bitpay_thank_you.js b/js/bitpay_thank_you.js
index 0f104fa8..17333149 100644
--- a/js/bitpay_thank_you.js
+++ b/js/bitpay_thank_you.js
@@ -46,7 +46,7 @@ function showBitPayInvoice(testMode, invoiceID, orderId, cartUrl, restoreUrl) {
 			}
 		);
 
-	if ( testMode === true ) {
+	if ( testMode === "1" ) {
 		bitpay.enableTestMode();
 	}
 
diff --git a/readme.txt b/readme.txt
index bf3a74dd..24cf7eef 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Requires at least: 6.0
 Tested up to: 6.4.2
 Requires PHP: 8.0
 Recommended PHP: 8.0
-Stable tag: 5.4.0
+Stable tag: 5.4.1
 License: MIT License (MIT)
 License URI: https://github.com/bitpay/bitpay-checkout-for-woocommerce/blob/master/LICENSE
 
@@ -111,6 +111,9 @@ You can contact our support team via the following form https://bitpay.com/reque
 
 == Changelog ==
 
+= 5.4.1 =
+* Fixed Checkout Flow (BitPay Modal)
+
 = 5.4.0 =
 * Added compatibility with Checkout Blocks
 * Tested compatibility with WordPress 6.4.2