From 940aa4edcb41596e69f682b90617b7d5d7b2f8a7 Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Tue, 30 Jan 2024 16:09:13 +0100
Subject: [PATCH 01/22] 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                 | 2 +-
 BitPayLib/class-bitpaypaymentsettings.php       | 2 +-
 BitPayLib/class-bitpaypluginsetup.php           | 4 ++--
 BitPayLib/class-wcgatewaybitpay.php             | 2 +-
 CHANGELOG.md                                    | 4 +---
 index.php                                       | 2 +-
 readme.txt                                      | 6 ++----
 15 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/BitPayLib/Blocks/class-bitpaypaymentsblocks.php b/BitPayLib/Blocks/class-bitpaypaymentsblocks.php
index 2433d1e..564ea26 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.1
+ * Version: 5.4.0
  * 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 1bc9c44..8bb9365 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.1
+ * Version: 5.4.0
  * 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 55ea1e5..3be6db2 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.1
+ * Version: 5.4.0
  * 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 019d8e4..24d7694 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.1
+ * Version: 5.4.0
  * 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 c92b843..28bbfbc 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.1
+ * Version: 5.4.0
  * 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 264b487..943a7b5 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.1
+ * Version: 5.4.0
  * 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 c08ceea..257744b 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.1
+ * Version: 5.4.0
  * 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 a034102..161be2e 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.1
+ * Version: 5.4.0
  * 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 e858f65..31e0d27 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.1
+ * Version: 5.4.0
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpaypaymentsettings.php b/BitPayLib/class-bitpaypaymentsettings.php
index 053cff6..de7e0cf 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.1
+ * Version: 5.4.0
  * 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 a6e7fa7..f8df946 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.1
+ * Version: 5.4.0
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
 class BitPayPluginSetup {
 
-	public const VERSION = '5.4.1';
+	public const VERSION = '5.4.0';
 
 	private BitPayIpnProcess $bitpay_ipn_process;
 	private BitPayCancelOrder $bitpay_cancel_order;
diff --git a/BitPayLib/class-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php
index 962283a..169d7b5 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.1
+ * Version: 5.4.0
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5468846..5127201 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +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
+* Fixed Checkout Flow (BitPay Modal)
 * Tested compatibility with WordPress 6.4.2
 
 # 5.3.2
diff --git a/index.php b/index.php
index bf0fdb4..b6ccf5b 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.1
+ * Version: 5.4.0
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/readme.txt b/readme.txt
index 24cf7ee..b976fc5 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.1
+Stable tag: 5.4.0
 License: MIT License (MIT)
 License URI: https://github.com/bitpay/bitpay-checkout-for-woocommerce/blob/master/LICENSE
 
@@ -111,11 +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
+* Fixed Checkout Flow (BitPay Modal)
 * Tested compatibility with WordPress 6.4.2
 
 = 5.3.2 =

From 06747c3c179efc2056461c05dc51e60ae13776bd Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Fri, 2 Feb 2024 13:28:52 +0100
Subject: [PATCH 02/22] SP-787 add version of plugin for JS scripts

---
 BitPayLib/class-bitpaypages.php     | 4 ++--
 BitPayLib/class-wcgatewaybitpay.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/BitPayLib/class-bitpaypages.php b/BitPayLib/class-bitpaypages.php
index 31e0d27..a11a60d 100644
--- a/BitPayLib/class-bitpaypages.php
+++ b/BitPayLib/class-bitpaypages.php
@@ -38,8 +38,8 @@ 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( 'remote-bitpay-js', $js_script, null, BitPayPluginSetup::VERSION, false ); // phpcs:ignore
+		wp_enqueue_script( 'bitpay_thank_you', plugins_url( '../../js/bitpay_thank_you.js', __FILE__ ), null, BitPayPluginSetup::VERSION, false ); // phpcs:ignore
 		?>
 		<script type="text/javascript">
 			const testMode = '<?php echo esc_js( $test_mode ); ?>';
diff --git a/BitPayLib/class-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php
index 169d7b5..4c5bc6a 100644
--- a/BitPayLib/class-wcgatewaybitpay.php
+++ b/BitPayLib/class-wcgatewaybitpay.php
@@ -46,7 +46,7 @@ public function __construct() {
 			'bitpay_wc_gateway',
 			plugins_url( '../../js/wc_gateway_bitpay.js', __FILE__ ),
 			null,
-			1,
+			BitPayPluginSetup::VERSION,
 			false
 		);
 	}

From 97f7d1bc5256c28f3f1b1c4cd5720344a632b2cb Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Fri, 2 Feb 2024 14:26:54 +0100
Subject: [PATCH 03/22] SP-787 add version of plugin for JS scripts

---
 BitPayLib/trait-wpdbhelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BitPayLib/trait-wpdbhelper.php b/BitPayLib/trait-wpdbhelper.php
index 6a3ed01..124e507 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.1
+ * Version: 5.4.0
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */

From 96ddd8b5ed934cba8c55d502eaf2085f4bf8c1b6 Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Fri, 2 Feb 2024 15:20:02 +0100
Subject: [PATCH 04/22] SP-789 Add status checks to WooCommerce

---
 .../Exception/class-bitpayinvalidorder.php    | 16 ++++
 BitPayLib/class-bitpayipnprocess.php          | 80 ++++++++++++++++---
 CHANGELOG.md                                  |  2 +
 readme.txt                                    |  2 +
 4 files changed, 88 insertions(+), 12 deletions(-)
 create mode 100644 BitPayLib/Exception/class-bitpayinvalidorder.php

diff --git a/BitPayLib/Exception/class-bitpayinvalidorder.php b/BitPayLib/Exception/class-bitpayinvalidorder.php
new file mode 100644
index 0000000..bac159c
--- /dev/null
+++ b/BitPayLib/Exception/class-bitpayinvalidorder.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BitPayLib\Exception;
+
+/**
+ * Plugin Name: BitPay Checkout for WooCommerce
+ * Plugin URI: https://www.bitpay.com
+ * Description: BitPay Checkout Plugin
+ * Version: 5.4.0
+ * Author: BitPay
+ * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
+ */
+class BitPayInvalidOrder extends \RuntimeException {
+}
diff --git a/BitPayLib/class-bitpayipnprocess.php b/BitPayLib/class-bitpayipnprocess.php
index 257744b..0a2bddf 100644
--- a/BitPayLib/class-bitpayipnprocess.php
+++ b/BitPayLib/class-bitpayipnprocess.php
@@ -4,6 +4,7 @@
 
 namespace BitPayLib;
 
