From e449ca2c95d8f6927f30959fc663fb0a6f5cb397 Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Thu, 31 Mar 2022 10:13:07 +0200
Subject: [PATCH] Fix shopify

---
 .../Plugins/Shopify/OrderTransactionRegisterLogic.cs         | 2 +-
 BTCPayServer/Plugins/Shopify/UIShopifyController.cs          | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/BTCPayServer/Plugins/Shopify/OrderTransactionRegisterLogic.cs b/BTCPayServer/Plugins/Shopify/OrderTransactionRegisterLogic.cs
index 2e16f5993..980e21f7d 100644
--- a/BTCPayServer/Plugins/Shopify/OrderTransactionRegisterLogic.cs
+++ b/BTCPayServer/Plugins/Shopify/OrderTransactionRegisterLogic.cs
@@ -21,7 +21,7 @@ namespace BTCPayServer.Plugins.Shopify
             var existingShopifyOrderTransactions = (await _client.TransactionsList(orderId)).transactions;
 
             //if there isn't a record for btcpay payment gateway, abort
-            var baseParentTransaction = existingShopifyOrderTransactions.FirstOrDefault(holder => !_keywords.Any(a => holder.gateway.Contains(a, StringComparison.InvariantCultureIgnoreCase)));
+            var baseParentTransaction = existingShopifyOrderTransactions.FirstOrDefault(holder => _keywords.Any(a => holder.gateway.Contains(a, StringComparison.InvariantCultureIgnoreCase)));
             if (baseParentTransaction is null)
             {
                 return null;
diff --git a/BTCPayServer/Plugins/Shopify/UIShopifyController.cs b/BTCPayServer/Plugins/Shopify/UIShopifyController.cs
index 3d2fbac47..04d89be48 100644
--- a/BTCPayServer/Plugins/Shopify/UIShopifyController.cs
+++ b/BTCPayServer/Plugins/Shopify/UIShopifyController.cs
@@ -164,14 +164,11 @@ namespace BTCPayServer.Plugins.Shopify
                     order = await client.GetOrder(orderId);
                 }
 
-                if (order?.FinancialStatus != "pending" && order?.FinancialStatus != "partially_paid")
-                {
-                    return Ok(new
+                 return Ok(new
                     {
                         invoiceId = firstInvoiceSettled.Id,
                         status = firstInvoiceSettled.Status.ToString().ToLowerInvariant()
                     });
-                }
             }
 
             if (checkOnly)