Skip to content

Commit

Permalink
breaking: Add Shopify GPC config, changed Order ID parsing
Browse files Browse the repository at this point in the history 
Changed Order ID parsing to remove everything except for numbers and '-'

Resolves #75
  • Loading branch information
@anion0278
anion0278 committed Apr 3, 2024
1 parent 35eb7b5 commit 500fdee
Show file tree
Hide file tree
Showing 7 changed files with 178 additions and 104 deletions.
4 changes: 3 additions & 1 deletion Mapp.BusinessLogic.Invoices/Transactions/TransactionsReader.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Text;
using System.Text.RegularExpressions;
using AutoMapper;
Expand Down Expand Up @@ -114,12 +115,13 @@ private IEnumerable<Transaction> ReadTransactions(string fileName)
{
string columnNameKey = validLines[0][columnIndex].Trim(); //tolower?
transactionsDict.Add(columnNameKey, validLines.Skip(1).Select(l => l[columnIndex]).ToArray());
}
}

var transactions = new List<Transaction>();
for (int index = 0; index < transactionsDict.First().Value.Count(); index++)
{
string orderId = transactionsDict[marketPlaceSetting.OrderIdColumnName][index];
orderId = new string(orderId.ToCharArray().Where(c => char.IsDigit(c) || c == '-').ToArray()); // we only need to take numbers, since for Shoppify order is smth like #3214, however '-' should be ok
if (string.IsNullOrEmpty(orderId))
orderId = "0000000000000000000";

Expand Down
200 changes: 100 additions & 100 deletions ...ts/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_Paypal.verified.txt
View file

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions ...s/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_Shopify.verified.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
0740000002001353907Czech Goods s.r.o. 01111900000013280900+00000016514842+000000461730770000000494070190011300424FIO
07500000020013539220000000000000000000000000000000000001139820000003099000000000000000000000000003099000000000000000000124311023
07500000020013539220000000000000000000000000000000000000860020000003098000000000000000000000000003098000000000000000000124301023
07500000020013539220000000000000000000000000000000000001250020000003097000000000000000000000000003097000000000000000000124301023
07500000020013539220000000000000000000000000000000000000169920000003096000000000000000000000000003096000000000000000000124291023
07500000020013539220000000000000000000000000000000000000289920000003095000000000000000000000000003095000000000000000000124291023
07500000020013539220000000000000000000000000000000000001004520000003094000000000000000000000000003094000000000000000000124281023
07500000020013539220000000000000000000000000000000000283000020000003093000000000000000000000000003093000000000000000000124281023
07500000020013539220000000000000000000000000000000000000458520000003090000000000000000000000000003090000000000000000000124261023
07500000020013539220000000000000000000000000000000000000597020000003089000000000000000000000000003089000000000000000000124261023
07500000020013539220000000000000000000000000000000000003530020000003088000000000000000000000000003088000000000000000000124251023
07500000020013539220000000000000000000000000000000000000289920000003083000000000000000000000000003083000000000000000000124231023
07500000020013539220000000000000000000000000000000000001582520000003082000000000000000000000000003082000000000000000000124231023
07500000020013539220000000000000000000000000000000000000540020000003079000000000000000000000000003079000000000000000000124221023
07500000020013539220000000000000000000000000000000000000299920000003076000000000000000000000000003076000000000000000000124221023
07500000020013539220000000000000000000000000000000000001563520000003074000000000000000000000000003074000000000000000000124201023
07500000020013539220000000000000000000000000000000000000399020000003073000000000000000000000000003073000000000000000000124201023
07500000020013539220000000000000000000000000000000000000299920000003072000000000000000000000000003072000000000000000000124201023
07500000020013539220000000000000000000000000000000000000187520000003070000000000000000000000000003070000000000000000000124191023
07500000020013539220000000000000000000000000000000000000429820000003067000000000000000000000000003067000000000000000000124181023
07500000020013539220000000000000000000000000000000000000853020000003066000000000000000000000000003066000000000000000000124171023
07500000020013539220000000000000000000000000000000000000209020000003065000000000000000000000000003065000000000000000000124171023
07500000020013539220000000000000000000000000000000000001220020000003064000000000000000000000000003064000000000000000000124171023
07500000020013539220000000000000000000000000000000000000410020000003062000000000000000000000000003062000000000000000000124161023
07500000020013539220000000000000000000000000000000000000298020000003061000000000000000000000000003061000000000000000000124151023
07500000020013539220000000000000000000000000000000000000589720000003059000000000000000000000000003059000000000000000000124141023
07500000020013539220000000000000000000000000000000000000299050000003055000000000000000000000000003055000000000000000000124141023
07500000020013539220000000000000000000000000000000000000220020000003057000000000000000000000000003057000000000000000000124131023
07500000020013539220000000000000000000000000000000000000249920000003056000000000000000000000000003056000000000000000000124131023
07500000020013539220000000000000000000000000000000000000299020000003055000000000000000000000000003055000000000000000000124111023
07500000020013539220000000000000000000000000000000000001299420000003054000000000000000000000000003054000000000000000000124091023
07500000020013539220000000000000000000000000000000000000939620000003050000000000000000000000000003050000000000000000000124071023
07500000020013539220000000000000000000000000000000000000490020000003049000000000000000000000000003049000000000000000000124031023
07500000020013539220000000000000000000000000000000000003099220000003048000000000000000000000000003048000000000000000000124021023
6 changes: 6 additions & 0 deletions Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonNL()
await IntegrationTestBase("AmazonNL");
}