+use BitPayLib\Exception\BitPayInvalidOrder;
 use BitPaySDK\Model\Facade;
 use BitPaySDK\Model\Invoice\Invoice;
 use WC_Order;
@@ -21,6 +22,8 @@ class BitPayIpnProcess {
 
 	use WpDbHelper;
 
+	private const FINAL_WC_ORDER_STATUSES = array( 'wc-refunded', 'wc-cancelled', 'wc-failed' );
+
 	private BitPayCheckoutTransactions $bitpay_checkout_transactions;
 	private BitPayLogger $logger;
 	private array $gateway_settings = array();
@@ -39,43 +42,64 @@ public function __construct(
 	public function execute( WP_REST_Request $request ): void {
 		$data = $request->get_body();
 
-		$data       = json_decode( $data, true, 512, JSON_THROW_ON_ERROR );
-		$event      = $data['event'] ?? null;
-		$data       = $data['data'] ?? null;
-		$invoice_id = $data['id'] ?? null;
+		$data                = json_decode( $data, true, 512, JSON_THROW_ON_ERROR );
+		$event               = $data['event'] ?? null;
+		$data                = $data['data'] ?? null;
+		$data['event']       = $event;
+		$data['requestDate'] = date( 'Y-m-d H:i:s' );
+		$invoice_id          = $data['id'] ?? null;
 
 		$this->logger->execute( $data, 'INCOMING IPN', true );
 		if ( ! $event || ! $data || ! $invoice_id ) {
 			$this->logger->execute( 'Wrong IPN request', 'INCOMING IPN ERROR', false, true );
+			return;
 		}
 
 		try {
 			$bitpay_invoice = $this->factory->create()->getInvoice( $invoice_id, Facade::POS, false );
-			$order          = new WC_Order( $bitpay_invoice->getOrderId() );
+			do_action( 'bitpay_checkout_woocoomerce_after_get_invoice', $bitpay_invoice );
+			$order = new WC_Order( $bitpay_invoice->getOrderId() );
 			$this->validate_order( $order, $invoice_id );
 			$this->process( $bitpay_invoice, $order, $event['name'] );
+		} catch ( BitPayInvalidOrder $e ) {
+			return; // do nothing.
 		} catch ( \Exception $e ) {
 			$this->logger->execute( $e->getMessage(), 'INCOMING IPN ERROR', false, true );
 		}
 	}
 
 	private function validate_order( WC_Order $order, string $invoice_id ): void {
+		do_action( 'bitpay_checkout_woocoomerce_validate_wc_order', $order, $invoice_id );
+
 		if ( $order->get_payment_method() !== 'bitpay_checkout_gateway' ) {
 			$message = 'Order id = ' . $order->get_id() . ', BitPay invoice id = ' . $invoice_id
 				. '. Current payment method = ' . $order->get_payment_method();
 			$this->logger->execute( $message, 'Ignore IPN', true );
-			die();
+			throw new BitPayInvalidOrder();
 		}
 
 		if ( $this->bitpay_checkout_transactions->count_transaction_id( $invoice_id ) !== 1 ) {
 			$message = 'Order id = ' . $order->get_id() . ', BitPay invoice id = ' . $invoice_id
 				. '. Wrong transaction id ' . $invoice_id;
 			$this->logger->execute( $message, 'Ignore IPN', true );
-			die();
+			throw new BitPayInvalidOrder();
 		}
 	}
 
 	private function process( Invoice $bitpay_invoice, WC_Order $order, string $event_name ): void {
+		do_action( 'bitpay_checkout_woocoomerce_before_process', $bitpay_invoice, $order, $event_name );
+
+		// do not process order when it is in a final status.
+		if ( $this->has_final_status( $order ) ) {
+			$message = 'Order ' . $order->get_id() . ' has final status ' . $order->get_status()
+				. '. Order status from ' . $event_name . ' was not updated for event ' . $event_name;
+			$order->add_order_note( $message );
+
+			return;
+		}
+
+		do_action( 'bitpay_checkout_woocoomerce_process', $bitpay_invoice, $order, $event_name );
+
 		switch ( $event_name ) {
 			case 'invoice_completed':
 				$this->process_completed( $bitpay_invoice, $order );
@@ -100,6 +124,8 @@ private function process( Invoice $bitpay_invoice, WC_Order $order, string $even
 				break;
 		}
 
+		do_action( 'bitpay_checkout_woocoomerce_after_process', $bitpay_invoice, $order, $event_name );
+
 		$this->bitpay_checkout_transactions->update_transaction_status( $bitpay_invoice );
 
 		http_response_code( 200 );
@@ -146,12 +172,12 @@ private function process_confirmed( Invoice $bitpay_invoice, WC_Order $order ):
 		$wordpress_order_status = $this->get_gateway_settings()['bitpay_checkout_order_process_confirmed_status'];
 		if ( WcGatewayBitpay::IGNORE_STATUS_VALUE === $wordpress_order_status ) {
 			$order->add_order_note(
-				$this->get_start_order_note( $invoice_id ) . ' has changed to Confirmed.  The order status has not been updated due to your settings.'
+				$this->get_start_order_note( $invoice_id ) . 'has changed to Confirmed. The order status has not been updated due to your settings.'
 			);
 			return;
 		}
 
-		$new_status = $this->get_wc_order_statuses()[ $wordpress_order_status ] ?? 'Processing';
+		$new_status = $this->get_wc_order_statuses()[ $wordpress_order_status ] ?? null;
 		if ( ! $new_status ) {
 			$new_status             = 'Processing';
 			$wordpress_order_status = 'wc-pending';
@@ -171,18 +197,24 @@ private function process_confirmed( Invoice $bitpay_invoice, WC_Order $order ):
 
 	private function process_completed( Invoice $bitpay_invoice, WC_Order $order ): void {
 		$this->validate_bitpay_status_in_available_statuses( $bitpay_invoice, array( 'complete' ) );
+		$wc_order_status = $order->get_status();
 
 		$invoice_id             = $bitpay_invoice->getId();
 		$wordpress_order_status = $this->get_gateway_settings()['bitpay_checkout_order_process_complete_status'];
 		if ( WcGatewayBitpay::IGNORE_STATUS_VALUE === $wordpress_order_status ) {
 			$order->add_order_note(
 				$this->get_start_order_note( $invoice_id )
-				. 'has changed to Complete.  The order status has not been updated due to your settings.'
+				. 'has changed to Complete. The order status has not been updated due to your settings.'
 			);
 			return;
 		}
 
-		$new_status = $this->get_wc_order_statuses()[ $wordpress_order_status ] ?? 'Processing';
+		if ( !$this->should_process_completed_action( $wc_order_status, $wordpress_order_status ) ) {
+			return;
+		}
+
+		$new_status = $this->get_wc_order_statuses()[ $wordpress_order_status ] ?? null;
+		$new_status = apply_filters( 'bitpay_checkout_order_process_complete_status', $new_status, $wordpress_order_status );
 		if ( ! $new_status ) {
 			$new_status             = 'Processing';
 			$wordpress_order_status = 'wc-pending';
@@ -214,7 +246,7 @@ private function process_failed( Invoice $bitpay_invoice, WC_Order $order ): voi
 		$invoice_id = $bitpay_invoice->getId();
 		$order->add_order_note(
 			$this->get_start_order_note( $invoice_id )
-			. 'has become invalid because of network congestion.  Order will automatically update when the status changes.'
+			. 'has become invalid because of network congestion. Order will automatically update when the status changes.'
 		);
 		$order->update_status( 'failed', __( 'BitPay payment invalid', 'woocommerce' ) );
 	}
@@ -274,4 +306,28 @@ private function process_processing( Invoice $bitpay_invoice, WC_Order $order ):
 		$new_status = $this->get_wc_order_statuses()[ $wordpress_order_status ] ?? 'processing';
 		$order->update_status( $new_status, __( 'BitPay payment processing', 'woocommerce' ) );
 	}
+
+	private function has_final_status( WC_Order $order ): bool {
+		return \in_array( $order->get_status(), self::FINAL_WC_ORDER_STATUSES, true );
+	}
+
+	/**
+	 * We don't want to change complete order to process.
+	 *
+	 * @param string      $wc_order_status WC order status.
+	 * @param string|null $wordpress_order_status_from_settings status to event from BitPay settings.
+	 * @return bool
+	 */
+	private function should_process_completed_action(string $wc_order_status, ?string $wordpress_order_status_from_settings ): bool
+	{
+		if ( $wc_order_status !== 'wc-completed' ) {
+			return true;
+		}
+
+		if ( $wordpress_order_status_from_settings === 'wc-pending' || $wordpress_order_status_from_settings === 'wc-processing' ) {
+			return false;
+		 }
+
+		return true;
+	}
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5127201..072a237 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 * Added compatibility with Checkout Blocks
 * Fixed Checkout Flow (BitPay Modal)
 * Tested compatibility with WordPress 6.4.2
+* Improved logging IPN requests
+* Improved webhook handling to prevent an issue where Order IPN's could update a refunded Order's status to a processable Order status
 
 # 5.3.2
 * Fix typo "completed" for BitPay available statuses
diff --git a/readme.txt b/readme.txt
index b976fc5..7fe081b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -115,6 +115,8 @@ You can contact our support team via the following form https://bitpay.com/reque
 * Added compatibility with Checkout Blocks
 * Fixed Checkout Flow (BitPay Modal)
 * Tested compatibility with WordPress 6.4.2
+* Improved logging IPN requests
+* Improved webhook handling to prevent an issue where Order IPN's could update a refunded Order's status to a processable Order status
 
 = 5.3.2 =
 * Fix typo "completed" for BitPay available statuses

From 9de232fa33e375197386a9c54d8d04b59ea08a88 Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Fri, 2 Feb 2024 17:44:41 +0100
Subject: [PATCH 05/22] SP-789 Add status checks to WooCommerce

---
 BitPayLib/class-bitpayipnprocess.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/BitPayLib/class-bitpayipnprocess.php b/BitPayLib/class-bitpayipnprocess.php
index 0a2bddf..6c58e07 100644
--- a/BitPayLib/class-bitpayipnprocess.php
+++ b/BitPayLib/class-bitpayipnprocess.php
@@ -209,7 +209,7 @@ private function process_completed( Invoice $bitpay_invoice, WC_Order $order ):
 			return;
 		}
 
-		if ( !$this->should_process_completed_action( $wc_order_status, $wordpress_order_status ) ) {
+		if ( ! $this->should_process_completed_action( $wc_order_status, $wordpress_order_status ) ) {
 			return;
 		}
 
@@ -318,15 +318,14 @@ private function has_final_status( WC_Order $order ): bool {
 	 * @param string|null $wordpress_order_status_from_settings status to event from BitPay settings.
 	 * @return bool
 	 */
-	private function should_process_completed_action(string $wc_order_status, ?string $wordpress_order_status_from_settings ): bool
-	{
-		if ( $wc_order_status !== 'wc-completed' ) {
+	private function should_process_completed_action( string $wc_order_status, ?string $wordpress_order_status_from_settings ): bool {
+		if ( 'wc-completed' !== $wc_order_status ) {
 			return true;
 		}
 
-		if ( $wordpress_order_status_from_settings === 'wc-pending' || $wordpress_order_status_from_settings === 'wc-processing' ) {
+		if ( 'wc-pending' === $wordpress_order_status_from_settings || 'wc-processing' === $wordpress_order_status_from_settings ) {
 			return false;
-		 }
+		}
 
 		return true;
 	}

From 47ac7d6582504e5ed30005c3b12d44a488a93a09 Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Fri, 9 Feb 2024 11:17:55 +0100
Subject: [PATCH 06/22] SP-789 Add status checks to WooCommerce

---
 BitPayLib/class-bitpayipnprocess.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/BitPayLib/class-bitpayipnprocess.php b/BitPayLib/class-bitpayipnprocess.php
index 6c58e07..b69b68e 100644
--- a/BitPayLib/class-bitpayipnprocess.php
+++ b/BitPayLib/class-bitpayipnprocess.php
@@ -22,7 +22,7 @@ class BitPayIpnProcess {
 
 	use WpDbHelper;
 
-	private const FINAL_WC_ORDER_STATUSES = array( 'wc-refunded', 'wc-cancelled', 'wc-failed' );
+	private const FINAL_WC_ORDER_STATUSES = array( 'refunded', 'cancelled', 'failed' );
 
 	private BitPayCheckoutTransactions $bitpay_checkout_transactions;
 	private BitPayLogger $logger;
@@ -40,8 +40,7 @@ public function __construct(
 	}
 
 	public function execute( WP_REST_Request $request ): void {
-		$data = $request->get_body();
-
+		$data                = $request->get_body();
 		$data                = json_decode( $data, true, 512, JSON_THROW_ON_ERROR );
 		$event               = $data['event'] ?? null;
 		$data                = $data['data'] ?? null;
@@ -180,13 +179,13 @@ private function process_confirmed( Invoice $bitpay_invoice, WC_Order $order ):
 		$new_status = $this->get_wc_order_statuses()[ $wordpress_order_status ] ?? null;
 		if ( ! $new_status ) {
 			$new_status             = 'Processing';
-			$wordpress_order_status = 'wc-pending';
+			$wordpress_order_status = 'pending';
 		}
 
 		$order->add_order_note(
 			$this->get_start_order_note( $invoice_id ) . ' has changed to ' . $new_status . '.'
 		);
-		if ( 'wc-completed' === $wordpress_order_status ) {
+		if ( 'wc-completed' === $wordpress_order_status ) { // statuses with 'wc' prefix.
 			$order->payment_complete();
 			$order->add_order_note( 'Payment Completed' );
 		} else {
@@ -217,11 +216,11 @@ private function process_completed( Invoice $bitpay_invoice, WC_Order $order ):
 		$new_status = apply_filters( 'bitpay_checkout_order_process_complete_status', $new_status, $wordpress_order_status );
 		if ( ! $new_status ) {
 			$new_status             = 'Processing';
-			$wordpress_order_status = 'wc-pending';
+			$wordpress_order_status = 'pending';
 		}
 
 		$order->add_order_note( $this->get_start_order_note( $invoice_id ) . 'has changed to ' . $new_status . '.' );
-		if ( 'wc-completed' === $wordpress_order_status ) {
+		if ( 'wc-completed' === $wordpress_order_status ) { // statuses with 'wc' prefix.
 			$order->payment_complete();
 			$order->add_order_note( 'Payment Completed' );
 		} else {
@@ -276,7 +275,7 @@ private function process_abandoned( Invoice $bitpay_invoice, WC_Order $order ):
 			return;
 		}
 
-		$order_status = 'wc-cancelled';
+		$order_status = 'cancelled';
 		$order->add_order_note( $this->get_start_order_note( $invoice_id ) . 'has expired.' );
 
 		if ( 1 === (int) $wordpress_order_status ) {
@@ -319,11 +318,11 @@ private function has_final_status( WC_Order $order ): bool {
 	 * @return bool
 	 */
 	private function should_process_completed_action( string $wc_order_status, ?string $wordpress_order_status_from_settings ): bool {
-		if ( 'wc-completed' !== $wc_order_status ) {
+		if ( 'completed' !== $wc_order_status ) {
 			return true;
 		}
 
-		if ( 'wc-pending' === $wordpress_order_status_from_settings || 'wc-processing' === $wordpress_order_status_from_settings ) {
+		if ( 'pending' === $wordpress_order_status_from_settings || 'processing' === $wordpress_order_status_from_settings ) {
 			return false;
 		}
 

From 5401f84f2b300cdd8a49906da6d9c3cec32b9370 Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Tue, 13 Feb 2024 14:48:00 +0100
Subject: [PATCH 07/22] SP-789 Add status checks to WooCommerce

---
 BitPayLib/class-bitpayipnprocess.php | 16 ++++++++++++++--
 BitPayLib/class-wcgatewaybitpay.php  | 10 ++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/BitPayLib/class-bitpayipnprocess.php b/BitPayLib/class-bitpayipnprocess.php
index b69b68e..74d24a6 100644
--- a/BitPayLib/class-bitpayipnprocess.php
+++ b/BitPayLib/class-bitpayipnprocess.php
@@ -270,8 +270,7 @@ private function process_abandoned( Invoice $bitpay_invoice, WC_Order $order ):
 
 		$invoice_id = $bitpay_invoice->getId();
 		if ( $underpaid_amount ) {
-			$order->add_order_note( $this->get_start_order_note( $invoice_id ) . $underpaid_amount . ' has been refunded.' );
-			$order->update_status( 'refunded', __( 'BitPay payment refunded', 'woocommerce' ) );
+			$this->process_refunded( $bitpay_invoice, $order );
 			return;
 		}
 
@@ -284,6 +283,14 @@ private function process_abandoned( Invoice $bitpay_invoice, WC_Order $order ):
 	}
 
 	private function process_refunded( Invoice $bitpay_invoice, WC_Order $order ): void {
+		if ( ! $this->should_process_refund() ) {
+			$order->add_order_note(
+				$this->get_start_order_note( $bitpay_invoice->getId() )
+				. 'has changed to Refunded. The order status has not been updated due to your settings.'
+			);
+			return;
+		}
+
 		$order->add_order_note( $this->get_start_order_note( $bitpay_invoice->getId() ) . 'has been refunded.' );
 		$order->update_status( 'refunded', __( 'BitPay payment refunded', 'woocommerce' ) );
 	}
@@ -328,4 +335,9 @@ private function should_process_completed_action( string $wc_order_status, ?stri
 
 		return true;
 	}
+
+	private function should_process_refund(): bool {
+		$should_process_refund_status = $this->get_wc_order_statuses()['bitpay_checkout_order_process_refund'] ?? '1';
+		return '1' === $should_process_refund_status;
+	}
 }
diff --git a/BitPayLib/class-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php
index 4c5bc6a..339f812 100644
--- a/BitPayLib/class-wcgatewaybitpay.php
+++ b/BitPayLib/class-wcgatewaybitpay.php
@@ -259,6 +259,16 @@ public function init_form_fields() {
 				'options'     => $wc_statuses_arr,
 				'default'     => 'wc-processing',
 			),
+			'bitpay_checkout_order_process_refund'      => array(
+				'title'       => __( 'BitPay Process Refund Status', 'woocommerce' ),
+				'type'        => 'select',
+				'description' => __( 'If set to <b>Yes</b>, automatically set the order to "refunded" when the invoice has a "refund_success" status, as notified by the BitPay IPN.', 'woocommerce' ),
+				'options'     => array(
+					'0' => 'No',
+					'1' => 'Yes',
+				),
+				'default'     => '1',
+			),
 			'bitpay_checkout_order_expired_status'      => array(
 				'title'       => __( 'BitPay Expired Status', 'woocommerce' ),
 				'type'        => 'select',

From b698f09309478e717f1dfdcb50777ee4eb40abce Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Thu, 29 Feb 2024 11:04:52 +0100
Subject: [PATCH 08/22] SP-875 Settings Error on Clean Install

---
 BitPayLib/class-bitpaypaymentsettings.php | 8 +++++++-
 CHANGELOG.md                              | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/BitPayLib/class-bitpaypaymentsettings.php b/BitPayLib/class-bitpaypaymentsettings.php
index de7e0cf..9937651 100644
--- a/BitPayLib/class-bitpaypaymentsettings.php
+++ b/BitPayLib/class-bitpaypaymentsettings.php
@@ -88,7 +88,7 @@ public function check_token(): void {
 		}
 
 		$bitpay_checkout_token    = $this->get_bitpay_token();
-		$bitpay_checkout_endpoint = $this->get_bitpay_gateway_setting( 'bitpay_checkout_endpoint' );
+		$bitpay_checkout_endpoint = $this->get_bitpay_checkout_endpoint();
 
 		if ( ! $bitpay_checkout_token ) {
 			$message = 'There is no token set for your ' . strtoupper( $bitpay_checkout_endpoint ) . ' environment. BitPay will not function if this is not set.';
@@ -163,4 +163,10 @@ private function get_bitpay_gateway_setting( string $setting_name, $default_valu
 	private function get_bitpay_gateway_settings(): array {
 		return get_option( 'woocommerce_bitpay_checkout_gateway_settings', array() );
 	}
+
+	private function get_bitpay_checkout_endpoint(): string
+	{
+		// 'test' as default when we don't store options yet (before save configuration)
+		return $this->get_bitpay_gateway_setting('bitpay_checkout_endpoint') ?? 'test';
+	}
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5127201..f7af270 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 * Added compatibility with Checkout Blocks
 * Fixed Checkout Flow (BitPay Modal)
 * Tested compatibility with WordPress 6.4.2
+* Fixed issue with exception for missing DB data for plugin in admin panel
 
 # 5.3.2
 * Fix typo "completed" for BitPay available statuses

From a6339841edc10700444cebb729a1e61175b8d8af Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Thu, 29 Feb 2024 11:06:59 +0100
Subject: [PATCH 09/22] SP-875 Settings Error on Clean Install

---
 readme.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.txt b/readme.txt
index b976fc5..f2a5048 100644
--- a/readme.txt
+++ b/readme.txt
@@ -115,6 +115,7 @@ You can contact our support team via the following form https://bitpay.com/reque
 * Added compatibility with Checkout Blocks
 * Fixed Checkout Flow (BitPay Modal)
 * Tested compatibility with WordPress 6.4.2
+* Fixed issue with exception for missing DB data for plugin in admin panel
 
 = 5.3.2 =
 * Fix typo "completed" for BitPay available statuses

From 834ab1daba5bfddbf639f03c3b9507267103646b Mon Sep 17 00:00:00 2001
From: Marcin Warzybok <m.warzybok@sumoheavy.com>
Date: Thu, 29 Feb 2024 11:28:52 +0100
Subject: [PATCH 10/22] SP-875 Settings Error on Clean Install

---
 BitPayLib/class-bitpaypaymentsettings.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/BitPayLib/class-bitpaypaymentsettings.php b/BitPayLib/class-bitpaypaymentsettings.php
index 9937651..614653d 100644
--- a/BitPayLib/class-bitpaypaymentsettings.php
+++ b/BitPayLib/class-bitpaypaymentsettings.php
@@ -164,9 +164,8 @@ private function get_bitpay_gateway_settings(): array {
 		return get_option( 'woocommerce_bitpay_checkout_gateway_settings', array() );
 	}
 
-	private function get_bitpay_checkout_endpoint(): string
-	{
+	private function get_bitpay_checkout_endpoint(): string {
 		// 'test' as default when we don't store options yet (before save configuration)
-		return $this->get_bitpay_gateway_setting('bitpay_checkout_endpoint') ?? 'test';
+		return $this->get_bitpay_gateway_setting( 'bitpay_checkout_endpoint' ) ?? 'test';
 	}
 }

From 3ba3277e91fd97ce3ee1193c14eb6a2e5e47c03a Mon Sep 17 00:00:00 2001
From: Patrick Maguire <33061385+p-maguire@users.noreply.github.com>
Date: Tue, 19 Mar 2024 12:18:19 -0400
Subject: [PATCH 11/22] SP-894 Clear Cart after Invoice creation

---
 BitPayLib/class-bitpayinvoicecreate.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BitPayLib/class-bitpayinvoicecreate.php b/BitPayLib/class-bitpayinvoicecreate.php
index 943a7b5..f0ff646 100644
--- a/BitPayLib/class-bitpayinvoicecreate.php
+++ b/BitPayLib/class-bitpayinvoicecreate.php
@@ -72,6 +72,8 @@ public function execute(): void {
 
 			$bitpay_invoice = $this->client_factory->create()->createInvoice( $bitpay_invoice, Facade::POS, false );
 
+			WC()->cart->empty_cart();
+			
 			$this->bitpay_logger->execute( $bitpay_invoice->toArray(), 'NEW BITPAY INVOICE', true );
 
 			$invoice_id = $bitpay_invoice->getId();

From 8f7193f90ad03c55e4bd34a6c93980ccc16934fc Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Tue, 19 Mar 2024 12:44:32 -0400
Subject: [PATCH 12/22] SP-894: Remove spaces

---
 BitPayLib/class-bitpayinvoicecreate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BitPayLib/class-bitpayinvoicecreate.php b/BitPayLib/class-bitpayinvoicecreate.php
index f0ff646..8508338 100644
--- a/BitPayLib/class-bitpayinvoicecreate.php
+++ b/BitPayLib/class-bitpayinvoicecreate.php
@@ -73,7 +73,7 @@ public function execute(): void {
 			$bitpay_invoice = $this->client_factory->create()->createInvoice( $bitpay_invoice, Facade::POS, false );
 
 			WC()->cart->empty_cart();
-			
+
 			$this->bitpay_logger->execute( $bitpay_invoice->toArray(), 'NEW BITPAY INVOICE', true );
 
 			$invoice_id = $bitpay_invoice->getId();

From 7fa204a2a9edba00b1a6003f0606ac881c528b73 Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Tue, 23 Apr 2024 12:16:12 -0400
Subject: [PATCH 13/22] SP-923: Allow additional status for validations

---
 BitPayLib/class-bitpayipnprocess.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BitPayLib/class-bitpayipnprocess.php b/BitPayLib/class-bitpayipnprocess.php
index 74d24a6..5f49cef 100644
--- a/BitPayLib/class-bitpayipnprocess.php
+++ b/BitPayLib/class-bitpayipnprocess.php
@@ -165,7 +165,7 @@ private function get_bitpay_dashboard_link( string $invoice_id ): string {
 	}
 
 	private function process_confirmed( Invoice $bitpay_invoice, WC_Order $order ): void {
-		$this->validate_bitpay_status_in_available_statuses( $bitpay_invoice, array( 'confirmed' ) );
+		$this->validate_bitpay_status_in_available_statuses( $bitpay_invoice, array( 'confirmed', 'complete' ) );
 
 		$invoice_id             = $bitpay_invoice->getId();
 		$wordpress_order_status = $this->get_gateway_settings()['bitpay_checkout_order_process_confirmed_status'];
@@ -296,7 +296,7 @@ private function process_refunded( Invoice $bitpay_invoice, WC_Order $order ): v
 	}
 
 	private function process_processing( Invoice $bitpay_invoice, WC_Order $order ): void {
-		$this->validate_bitpay_status_in_available_statuses( $bitpay_invoice, array( 'paid' ) );
+		$this->validate_bitpay_status_in_available_statuses( $bitpay_invoice, array( 'paid', 'confirmed', 'complete' ) );
 		$invoice_id = $bitpay_invoice->getId();
 		$order->add_order_note( $this->get_start_order_note( $invoice_id ) . 'is paid and awaiting confirmation.' );
 

From 8961a0ec394214148145fc9f17c84b1be91c8ee0 Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Fri, 26 Apr 2024 10:08:05 -0400
Subject: [PATCH 14/22] SP-923 Bump version to 5.4.1

---
 BitPayLib/Blocks/class-bitpaypaymentsblocks.php  | 2 +-
 BitPayLib/Exception/class-bitpayinvalidorder.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                  | 2 +-
 BitPayLib/class-bitpaypaymentsettings.php        | 2 +-
 BitPayLib/class-bitpaypluginsetup.php            | 2 +-
 BitPayLib/class-wcgatewaybitpay.php              | 2 +-
 BitPayLib/trait-wpdbhelper.php                   | 2 +-
 CHANGELOG.md                                     | 3 +++
 index.php                                        | 2 +-
 16 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/BitPayLib/Blocks/class-bitpaypaymentsblocks.php b/BitPayLib/Blocks/class-bitpaypaymentsblocks.php
index 564ea26..2433d1e 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/Exception/class-bitpayinvalidorder.php b/BitPayLib/Exception/class-bitpayinvalidorder.php
index bac159c..249a37d 100644
--- a/BitPayLib/Exception/class-bitpayinvalidorder.php
+++ b/BitPayLib/Exception/class-bitpayinvalidorder.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-bitpaycancelorder.php b/BitPayLib/class-bitpaycancelorder.php
index 8bb9365..1bc9c44 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 3be6db2..55ea1e5 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 24d7694..019d8e4 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 28bbfbc..c92b843 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 8508338..33774d0 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 5f49cef..8baacfd 100644
--- a/BitPayLib/class-bitpayipnprocess.php
+++ b/BitPayLib/class-bitpayipnprocess.php
@@ -14,7 +14,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 161be2e..a034102 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 a11a60d..e432296 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
  */
diff --git a/BitPayLib/class-bitpaypaymentsettings.php b/BitPayLib/class-bitpaypaymentsettings.php
index 614653d..27b8644 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 f8df946..68751c8 100644
--- a/BitPayLib/class-bitpaypluginsetup.php
+++ b/BitPayLib/class-bitpaypluginsetup.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-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php
index 339f812..40c3544 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 124e507..6a3ed01 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 012fcf8..92206ff 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
+* Improved webhook validation to improve timing issues
+
 # 5.4.0
 * Added compatibility with Checkout Blocks
 * Fixed Checkout Flow (BitPay Modal)
diff --git a/index.php b/index.php
index b6ccf5b..bf0fdb4 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
  */

From 73d158119698d1e91ae236c37860865e81be5345 Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Fri, 26 Apr 2024 10:11:27 -0400
Subject: [PATCH 15/22] SP-923: Update readme file

---
 readme.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/readme.txt b/readme.txt
index a81505a..65c6a3f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -111,6 +111,9 @@ You can contact our support team via the following form https://bitpay.com/reque
 
 == Changelog ==
 
+= 5.4.1 =
+* Improved webhook validation to improve timing issues
+
 = 5.4.0 =
 * Added compatibility with Checkout Blocks
 * Fixed Checkout Flow (BitPay Modal)

From 0139c103889fa0221d1f79bfc40048ca3086a986 Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Mon, 6 May 2024 09:26:19 -0400
Subject: [PATCH 16/22] SP-921: Release 5.5.0

---
 BitPayLib/Blocks/class-bitpaypaymentsblocks.php  | 2 +-
 BitPayLib/Exception/class-bitpayinvalidorder.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                  | 2 +-
 BitPayLib/class-bitpaypaymentsettings.php        | 2 +-
 BitPayLib/class-bitpaypluginsetup.php            | 2 +-
 BitPayLib/class-wcgatewaybitpay.php              | 2 +-
 BitPayLib/trait-wpdbhelper.php                   | 2 +-
 CHANGELOG.md                                     | 3 +++
 README.md                                        | 2 +-
 index.php                                        | 2 +-
 readme.txt                                       | 7 +++++--
 18 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/BitPayLib/Blocks/class-bitpaypaymentsblocks.php b/BitPayLib/Blocks/class-bitpaypaymentsblocks.php
index 2433d1e..4aa7d08 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.1
+ * Version: 5.5.0
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/Exception/class-bitpayinvalidorder.php b/BitPayLib/Exception/class-bitpayinvalidorder.php
index 249a37d..d0de2d5 100644
--- a/BitPayLib/Exception/class-bitpayinvalidorder.php
+++ b/BitPayLib/Exception/class-bitpayinvalidorder.php
@@ -8,7 +8,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.1
+ * Version: 5.5.0
  * 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 1bc9c44..09d042f 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.1
+ * Version: 5.5.0
  * 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 55ea1e5..31932d7 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.1
+ * Version: 5.5.0
  * 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 019d8e4..1d61aa6 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.1
+ * Version: 5.5.0
  * 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 c92b843..e681a0b 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.1
+ * Version: 5.5.0
  * 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 33774d0..ce84b75 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.1
+ * Version: 5.5.0
  * 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 8baacfd..fb11e3e 100644
--- a/BitPayLib/class-bitpayipnprocess.php
+++ b/BitPayLib/class-bitpayipnprocess.php
@@ -14,7 +14,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.1
+ * Version: 5.5.0
  * 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 a034102..6b4ba2f 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.1
+ * Version: 5.5.0
  * 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 e432296..c23d8b2 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.1
+ * Version: 5.5.0
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpaypaymentsettings.php b/BitPayLib/class-bitpaypaymentsettings.php
index 27b8644..48f9a71 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.1
+ * Version: 5.5.0
  * 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 68751c8..a797612 100644
--- a/BitPayLib/class-bitpaypluginsetup.php
+++ b/BitPayLib/class-bitpaypluginsetup.php
@@ -11,7 +11,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.4.1
+ * Version: 5.5.0
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php
index 40c3544..b4e0ab2 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.1
+ * Version: 5.5.0
  * 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 6a3ed01..3ab2731 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.1
+ * Version: 5.5.0
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92206ff..f470847 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.5.0
+* Tested compatibility with WordPress 6.5.2
+
 # 5.4.1
 * Improved webhook validation to improve timing issues
 
diff --git a/README.md b/README.md
index bef10cc..e5a6688 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Visit the [Releases](https://github.com/bitpay/bitpay-checkout-for-woocommerce/r
 
 **BitPay Support:**
 
-* Last Cart Version Tested: Wordpress 6.4.2
+* Last Cart Version Tested: Wordpress 6.5.2
 * [GitHub Issues](https://github.com/bitpay/bitpay-checkout-for-woocommerce/issues)
 * [Support](https://support.bitpay.com/hc/en-us)
 
diff --git a/index.php b/index.php
index bf0fdb4..03461c5 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.1
+ * Version: 5.5.0
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/readme.txt b/readme.txt
index 65c6a3f..e234a26 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,10 +2,10 @@
 Contributors: bitpay
 Tags: bitcoin, ether, ripple, bitcoin cash, ERC20, payments, bitpay, cryptocurrency, payment gateway
 Requires at least: 6.0
-Tested up to: 6.4.2
+Tested up to: 6.5.2
 Requires PHP: 8.0
 Recommended PHP: 8.0
-Stable tag: 5.4.0
+Stable tag: 5.5.0
 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.5.0 =
+* Tested compatibility with WordPress 6.4.2
+
 = 5.4.1 =
 * Improved webhook validation to improve timing issues
 

From 7954903e668477dfa4ddeb600cf4b50b879c8f8a Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Mon, 6 May 2024 10:04:53 -0400
Subject: [PATCH 17/22] SP-921: Update version

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index e234a26..a67e33e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -112,7 +112,7 @@ You can contact our support team via the following form https://bitpay.com/reque
 == Changelog ==
 
 = 5.5.0 =
-* Tested compatibility with WordPress 6.4.2
+* Tested compatibility with WordPress 6.5.2
 
 = 5.4.1 =
 * Improved webhook validation to improve timing issues

From c310df6de9f3d9f2367f3c8265559148faa2094b Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Mon, 1 Jul 2024 11:38:14 -0400
Subject: [PATCH 18/22] SP-998: Fix payment logo url and bump version

---
 BitPayLib/Blocks/class-bitpaypaymentsblocks.php  | 2 +-
 BitPayLib/Exception/class-bitpayinvalidorder.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                  | 2 +-
 BitPayLib/class-bitpaypaymentsettings.php        | 2 +-
 BitPayLib/class-bitpaypluginsetup.php            | 2 +-
 BitPayLib/class-wcgatewaybitpay.php              | 4 ++--
 BitPayLib/trait-wpdbhelper.php                   | 2 +-
 index.php                                        | 2 +-
 readme.txt                                       | 2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/BitPayLib/Blocks/class-bitpaypaymentsblocks.php b/BitPayLib/Blocks/class-bitpaypaymentsblocks.php
index 4aa7d08..8eb3d61 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.5.0
+ * Version: 5.5.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/Exception/class-bitpayinvalidorder.php b/BitPayLib/Exception/class-bitpayinvalidorder.php
index d0de2d5..1d9cb71 100644
--- a/BitPayLib/Exception/class-bitpayinvalidorder.php
+++ b/BitPayLib/Exception/class-bitpayinvalidorder.php
@@ -8,7 +8,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.5.0
+ * Version: 5.5.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 09d042f..d2bd807 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.5.0
+ * Version: 5.5.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 31932d7..0383d24 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.5.0
+ * Version: 5.5.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 1d61aa6..f86d013 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.5.0
+ * Version: 5.5.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 e681a0b..c4d3ff8 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.5.0
+ * Version: 5.5.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 ce84b75..9c61c10 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.5.0
+ * Version: 5.5.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 fb11e3e..efdae6c 100644
--- a/BitPayLib/class-bitpayipnprocess.php
+++ b/BitPayLib/class-bitpayipnprocess.php
@@ -14,7 +14,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.5.0
+ * Version: 5.5.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 6b4ba2f..9067cd4 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.5.0
+ * Version: 5.5.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 c23d8b2..3b14b68 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.5.0
+ * Version: 5.5.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-bitpaypaymentsettings.php b/BitPayLib/class-bitpaypaymentsettings.php
index 48f9a71..95866c0 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.5.0
+ * Version: 5.5.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 a797612..9121321 100644
--- a/BitPayLib/class-bitpaypluginsetup.php
+++ b/BitPayLib/class-bitpaypluginsetup.php
@@ -11,7 +11,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
- * Version: 5.5.0
+ * Version: 5.5.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/BitPayLib/class-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php
index b4e0ab2..ca5d053 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.5.0
+ * Version: 5.5.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
@@ -309,7 +309,7 @@ public function process_payment( $order_id ) {
 	private function get_icon_on_payment_page(): string {
 		$settings = new BitPayPaymentSettings();
 
-		return $settings->get_payment_logo_url() . '" id="bitpay_logo';
+		return add_query_arg('id', 'bitpay_logo', $settings->get_payment_logo_url());
 	}
 
 	private function get_processing_link(): string {
diff --git a/BitPayLib/trait-wpdbhelper.php b/BitPayLib/trait-wpdbhelper.php
index 3ab2731..a4dcfa2 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.5.0
+ * Version: 5.5.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/index.php b/index.php
index 03461c5..b834492 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.5.0
+ * Version: 5.5.1
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/readme.txt b/readme.txt
index a67e33e..ed4cb51 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Requires at least: 6.0
 Tested up to: 6.5.2
 Requires PHP: 8.0
 Recommended PHP: 8.0
-Stable tag: 5.5.0
+Stable tag: 5.5.1
 License: MIT License (MIT)
 License URI: https://github.com/bitpay/bitpay-checkout-for-woocommerce/blob/master/LICENSE
 

From 7a4550924cff391ac2d7e95ad68aadade8f85d02 Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Mon, 1 Jul 2024 16:01:39 -0400
Subject: [PATCH 19/22] SP-998: Update spaces

---
 BitPayLib/class-wcgatewaybitpay.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BitPayLib/class-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php
index ca5d053..6945617 100644
--- a/BitPayLib/class-wcgatewaybitpay.php
+++ b/BitPayLib/class-wcgatewaybitpay.php
@@ -309,7 +309,7 @@ public function process_payment( $order_id ) {
 	private function get_icon_on_payment_page(): string {
 		$settings = new BitPayPaymentSettings();
 
-		return add_query_arg('id', 'bitpay_logo', $settings->get_payment_logo_url());
+		return add_query_arg( 'id', 'bitpay_logo', $settings->get_payment_logo_url() );
 	}
 
 	private function get_processing_link(): string {

From 322c34a621cd11cf07be7ba72c2ed0ebfb752b35 Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Mon, 9 Sep 2024 12:24:49 -0400
Subject: [PATCH 20/22] SP-1066: Resolve additional conflict

---
 BitPayLib/Blocks/class-bitpaypaymentsblocks.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/BitPayLib/Blocks/class-bitpaypaymentsblocks.php b/BitPayLib/Blocks/class-bitpaypaymentsblocks.php
index 40cae80..29b71da 100644
--- a/BitPayLib/Blocks/class-bitpaypaymentsblocks.php
+++ b/BitPayLib/Blocks/class-bitpaypaymentsblocks.php
@@ -12,11 +12,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
-<<<<<<< HEAD
  * Version: 6.0.0
-=======
- * Version: 5.5.1
->>>>>>> origin/master
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */

From 3d463b634171ed395bf4d1c7bdae8cb6672d5e25 Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Mon, 9 Sep 2024 12:33:00 -0400
Subject: [PATCH 21/22] SP-1066: Fix final conflicts

---
 BitPayLib/class-wcgatewaybitpay.php | 4 ----
 index.php                           | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/BitPayLib/class-wcgatewaybitpay.php b/BitPayLib/class-wcgatewaybitpay.php
index 87294c1..f9c5fd5 100644
--- a/BitPayLib/class-wcgatewaybitpay.php
+++ b/BitPayLib/class-wcgatewaybitpay.php
@@ -8,11 +8,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
-<<<<<<< HEAD
  * Version: 6.0.0
-=======
- * Version: 5.5.1
->>>>>>> origin/master
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */
diff --git a/index.php b/index.php
index 332749e..8203945 100644
--- a/index.php
+++ b/index.php
@@ -3,11 +3,7 @@
  * Plugin Name: BitPay Checkout for WooCommerce
  * Plugin URI: https://www.bitpay.com
  * Description: BitPay Checkout Plugin
-<<<<<<< HEAD
  * Version: 6.0.0
-=======
- * Version: 5.5.1
->>>>>>> origin/master
  * Author: BitPay
  * Author URI: mailto:integrations@bitpay.com?subject=BitPay Checkout for WooCommerce
  */

From eed838b8b44fbeeae87a0a4044919f55b100693d Mon Sep 17 00:00:00 2001
From: Patrick <p.maguire@sumoheavy.com>
Date: Mon, 9 Sep 2024 12:51:34 -0400
Subject: [PATCH 22/22] SP-1066: Fix readme and changelog

---
 CHANGELOG.md |  3 +++
 readme.txt   | 10 +++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2851e7..ba71743 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 * Fixed a bug when the IPN/webhook is received with "complete" status
 * Add Unit & End2End tests
 
+# 5.5.1
+* Fixed issue with payment logo url
+
 # 5.5.0
 * Tested compatibility with WordPress 6.5.2
 
diff --git a/readme.txt b/readme.txt
index 1562c41..1d6105a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,19 +2,12 @@
 Contributors: bitpay
 Tags: bitcoin, ether, ripple, bitcoin cash, ERC20, payments, bitpay, cryptocurrency, payment gateway
 Requires at least: 6.0
-<<<<<<< HEAD
 Tested up to: 6.4.2
 WC requires at least: 8.0.0
 WC tested up to: 8.5.2
 Requires PHP: 8.1
 Recommended PHP: 8.3
 Stable tag: 6.0.0
-=======
-Tested up to: 6.5.2
-Requires PHP: 8.0
-Recommended PHP: 8.0
-Stable tag: 5.5.1
->>>>>>> origin/master
 License: MIT License (MIT)
 License URI: https://github.com/bitpay/bitpay-checkout-for-woocommerce/blob/master/LICENSE
 
@@ -124,6 +117,9 @@ You can contact our support team via the following form https://bitpay.com/reque
 * Fixed a bug when the IPN/webhook is received with "complete" status
 * * Add Unit & End2End tests
 
+= 5.5.1 =
+* Fixed issue with payment logo url
+
 = 5.5.0 =
 * Tested compatibility with WordPress 6.5.2