mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2024-11-19 18:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix shopify id / order no (#3718)

Browse Source 
fixes #3636
This commit is contained in:
Andrew Camilleri 2022-05-09 13:58:05 +02:00 committed by GitHub
parent 4acca4c6f5
commit 21bd35accd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Plugins/Shopify/ApiModels/ShopifyOrder.cs
View File

@ -7,6 +7,8 @@ namespace BTCPayServer.Plugins.Shopify.ApiModels
{
[JsonProperty("id")]
public string Id { get; set; }
[JsonProperty("order_number")]
public string OrderNumber { get; set; }
[JsonProperty("total_price")]
public decimal TotalPrice { get; set; }
[JsonProperty("total_outstanding")]

5
BTCPayServer/Plugins/Shopify/UIShopifyController.cs
View File

@ -112,7 +112,7 @@ namespace BTCPayServer.Plugins.Shopify
var invoiceOrderId = $"{ShopifyOrderMarkerHostedService.SHOPIFY_ORDER_ID_PREFIX}{orderId}";
var matchedExistingInvoices = await _invoiceRepository.GetInvoices(new InvoiceQuery()
{
OrderId = new[] { invoiceOrderId },
TextSearch = invoiceOrderId,
StoreId = new[] { storeId }
});
matchedExistingInvoices = matchedExistingInvoices.Where(entity =>
@ -190,7 +190,8 @@ namespace BTCPayServer.Plugins.Shopify
{
Amount = amount < order.TotalOutstanding ? amount : order.TotalOutstanding,
Currency = order.PresentmentCurrency,
Metadata = new JObject { ["orderId"] = invoiceOrderId }
Metadata = new JObject { ["orderId"] = order.OrderNumber },
AdditionalSearchTerms = new []{ "shopify", order.OrderNumber, order.Id, invoiceOrderId}
}, store,
Request.GetAbsoluteRoot(), new List<string>() { invoiceOrderId });