[Fact]
public async Task ConvertTransactions_ParsesAndConvertsTransactions_Shopify()
{
await IntegrationTestBase("Shopify");
}

[Fact]
[Bug]
public async Task ConvertTransactions_ParsesAndConvertsTransactions_ZerosBug()
Expand Down
34 changes: 34 additions & 0 deletions Mapp.BusinessLogic.Transactions.Tests/TestData/Shopify.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Transaction Date,Type,Order,Card Brand,Card Source,Payout Status,Payout Date,Available On,Amount,Fee,Net,Checkout,Payment Method Name,Presentment Amount,Presentment Currency,Currency,VAT
2023-10-31 12:00:42 +0100,charge,#3099,master,online,pending,2023-12-01,2023-11-03,2636.49,107.33,2529.16,#42675990692187,card,113.98,USD,CZK,0.00
2023-10-30 19:49:07 +0100,charge,#3098,visa,online,pending,2023-12-01,2023-11-02,475.22,24.53,450.69,#42672842211675,card,86.00,PLN,CZK,0.00
2023-10-30 14:46:07 +0100,charge,#3097,visa,online,pending,2023-12-01,2023-11-02,690.73,32.82,657.91,#42616161075547,card,125.00,PLN,CZK,0.00
2023-10-29 21:50:14 +0100,charge,#3096,visa,online,pending,2023-12-01,2023-11-02,396.22,21.46,374.76,#42667949523291,card,16.99,USD,CZK,0.00
2023-10-29 03:48:20 +0100,charge,#3095,visa,online,pending,2023-12-01,2023-11-02,676.07,38.95,637.12,#42663650034011,card,28.99,USD,CZK,0.00
2023-10-28 20:38:16 +0200,charge,#3094,american_express,online,pending,2023-12-01,2023-11-02,2342.57,118.94,2223.63,#42662122881371,card,100.45,USD,CZK,0.00
2023-10-28 19:55:44 +0200,charge,#3093,master,online,pending,2023-12-01,2023-11-02,1817.31,75.86,1741.45,#42661940232539,card,28300.00,HUF,CZK,0.00
2023-10-26 19:10:59 +0200,charge,#3090,master,online,paid,2023-11-01,2023-10-31,1133.27,49.68,1083.59,#42651143635291,card,45.85,EUR,CZK,0.00
2023-10-26 01:40:36 +0200,charge,#3089,visa,online,paid,2023-11-01,2023-10-30,1394.56,73.35,1321.21,#42647323738459,card,59.70,USD,CZK,0.00
2023-10-25 13:54:03 +0200,charge,#3088,master,online,paid,2023-11-01,2023-10-30,5214.23,256.87,4957.36,#42643499090267,card,353.00,AUD,CZK,0.00
2023-10-23 21:36:53 +0200,charge,#3083,master,online,paid,2023-11-01,2023-10-26,673.92,38.82,635.10,#42634660970843,card,28.99,USD,CZK,0.00
2023-10-23 20:50:44 +0200,charge,#3082,master,online,paid,2023-11-01,2023-10-26,3678.81,183.18,3495.63,#42634437558619,card,158.25,USD,CZK,0.00
2023-10-22 21:40:39 +0200,charge,#3079,visa,online,paid,2023-11-01,2023-10-26,1254.70,66.68,1188.02,#42629232329051,card,54.00,USD,CZK,0.00
2023-10-22 03:02:53 +0200,charge,#3076,visa,online,paid,2023-11-01,2023-10-26,696.82,39.96,656.86,#42624960332123,card,29.99,USD,CZK,0.00
2023-10-20 22:23:12 +0200,charge,#3074,master,online,paid,2023-11-01,2023-10-25,3644.75,181.36,3463.39,#42618988855643,card,156.35,USD,CZK,0.00
2023-10-20 13:56:09 +0200,charge,#3073,visa,online,paid,2023-11-01,2023-10-25,983.66,53.50,930.16,#42616571363675,card,39.90,EUR,CZK,0.00
2023-10-20 05:40:46 +0200,charge,#3072,visa,online,paid,2023-11-01,2023-10-25,698.40,40.06,658.34,#42586800783707,card,29.99,USD,CZK,0.00
2023-10-19 04:26:27 +0200,charge,#3070,visa,online,paid,2023-11-01,2023-10-24,439.28,27.41,411.87,#42603178393947,card,18.75,USD,CZK,0.00
2023-10-18 10:58:14 +0200,charge,#3067,visa,online,paid,2023-11-01,2023-10-23,1002.37,54.57,947.80,#42604534137179,card,42.98,USD,CZK,0.00
2023-10-17 14:00:07 +0200,charge,#3066,american_express,online,paid,2023-11-01,2023-10-20,1993.02,102.10,1890.92,#42599961985371,card,85.30,USD,CZK,0.00
2023-10-17 13:36:27 +0200,charge,#3065,visa,online,paid,2023-11-01,2023-10-20,515.40,26.14,489.26,#42599763607899,card,20.90,EUR,CZK,0.00
2023-10-17 09:31:56 +0200,charge,#3064,visa,online,paid,2023-11-01,2023-10-20,2850.51,143.46,2707.05,#42587880161627,card,122.00,USD,CZK,0.00
2023-10-16 11:17:17 +0200,charge,#3062,master,online,paid,2023-11-01,2023-10-19,1012.27,44.93,967.34,#42522733674843,card,41.00,EUR,CZK,0.00
2023-10-15 18:19:16 +0200,charge,#3061,master,online,paid,2023-11-01,2023-10-19,736.04,34.58,701.46,#42590177624411,card,29.80,EUR,CZK,0.00
2023-10-14 19:59:27 +0200,charge,#3059,visa,online,paid,2023-11-01,2023-10-19,1385.51,73.07,1312.44,#42585603801435,card,58.97,USD,CZK,0.00
2023-10-14 07:07:50 +0200,refund,#3055,master,online,paid,2023-11-01,2023-10-16,-738.51,0.00,-738.51,#42569948889435,card,29.90,EUR,CZK,0.00
2023-10-13 21:51:43 +0200,charge,#3057,master,online,paid,2023-11-01,2023-10-18,627.61,36.52,591.09,#42581091549531,card,22.00,GBP,CZK,0.00
2023-10-13 03:14:12 +0200,charge,#3056,visa,online,paid,2023-11-01,2023-10-18,584.93,34.41,550.52,#42576776233307,card,24.99,USD,CZK,0.00
2023-10-11 19:37:49 +0200,charge,#3055,master,online,paid,2023-11-01,2023-10-16,734.79,41.53,693.26,#42569948889435,card,29.90,EUR,CZK,0.00
2023-10-09 17:19:00 +0200,charge,#3054,american_express,online,paid,2023-11-01,2023-10-12,3023.43,151.71,2871.72,#42557051339099,card,129.94,USD,CZK,0.00
2023-10-07 07:53:17 +0200,charge,#3050,visa,online,paid,2023-11-01,2023-10-12,2169.13,110.35,2058.78,#42540003393883,card,93.96,USD,CZK,0.00
2023-10-03 17:25:04 +0200,charge,#3049,master,online,paid,2023-11-01,2023-10-06,1382.63,72.80,1309.83,#42518763340123,card,49.00,GBP,CZK,0.00
2023-10-02 03:56:33 +0200,charge,#3048,visa,online,paid,2023-11-01,2023-10-05,7151.31,350.04,6801.27,#42509077578075,card,309.92,USD,CZK,0.00
2 changes: 1 addition & 1 deletion Mapp.UI/Mapp.UI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
<None Update="Transactions Configs\TransactionsConfigPaypal.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Transactions Configs\TransactionsConfigShopPayCM.json">
<None Update="Transactions Configs\TransactionsConfigShopify.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions ... Configs/TransactionsConfigShopPayCM.json → ...ns Configs/TransactionsConfigShopify.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@
],
"ValueComponentsColumnName": [
"Presentment Amount"

],
"TransferTypeNames": [

],
"RefundTypeNames": [
"refund",
"chargeback"

],
"OrderTypeNames": [
"charge"
Expand Down

0 comments on commit 500fdee

Please sign in to comment.