diff --git a/Mapp.BusinessLogic.Invoices/Transactions/MarketPlaceTransactionsConfig.cs b/Mapp.BusinessLogic.Invoices/Transactions/MarketPlaceTransactionsConfig.cs index 700af10..1d14f07 100644 --- a/Mapp.BusinessLogic.Invoices/Transactions/MarketPlaceTransactionsConfig.cs +++ b/Mapp.BusinessLogic.Invoices/Transactions/MarketPlaceTransactionsConfig.cs @@ -42,14 +42,14 @@ public CultureInfo DateCultureInfo { if (_dataCultureInfo == null) { - _dataCultureInfo = new CultureInfo(DateCultureInfoName); + _dataCultureInfo = new CultureInfo(DateCultureInfoName, false); if (_timeSeparatorOverride != null) { _dataCultureInfo.DateTimeFormat.TimeSeparator = _timeSeparatorOverride; } if (NumericFormatSourceCultureName != null) { - var numbericCultureInfo = new CultureInfo(NumericFormatSourceCultureName); + var numbericCultureInfo = new CultureInfo(NumericFormatSourceCultureName, false); _dataCultureInfo.NumberFormat = numbericCultureInfo.NumberFormat; } } diff --git a/Mapp.BusinessLogic.Invoices/Transactions/TransactionsReader.cs b/Mapp.BusinessLogic.Invoices/Transactions/TransactionsReader.cs index 2a78118..ac241c2 100644 --- a/Mapp.BusinessLogic.Invoices/Transactions/TransactionsReader.cs +++ b/Mapp.BusinessLogic.Invoices/Transactions/TransactionsReader.cs @@ -83,6 +83,7 @@ private IReadOnlyList GetFileLines(string fileName, string encodingCod private DateTime ParseDate(string dateString, MarketPlaceTransactionsConfig config) { + // TODO use CultureDependentValueParser var match = Regex.Match(dateString, config.DateSubstring); return DateTime.Parse(match.Groups[1].Value, config.DateCultureInfo); } diff --git a/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_AmazonBE.verified.txt b/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_AmazonBE.verified.txt index 984e7b5..824d4f0 100644 --- a/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_AmazonBE.verified.txt +++ b/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_AmazonBE.verified.txt @@ -1,5 +1,5 @@ 0740000002001353907Czech Goods s.r.o. 01111900000013280900+00000016514842+000000461730770000000494070190011300424FIO -0750000002001353908000000000000000000000000000000000000026992951669712700000000000000000000000000408-0091951-6697127000124050224 -07500000020013539080000000000000000000000000000000000001062710000000000000000000000000000000000000000000000000000000000124170224 -0750000002001353908000000000000000000000000000000000000026992290539393600000000000000000000000000408-2472290-5393936000124230224 -0750000002001353908000000000000000000000000000000000000062002070906676300000000000000000000000000405-7042070-9066763000124260224 \ No newline at end of file +0750000002001353915000000000000000000000000000000000000026992951669712700000000000000000000000000408-0091951-6697127000124050224 +07500000020013539150000000000000000000000000000000000001062710000000000000000000000000000000000000000000000000000000000124170224 +0750000002001353915000000000000000000000000000000000000026992290539393600000000000000000000000000408-2472290-5393936000124230224 +0750000002001353915000000000000000000000000000000000000062002070906676300000000000000000000000000405-7042070-9066763000124260224 \ No newline at end of file diff --git a/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_AmazonGB.verified.txt b/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_AmazonGB.verified.txt index 2dc8341..037ff93 100644 --- a/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_AmazonGB.verified.txt +++ b/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.ConvertTransactions_ParsesAndConvertsTransactions_AmazonGB.verified.txt @@ -1,228 +1,46 @@ 0740000002001353907Czech Goods s.r.o. 01111900000013280900+00000016514842+000000461730770000000494070190011300424FIO -0750000002001353905000000000000000000000000000000000000084982988797631300000000000000000000000000206-3339988-7976313000124021120 -0750000002001353905000000000000000000000000000000000000071952988797631300000000000000000000000000206-3339988-7976313000124021120 -0750000002001353905000000000000000000000000000000000000021002236524434000000000000000000000000000205-3000236-5244340000124021120 -0750000002001353905000000000000000000000000000000000000018992282502593000000000000000000000000000202-0066282-5025930000124021120 -0750000002001353905000000000000000000000000000000000000015992396080190600000000000000000000000000202-8310396-0801906000124021120 -0750000002001353905000000000000000000000000000000000000018492922336513400000000000000000000000000203-9153922-3365134000124021120 -0750000002001353905000000000000000000000000000000000000015482922336513400000000000000000000000000203-9153922-3365134000124021120 -0750000002001353905000000000000000000000000000000000000023992579097391600000000000000000000000000202-3813579-0973916000124021120 -0750000002001353905000000000000000000000000000000000000029992599632513500000000000000000000000000026-0042599-6325135000124021120 -0750000002001353905000000000000000000000000000000000000017992195814830200000000000000000000000000026-8070195-8148302000124021120 -0750000002001353905000000000000000000000000000000000000019992939692515200000000000000000000000000204-2113939-6925152000124021120 -0750000002001353905000000000000000000000000000000000000009992377176591400000000000000000000000000202-4613377-1765914000124021120 -0750000002001353905000000000000000000000000000000000000015002393677476900000000000000000000000000202-5866393-6774769000124021120 -0750000002001353905000000000000000000000000000000000000015992616278034300000000000000000000000000206-3219616-2780343000124021120 -0750000002001353905000000000000000000000000000000000000009002226714757100000000000000000000000000206-0107226-7147571000124021120 -0750000002001353905000000000000000000000000000000000000008982226714757100000000000000000000000000206-0107226-7147571000124021120 -0750000002001353905000000000000000000000000000000000000018982237816832800000000000000000000000000203-7003237-8168328000124021120 -0750000002001353905000000000000000000000000000000000000026152128837071200000000000000000000000000205-2734128-8370712000124021120 -0750000002001353905000000000000000000000000000000000000023992636577076600000000000000000000000000204-3696636-5770766000124021120 -0750000002001353905000000000000000000000000000000000000018952979448752000000000000000000000000000204-5135979-4487520000124021120 -0750000002001353905000000000000000000000000000000000000012992563797710400000000000000000000000000205-5789563-7977104000124021120 -0750000002001353905000000000000000000000000000000000000022992959366274400000000000000000000000000205-6456959-3662744000124021120 -0750000002001353905000000000000000000000000000000000000017995352774272400000000000000000000000000026-3948352-7742724000124021120 -0750000002001353905000000000000000000000000000000000000028992763659871700000000000000000000000000206-4293763-6598717000124041120 -0750000002001353905000000000000000000000000000000000000010492543433953000000000000000000000000000026-0601543-4339530000124041120 -0750000002001353905000000000000000000000000000000000000007492543433953000000000000000000000000000026-0601543-4339530000124041120 -0750000002001353905000000000000000000000000000000000000074942355036911200000000000000000000000000202-0728355-0369112000124041120 -0750000002001353905000000000000000000000000000000000000014952545787311100000000000000000000000000205-7135545-7873111000124041120 -0750000002001353905000000000000000000000000000000000000028972600106033300000000000000000000000000206-3444600-1060333000124041120 -0750000002001353905000000000000000000000000000000000000024992407966751300000000000000000000000000204-0376407-9667513000124041120 -0750000002001353905000000000000000000000000000000000000026152275311712600000000000000000000000000203-4797275-3117126000124041120 -0750000002001353905000000000000000000000000000000000000018292958644351900000000000000000000000000204-5559958-6443519000124041120 -0750000002001353905000000000000000000000000000000000000007502958644351900000000000000000000000000204-5559958-6443519000124041120 -0750000002001353905000000000000000000000000000000000000016002597953792700000000000000000000000000204-4687597-9537927000124041120 -0750000002001353905000000000000000000000000000000000000026992026706992700000000000000000000000000204-0001026-7069927000124041120 -0750000002001353905000000000000000000000000000000000000017982745666431100000000000000000000000000206-0035745-6664311000124041120 -0750000002001353905000000000000000000000000000000000000022992463552596700000000000000000000000000204-3136463-5525967000124041120 -0750000002001353905000000000000000000000000000000000000022982027566834800000000000000000000000000203-1864027-5668348000124041120 -0750000002001353905000000000000000000000000000000000000103972335952195900000000000000000000000000206-0646335-9521959000124061120 -0750000002001353905000000000000000000000000000000000000012992881538112300000000000000000000000000026-7333881-5381123000124061120 -0750000002001353905000000000000000000000000000000000000010982969068354900000000000000000000000000204-9497969-0683549000124061120 -0750000002001353905000000000000000000000000000000000000020982877386034100000000000000000000000000206-9894877-3860341000124061120 -0750000002001353905000000000000000000000000000000000000024982365589076500000000000000000000000000204-1456365-5890765000124061120 -0750000002001353905000000000000000000000000000000000000036992882410836200000000000000000000000000205-7922882-4108362000124061120 -0750000002001353905000000000000000000000000000000000000046982056945634300000000000000000000000000205-2616056-9456343000124061120 -0750000002001353905000000000000000000000000000000000000020982732405150100000000000000000000000000203-3810732-4051501000124061120 -0750000002001353905000000000000000000000000000000000000039002529530910500000000000000000000000000204-5081529-5309105000124061120 -0750000002001353905000000000000000000000000000000000000023992739987956100000000000000000000000000206-3430739-9879561000124091120 -0750000002001353905000000000000000000000000000000000000008992510030990700000000000000000000000000206-2409510-0309907000124091120 -0750000002001353905000000000000000000000000000000000000008992243713396900000000000000000000000000205-4170243-7133969000124091120 -0750000002001353905000000000000000000000000000000000000010952639426111500000000000000000000000000206-7102639-4261115000124091120 -0750000002001353905000000000000000000000000000000000000007002012318594600000000000000000000000000206-5242012-3185946000124091120 -0750000002001353905000000000000000000000000000000000000026152221560352200000000000000000000000000203-5729221-5603522000124091120 -0750000002001353905000000000000000000000000000000000000013992673080271400000000000000000000000000026-5887673-0802714000124091120 -0750000002001353905000000000000000000000000000000000000008992570333873700000000000000000000000000203-4840570-3338737000124091120 -0750000002001353905000000000000000000000000000000000000041982774878431900000000000000000000000000203-9511774-8784319000124091120 -0750000002001353905000000000000000000000000000000000000007492888714596600000000000000000000000000206-6542888-7145966000124091120 -0750000002001353905000000000000000000000000000000000000010432888714596600000000000000000000000000206-6542888-7145966000124091120 -0750000002001353905000000000000000000000000000000000000011992076033632400000000000000000000000000026-6490076-0336324000124091120 -0750000002001353905000000000000000000000000000000000000008992982003314600000000000000000000000000206-1293982-0033146000124091120 -0750000002001353905000000000000000000000000000000000000020982026143391800000000000000000000000000202-0386026-1433918000124091120 -0750000002001353905000000000000000000000000000000000000016245479009554100000000000000000000000000202-8208479-0095541000124091120 -07500000020013539050000000000000000000000000000000000014357610000000000000000000000000000000000000000000000000000000000124111120 -0750000002001353905000000000000000000000000000000000000008992565882033400000000000000000000000000202-0120565-8820334000124111120 -0750000002001353905000000000000000000000000000000000000026992845946836600000000000000000000000000206-1212845-9468366000124111120 -0750000002001353905000000000000000000000000000000000000024002994499872800000000000000000000000000203-1883994-4998728000124111120 -0750000002001353905000000000000000000000000000000000000010002176131556700000000000000000000000000202-1912176-1315567000124111120 -0750000002001353905000000000000000000000000000000000000006002176131556700000000000000000000000000202-1912176-1315567000124111120 -0750000002001353905000000000000000000000000000000000000014942586123391800000000000000000000000000026-6326586-1233918000124111120 -0750000002001353905000000000000000000000000000000000000008992309316191600000000000000000000000000204-2849309-3161916000124111120 -0750000002001353905000000000000000000000000000000000000008482906667716100000000000000000000000000206-4941906-6677161000124131120 -0750000002001353905000000000000000000000000000000000000012502906667716100000000000000000000000000206-4941906-6677161000124131120 -0750000002001353905000000000000000000000000000000000000029222191142355800000000000000000000000000204-9385191-1423558000124131120 -0750000002001353905000000000000000000000000000000000000019482191142355800000000000000000000000000204-9385191-1423558000124131120 -0750000002001353905000000000000000000000000000000000000009742191142355800000000000000000000000000204-9385191-1423558000124131120 -0750000002001353905000000000000000000000000000000000000019472191142355800000000000000000000000000204-9385191-1423558000124131120 -0750000002001353905000000000000000000000000000000000000019992956060676200000000000000000000000000026-2977956-0606762000124131120 -0750000002001353905000000000000000000000000000000000000014992362003714600000000000000000000000000202-1178362-0037146000124131120 -0750000002001353905000000000000000000000000000000000000026152767903471100000000000000000000000000206-7533767-9034711000124131120 -0750000002001353905000000000000000000000000000000000000047992587359071400000000000000000000000000204-6432587-3590714000124131120 -0750000002001353905000000000000000000000000000000000000275992537834670200000000000000000000000000206-2018537-8346702000124131120 -0750000002001353905000000000000000000000000000000000000008992276175472300000000000000000000000000204-6532276-1754723000124131120 -0750000002001353905000000000000000000000000000000000000008992718222916800000000000000000000000000204-2596718-2229168000124131120 -0750000002001353905000000000000000000000000000000000000012992624926273400000000000000000000000000205-8578624-9262734000124131120 -0750000002001353905000000000000000000000000000000000000023492682020036700000000000000000000000000205-4992682-0200367000124131120 -0750000002001353905000000000000000000000000000000000000023492682020036700000000000000000000000000205-4992682-0200367000124131120 -0750000002001353905000000000000000000000000000000000000035982256645950800000000000000000000000000203-2158256-6459508000124131120 -0750000002001353905000000000000000000000000000000000000026152073971394100000000000000000000000000206-3822073-9713941000124131120 -0750000002001353905000000000000000000000000000000000000008992484925071300000000000000000000000000204-5586484-9250713000124131120 -0750000002001353905000000000000000000000000000000000000015992546362596800000000000000000000000000026-7591546-3625968000124131120 -0750000002001353905000000000000000000000000000000000000016972519903315100000000000000000000000000202-7977519-9033151000124131120 -0750000002001353905000000000000000000000000000000000000016972667891714300000000000000000000000000026-7461667-8917143000124131120 -0750000002001353905000000000000000000000000000000000000028142195510996100000000000000000000000000205-0781195-5109961000124131120 -0750000002001353905000000000000000000000000000000000000141952052644432700000000000000000000000000206-2938052-6444327000124131120 -0750000002001353905000000000000000000000000000000000000012992418263150000000000000000000000000000206-8109418-2631500000124131120 -0750000002001353905000000000000000000000000000000000000020792199569636900000000000000000000000000026-2687199-5696369000124131120 -0750000002001353905000000000000000000000000000000000000019002996792272400000000000000000000000000203-2980996-7922724000124161120 -0750000002001353905000000000000000000000000000000000000028142811389795300000000000000000000000000204-8488811-3897953000124161120 -0750000002001353905000000000000000000000000000000000000014962393297155500000000000000000000000000206-2585393-2971555000124161120 -0750000002001353905000000000000000000000000000000000000010492451116990200000000000000000000000000206-3417451-1169902000124161120 -0750000002001353905000000000000000000000000000000000000010492451116990200000000000000000000000000206-3417451-1169902000124161120 -0750000002001353905000000000000000000000000000000000000010992222912994600000000000000000000000000204-4589222-9129946000124161120 -0750000002001353905000000000000000000000000000000000000015002124166351300000000000000000000000000206-2233124-1663513000124161120 -0750000002001353905000000000000000000000000000000000000008992904829234000000000000000000000000000206-6639904-8292340000124161120 -0750000002001353905000000000000000000000000000000000000008992686873074500000000000000000000000000205-1015686-8730745000124161120 -0750000002001353905000000000000000000000000000000000000014942999391390100000000000000000000000000026-9623999-3913901000124161120 -0750000002001353905000000000000000000000000000000000000021992355633234400000000000000000000000000204-9872355-6332344000124161120 -0750000002001353905000000000000000000000000000000000000019002369646592300000000000000000000000000206-3561369-6465923000124161120 -0750000002001353905000000000000000000000000000000000000018002883067152600000000000000000000000000206-5588883-0671526000124161120 -0750000002001353905000000000000000000000000000000000000020992064343953300000000000000000000000000206-9216064-3439533000124161120 -0750000002001353905000000000000000000000000000000000000013552437171951600000000000000000000000000205-2797437-1719516000124161120 -0750000002001353905000000000000000000000000000000000000031002731992914200000000000000000000000000205-6593731-9929142000124161120 -0750000002001353905000000000000000000000000000000000000015992748865954100000000000000000000000000204-7089748-8659541000124181120 -0750000002001353905000000000000000000000000000000000000026152157235392600000000000000000000000000026-3008157-2353926000124181120 -0750000002001353905000000000000000000000000000000000000012992636400430300000000000000000000000000206-6224636-4004303000124181120 -0750000002001353905000000000000000000000000000000000000025952323780273900000000000000000000000000203-3866323-7802739000124181120 -0750000002001353905000000000000000000000000000000000000012952321724350800000000000000000000000000203-6005321-7243508000124181120 -0750000002001353905000000000000000000000000000000000000028982748037072500000000000000000000000000204-9571748-0370725000124181120 -0750000002001353905000000000000000000000000000000000000029992748037072500000000000000000000000000204-9571748-0370725000124181120 -0750000002001353905000000000000000000000000000000000000034982941720430200000000000000000000000000026-1228941-7204302000124181120 -0750000002001353905000000000000000000000000000000000000097982387099552400000000000000000000000000204-3450387-0995524000124181120 -0750000002001353905000000000000000000000000000000000000020992463196911800000000000000000000000000203-2467463-1969118000124181120 -0750000002001353905000000000000000000000000000000000000016982675565556800000000000000000000000000206-9090675-5655568000124181120 -0750000002001353905000000000000000000000000000000000000050992281870594500000000000000000000000000026-4677281-8705945000124181120 -0750000002001353905000000000000000000000000000000000000022962562640832500000000000000000000000000026-1468562-6408325000124181120 -0750000002001353905000000000000000000000000000000000000097985387099552400000000000000000000000000204-3450387-0995524000124181120 -0750000002001353905000000000000000000000000000000000000103802711283472700000000000000000000000000202-4133711-2834727000124191120 -0750000002001353905000000000000000000000000000000000000017982619154995000000000000000000000000000202-4143619-1549950000124201120 -0750000002001353905000000000000000000000000000000000000025992405262034500000000000000000000000000203-4783405-2620345000124201120 -0750000002001353905000000000000000000000000000000000000018982390021474900000000000000000000000000206-7619390-0214749000124201120 -0750000002001353905000000000000000000000000000000000000012992560544514900000000000000000000000000203-2695560-5445149000124201120 -0750000002001353905000000000000000000000000000000000000013952377951156400000000000000000000000000204-1894377-9511564000124201120 -0750000002001353905000000000000000000000000000000000000019952377951156400000000000000000000000000204-1894377-9511564000124201120 -0750000002001353905000000000000000000000000000000000000010992472987792300000000000000000000000000206-3154472-9877923000124201120 -0750000002001353905000000000000000000000000000000000000025992479411236500000000000000000000000000206-8718479-4112365000124201120 -0750000002001353905000000000000000000000000000000000000032142120775794700000000000000000000000000203-4735120-7757947000124201120 -0750000002001353905000000000000000000000000000000000000028482128184916900000000000000000000000000026-6818128-1849169000124201120 -0750000002001353905000000000000000000000000000000000000046482128184916900000000000000000000000000026-6818128-1849169000124201120 -0750000002001353905000000000000000000000000000000000000023992450568191600000000000000000000000000203-3619450-5681916000124201120 -0750000002001353905000000000000000000000000000000000000027992267492915500000000000000000000000000026-2034267-4929155000124201120 -0750000002001353905000000000000000000000000000000000000095892174947711700000000000000000000000000203-7250174-9477117000124201120 -0750000002001353905000000000000000000000000000000000000015492029555950400000000000000000000000000202-0778029-5559504000124201120 -0750000002001353905000000000000000000000000000000000000010492029555950400000000000000000000000000202-0778029-5559504000124201120 -0750000002001353905000000000000000000000000000000000000030992146301392200000000000000000000000000026-5060146-3013922000124231120 -0750000002001353905000000000000000000000000000000000000008992729891791800000000000000000000000000203-5973729-8917918000124231120 -0750000002001353905000000000000000000000000000000000000025992062898436600000000000000000000000000202-9090062-8984366000124231120 -0750000002001353905000000000000000000000000000000000000026152319208430600000000000000000000000000026-6293319-2084306000124231120 -0750000002001353905000000000000000000000000000000000000026992396099555400000000000000000000000000204-8741396-0995554000124231120 -0750000002001353905000000000000000000000000000000000000022982842726430100000000000000000000000000204-8749842-7264301000124231120 -0750000002001353905000000000000000000000000000000000000008992234805871300000000000000000000000000206-1425234-8058713000124231120 -0750000002001353905000000000000000000000000000000000000014992327702672900000000000000000000000000026-8607327-7026729000124231120 -0750000002001353905000000000000000000000000000000000000008002912721151200000000000000000000000000204-6183912-7211512000124231120 -0750000002001353905000000000000000000000000000000000000031982205159715600000000000000000000000000204-8670205-1597156000124231120 -0750000002001353905000000000000000000000000000000000000029002248144030000000000000000000000000000202-6406248-1440300000124231120 -0750000002001353905000000000000000000000000000000000000026152665791874500000000000000000000000000206-5211665-7918745000124231120 -0750000002001353905000000000000000000000000000000000000016992830035475600000000000000000000000000204-1414830-0354756000124231120 -0750000002001353905000000000000000000000000000000000000012992060031076000000000000000000000000000026-1469060-0310760000124231120 -0750000002001353905000000000000000000000000000000000000052942155437794100000000000000000000000000206-9552155-4377941000124231120 -0750000002001353905000000000000000000000000000000000000026152055772511400000000000000000000000000202-2690055-7725114000124231120 -0750000002001353905000000000000000000000000000000000000008992403662430900000000000000000000000000206-7013403-6624309000124231120 -0750000002001353905000000000000000000000000000000000000027982663728193300000000000000000000000000202-8181663-7281933000124231120 -0750000002001353905000000000000000000000000000000000000020982387719395100000000000000000000000000206-7112387-7193951000124231120 -0750000002001353905000000000000000000000000000000000000051972777689390000000000000000000000000000026-2836777-6893900000124231120 -0750000002001353905000000000000000000000000000000000000065992326547713700000000000000000000000000026-6032326-5477137000124231120 -0750000002001353905000000000000000000000000000000000000026992977258750300000000000000000000000000026-6173977-2587503000124231120 -07500000020013539050000000000000000000000000000000000022361110000000000000000000000000000000000000000000000000000000000124251120 -0750000002001353905000000000000000000000000000000000000026152817321870200000000000000000000000000204-6701817-3218702000124251120 -0750000002001353905000000000000000000000000000000000000012992541665150300000000000000000000000000204-9461541-6651503000124251120 -0750000002001353905000000000000000000000000000000000000010002980838193100000000000000000000000000206-6190980-8381931000124251120 -0750000002001353905000000000000000000000000000000000000012992897036675400000000000000000000000000205-0724897-0366754000124251120 -0750000002001353905000000000000000000000000000000000000008992291956270800000000000000000000000000206-2236291-9562708000124251120 -0750000002001353905000000000000000000000000000000000000006992724826430600000000000000000000000000206-2317724-8264306000124251120 -0750000002001353905000000000000000000000000000000000000010002724826430600000000000000000000000000206-2317724-8264306000124251120 -0750000002001353905000000000000000000000000000000000000020492546698036600000000000000000000000000203-1124546-6980366000124251120 -0750000002001353905000000000000000000000000000000000000015452546698036600000000000000000000000000203-1124546-6980366000124251120 -0750000002001353905000000000000000000000000000000000000023492843820590800000000000000000000000000026-3212843-8205908000124251120 -0750000002001353905000000000000000000000000000000000000010492843820590800000000000000000000000000026-3212843-8205908000124251120 -0750000002001353905000000000000000000000000000000000000068982992476274800000000000000000000000000205-6209992-4762748000124251120 -0750000002001353905000000000000000000000000000000000000017992834043474200000000000000000000000000202-6450834-0434742000124271120 -0750000002001353905000000000000000000000000000000000000050992662431956300000000000000000000000000206-8271662-4319563000124271120 -0750000002001353905000000000000000000000000000000000000026152519714192600000000000000000000000000204-6134519-7141926000124271120 -0750000002001353905000000000000000000000000000000000000025992352501476300000000000000000000000000026-9355352-5014763000124271120 -0750000002001353905000000000000000000000000000000000000020982559568036100000000000000000000000000205-9348559-5680361000124271120 -0750000002001353905000000000000000000000000000000000000022992329418352500000000000000000000000000206-7728329-4183525000124271120 -0750000002001353905000000000000000000000000000000000000023982187573633000000000000000000000000000206-9410187-5736330000124271120 -0750000002001353905000000000000000000000000000000000000026152686510592100000000000000000000000000026-4769686-5105921000124271120 -0750000002001353905000000000000000000000000000000000000012002503586673600000000000000000000000000202-2021503-5866736000124271120 -0750000002001353905000000000000000000000000000000000000023832612989230300000000000000000000000000205-6414612-9892303000124271120 -0750000002001353905000000000000000000000000000000000000017992409378112200000000000000000000000000205-1578409-3781122000124271120 -0750000002001353905000000000000000000000000000000000000068995271716511800000000000000000000000000205-0640271-7165118000124271120 -0750000002001353905000000000000000000000000000000000000020982453067315600000000000000000000000000202-1176453-0673156000124301120 -0750000002001353905000000000000000000000000000000000000030992415318755300000000000000000000000000202-7597415-3187553000124301120 -0750000002001353905000000000000000000000000000000000000015992192687716500000000000000000000000000203-3185192-6877165000124301120 -0750000002001353905000000000000000000000000000000000000009992172744674000000000000000000000000000202-4691172-7446740000124301120 -0750000002001353905000000000000000000000000000000000000014992959881470700000000000000000000000000026-9803959-8814707000124301120 -0750000002001353905000000000000000000000000000000000000012992817584432900000000000000000000000000026-3955817-5844329000124301120 -0750000002001353905000000000000000000000000000000000000012992001798515300000000000000000000000000203-9023001-7985153000124301120 -0750000002001353905000000000000000000000000000000000000007992431437473200000000000000000000000000204-6296431-4374732000124301120 -0750000002001353905000000000000000000000000000000000000018492158766035300000000000000000000000000205-6124158-7660353000124301120 -0750000002001353905000000000000000000000000000000000000015492158766035300000000000000000000000000205-6124158-7660353000124301120 -0750000002001353905000000000000000000000000000000000000026152283702832000000000000000000000000000026-1121283-7028320000124301120 -0750000002001353905000000000000000000000000000000000000008992381156916800000000000000000000000000203-6865381-1569168000124301120 -0750000002001353905000000000000000000000000000000000000008992645200675100000000000000000000000000204-9486645-2006751000124301120 -0750000002001353905000000000000000000000000000000000000011992197082993500000000000000000000000000202-3023197-0829935000124301120 -0750000002001353905000000000000000000000000000000000000013492702264675600000000000000000000000000204-5723702-2646756000124301120 -0750000002001353905000000000000000000000000000000000000013492702264675600000000000000000000000000204-5723702-2646756000124301120 -0750000002001353905000000000000000000000000000000000000015992903626356000000000000000000000000000204-4078903-6263560000124301120 -0750000002001353905000000000000000000000000000000000000017992963255155300000000000000000000000000205-0604963-2551553000124301120 -0750000002001353905000000000000000000000000000000000000027982844754756200000000000000000000000000203-3601844-7547562000124301120 -0750000002001353905000000000000000000000000000000000000038942683520595100000000000000000000000000026-7203683-5205951000124301120 -0750000002001353905000000000000000000000000000000000000040982139443950400000000000000000000000000203-7055139-4439504000124301120 -0750000002001353905000000000000000000000000000000000000011992828694114200000000000000000000000000203-5397828-6941142000124301120 -0750000002001353905000000000000000000000000000000000000008992509808196800000000000000000000000000026-6680509-8081968000124301120 -0750000002001353905000000000000000000000000000000000000008992766233712700000000000000000000000000202-1736766-2337127000124301120 -0750000002001353905000000000000000000000000000000000000011992477055473500000000000000000000000000203-3720477-0554735000124301120 -0750000002001353905000000000000000000000000000000000000008992749067071900000000000000000000000000204-2165749-0670719000124301120 -0750000002001353905000000000000000000000000000000000000013982133693956200000000000000000000000000202-3919133-6939562000124301120 -0750000002001353905000000000000000000000000000000000000021982174291635800000000000000000000000000026-8153174-2916358000124301120 -0750000002001353905000000000000000000000000000000000000008992505029154900000000000000000000000000202-1126505-0291549000124301120 -0750000002001353905000000000000000000000000000000000000014992112457075600000000000000000000000000026-4020112-4570756000124301120 -0750000002001353905000000000000000000000000000000000000008992225873471000000000000000000000000000204-9218225-8734710000124301120 -0750000002001353905000000000000000000000000000000000000018982019011396200000000000000000000000000204-4471019-0113962000124301120 -0750000002001353905000000000000000000000000000000000000013002337747954300000000000000000000000000206-2540337-7479543000124301120 -0750000002001353905000000000000000000000000000000000000042942071887632400000000000000000000000000026-3443071-8876324000124301120 -0750000002001353905000000000000000000000000000000000000008992110622835300000000000000000000000000206-8022110-6228353000124301120 -0750000002001353905000000000000000000000000000000000000008992763191315800000000000000000000000000026-8401763-1913158000124301120 -0750000002001353905000000000000000000000000000000000000028142218306194400000000000000000000000000205-6450218-3061944000124301120 \ No newline at end of file +0750000002001353905000000000000000000000000000000000000032982594059554100000000000000000000000000026-5276594-0595541000124020224 +0750000002001353905000000000000000000000000000000000000025972631281952600000000000000000000000000205-7569631-2819526000124020224 +0750000002001353905000000000000000000000000000000000000017982652690996200000000000000000000000000203-2855652-6909962000124020224 +0750000002001353905000000000000000000000000000000000000049152232425710000000000000000000000000000203-9216232-4257100000124050224 +0750000002001353905000000000000000000000000000000000000029592967427550000000000000000000000000000203-7350967-4275500000124050224 +0750000002001353905000000000000000000000000000000000000026662149938993100000000000000000000000000026-1128149-9389931000124050224 +0750000002001353905000000000000000000000000000000000000019982300785154600000000000000000000000000202-1733300-7851546000124050224 +0750000002001353905000000000000000000000000000000000000034172551516116600000000000000000000000000206-6127551-5161166000124050224 +0750000002001353905000000000000000000000000000000000000037982897042596400000000000000000000000000204-2192897-0425964000124070224 +0750000002001353905000000000000000000000000000000000000025822222874354600000000000000000000000000203-7958222-8743546000124070224 +0750000002001353905000000000000000000000000000000000000039992357666110200000000000000000000000000206-8686357-6661102000124090224 +0750000002001353905000000000000000000000000000000000000025982407372432100000000000000000000000000205-6469407-3724321000124090224 +0750000002001353905000000000000000000000000000000000000026662333289316700000000000000000000000000206-8719333-2893167000124120224 +0750000002001353905000000000000000000000000000000000000025982922534832500000000000000000000000000204-0598922-5348325000124120224 +0750000002001353905000000000000000000000000000000000000018322417762191800000000000000000000000000203-9923417-7621918000124120224 +0750000002001353905000000000000000000000000000000000000018292340281311400000000000000000000000000202-0492340-2813114000124120224 +0750000002001353905000000000000000000000000000000000000019952340281311400000000000000000000000000202-0492340-2813114000124120224 +0750000002001353905000000000000000000000000000000000000017452340281311400000000000000000000000000202-0492340-2813114000124120224 +0750000002001353905000000000000000000000000000000000000017452340281311400000000000000000000000000202-0492340-2813114000124120224 +0750000002001353905000000000000000000000000000000000000017452340281311400000000000000000000000000202-0492340-2813114000124120224 +0750000002001353905000000000000000000000000000000000000056992077172516200000000000000000000000000204-8450077-1725162000124120224 +07500000020013539050000000000000000000000000000000000002482010000000000000000000000000000000000000000000000000000000000124140224 +0750000002001353905000000000000000000000000000000000000022082453719793000000000000000000000000000205-7408453-7197930000124140224 +0750000002001353905000000000000000000000000000000000000026662523725955900000000000000000000000000206-1556523-7259559000124140224 +0750000002001353905000000000000000000000000000000000000021992872559153700000000000000000000000000202-5835872-5591537000124140224 +0750000002001353905000000000000000000000000000000000000087005335455156000000000000000000000000000206-8216335-4551560000124150224 +0750000002001353905000000000000000000000000000000000000015832242604511900000000000000000000000000026-7385242-6045119000124160224 +0750000002001353905000000000000000000000000000000000000018982739634192800000000000000000000000000204-6405739-6341928000124160224 +0750000002001353905000000000000000000000000000000000000026662173151312800000000000000000000000000202-3155173-1513128000124160224 +0750000002001353905000000000000000000000000000000000000020792052615394000000000000000000000000000204-9000052-6153940000124190224 +0750000002001353905000000000000000000000000000000000000021642551953231800000000000000000000000000203-2503551-9532318000124190224 +0750000002001353905000000000000000000000000000000000000019982208390514000000000000000000000000000026-8253208-3905140000124210224 +0750000002001353905000000000000000000000000000000000000020822678347630200000000000000000000000000206-2028678-3476302000124210224 +0750000002001353905000000000000000000000000000000000000026662111761074700000000000000000000000000204-8586111-7610747000124210224 +0750000002001353905000000000000000000000000000000000000043982804791716000000000000000000000000000205-6653804-7917160000124210224 +0750000002001353905000000000000000000000000000000000000014982326648595900000000000000000000000000202-4540326-6485959000124230224 +0750000002001353905000000000000000000000000000000000000025985922534832500000000000000000000000000204-0598922-5348325000124230224 +0750000002001353905000000000000000000000000000000000000022492867936194100000000000000000000000000204-8425867-9361941000124260224 +0750000002001353905000000000000000000000000000000000000016642978566111900000000000000000000000000026-7826978-5661119000124260224 +0750000002001353905000000000000000000000000000000000000019172744016511900000000000000000000000000205-1521744-0165119000124260224 +07500000020013539050000000000000000000000000000000000002888210000000000000000000000000000000000000000000000000000000000124280224 +0750000002001353905000000000000000000000000000000000000055822382287870800000000000000000000000000205-7867382-2878708000124280224 +0750000002001353905000000000000000000000000000000000000028982530402755000000000000000000000000000204-7990530-4027550000124280224 +0750000002001353905000000000000000000000000000000000000043322461650113600000000000000000000000000204-4786461-6501136000124280224 +0750000002001353905000000000000000000000000000000000000017502138236995900000000000000000000000000206-1344138-2369959000124280224 \ No newline at end of file diff --git a/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.cs b/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.cs index 5a4520c..9e418ac 100644 --- a/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.cs +++ b/Mapp.BusinessLogic.Transactions.Tests/IntegrationTests.cs @@ -73,6 +73,12 @@ public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonFR() await IntegrationTestBase("AmazonFR"); } + [Fact] + public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonGB() + { + await IntegrationTestBase("AmazonGB"); + } + [Fact] public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonIT() { @@ -115,20 +121,12 @@ public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonSG() await IntegrationTestBase("AmazonSG"); } - [Fact] - public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonUK() - { - await IntegrationTestBase("AmazonUK"); - } - [Fact] public async Task ConvertTransactions_ParsesAndConvertsTransactions_AmazonUS() { await IntegrationTestBase("AmazonUS"); } - - [Fact] [Bug] public async Task ConvertTransactions_ParsesAndConvertsTransactions_ZerosBug() diff --git a/Mapp.BusinessLogic.Transactions.Tests/TestData/AmazonUK.csv b/Mapp.BusinessLogic.Transactions.Tests/TestData/AmazonGB.csv similarity index 100% rename from Mapp.BusinessLogic.Transactions.Tests/TestData/AmazonUK.csv rename to Mapp.BusinessLogic.Transactions.Tests/TestData/AmazonGB.csv diff --git a/Mapp.BusinessLogic.Transactions.Tests/TransactionsReaderTest.cs b/Mapp.BusinessLogic.Transactions.Tests/TransactionsReaderTest.cs index d98bdd1..ec3212e 100644 --- a/Mapp.BusinessLogic.Transactions.Tests/TransactionsReaderTest.cs +++ b/Mapp.BusinessLogic.Transactions.Tests/TransactionsReaderTest.cs @@ -1,4 +1,8 @@ -using Xunit; +using System; +using System.Diagnostics; +using System.Globalization; +using System.Threading; +using Xunit; namespace Mapp.Business { @@ -70,13 +74,16 @@ public void Read_Given_Returns() //} //[Fact] - //public void ParseFrDate() + //public void ParseMxDate() //{ - // var reader = new TransactionsReader(new JsonManager()); - - // var result = reader.ParseDate("2 déc. 2019 08:04:58 UTC+00:00", @"(.*) UTC", new CultureInfo("fr-FR")); - - // Assert.Equal(new DateTime(2019, 12, 2, 8, 4, 58), result); + // Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo(""); + // //var result = DateTime.Parse("2 déc. 2019 08:04:58", new CultureInfo("")); + // //var result2 = DateTime.Parse("12 févr. 2024 07:52:56", new CultureInfo("es-MX")); + // //var result = DateTime.Parse("8 feb 2024 23:25:40 GMT-8", new CultureInfo("")); + // var result2 = DateTime.Parse("8 feb 2024 23:25:40", new CultureInfo("es-MX")); + + // Debugger.Break(); + // //Assert.Equal(new DateTime(2019, 12, 2, 8, 4, 58), result); //} //[Fact] diff --git a/Mapp.DataAccess/ICultureDependentValueParser.cs b/Mapp.DataAccess/ICultureDependentValueParser.cs new file mode 100644 index 0000000..6ae7461 --- /dev/null +++ b/Mapp.DataAccess/ICultureDependentValueParser.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mapp.DataAccess +{ + public interface IValueParser + { + decimal ParseDecimal(string value); + DateTime ParseDateTime(string value); + } + + public class CultureDependentValueParser : IValueParser + { + public CultureInfo CultureInfo { get; } + + public CultureDependentValueParser(CultureInfo cultureInfo) + { + CultureInfo = cultureInfo; + } + + public DateTime ParseDateTime(string value) + { + return DateTime.Parse(value, CultureInfo); + } + + public decimal ParseDecimal(string value) + { + return decimal.Parse(value, CultureInfo); + } + } +} diff --git a/Mapp.UI/Mapp.UI.csproj b/Mapp.UI/Mapp.UI.csproj index d958c7c..12ecdbe 100644 --- a/Mapp.UI/Mapp.UI.csproj +++ b/Mapp.UI/Mapp.UI.csproj @@ -7,7 +7,7 @@ Assets\icon.ico false Mapp - Mapp.UI + Mapp en false false diff --git a/Mapp.UI/Transactions Configs/TransactionsConfigAmazonBE.json b/Mapp.UI/Transactions Configs/TransactionsConfigAmazonBE.json index b916719..eeb6225 100644 --- a/Mapp.UI/Transactions Configs/TransactionsConfigAmazonBE.json +++ b/Mapp.UI/Transactions Configs/TransactionsConfigAmazonBE.json @@ -1,6 +1,6 @@ { "LinesToSkipBeforeColumnNames": 7, - "MarketPlaceId": 8, + "MarketPlaceId": 15, "DistinctionPhrases": [ "Tous les montants sont en EUR, sauf indication contraire" ], "DateSubstring": "(.*) (UTC|GMT).*", "TimeSeparatorOverride": null, diff --git a/Mapp.UI/Views/MainWindow.xaml b/Mapp.UI/Views/MainWindow.xaml index 367d580..192c5f2 100644 --- a/Mapp.UI/Views/MainWindow.xaml +++ b/Mapp.UI/Views/MainWindow.xaml @@ -15,7 +15,7 @@ lex:LocalizeDictionary.DesignCulture="en" lex:LocalizeDictionary.OutputMissingKeys="True" - lex:ResxLocalizationProvider.DefaultAssembly="Mapp.UI" + lex:ResxLocalizationProvider.DefaultAssembly="Mapp" lex:ResxLocalizationProvider.DefaultDictionary="LocalizationStrings"> diff --git a/Mapp.UI/Views/TransactionsConverterView.xaml b/Mapp.UI/Views/TransactionsConverterView.xaml index c4b9491..3d4da75 100644 --- a/Mapp.UI/Views/TransactionsConverterView.xaml +++ b/Mapp.UI/Views/TransactionsConverterView.xaml @@ -6,8 +6,6 @@ xmlns:local="clr-namespace:Mapp.UI.Views" xmlns:lex="http://wpflocalizeextension.codeplex.com" mc:Ignorable="d" - lex:ResxLocalizationProvider.DefaultAssembly="Mapp.UI" - lex:ResxLocalizationProvider.DefaultDictionary="LocalizationStrings" d:DesignHeight="450" d:DesignWidth="800">