Skip to content

Commit 4a45f90

Browse files
GediminasGaubyspetemchlkJesperSchulz
authored
[Shopify] - Different Shipping Charges Types Tests (#27575)
This pull request does not have a related issue as it's part of the delivery for development agreed directly with @AndreiPanko Different shipping charges types Tests Automated tests for changes #26708 Fixes #26819 Fixes [AB#556525](https://dynamicssmb2.visualstudio.com/1fcb79e7-ab07-432a-a3c6-6cf5a88ba4a5/_workitems/edit/556525) --------- Co-authored-by: Piotr Michalak <[email protected]> Co-authored-by: Jesper Schulz-Wedde <[email protected]>
1 parent d311efd commit 4a45f90

File tree

3 files changed

+475
-7
lines changed

3 files changed

+475
-7
lines changed

Apps/W1/Shopify/app/src/Order handling/Codeunits/ShpfyProcessOrder.Codeunit.al

+7-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ codeunit 30166 "Shpfy Process Order"
5757
/// </summary>
5858
/// <param name="SalesHeader">Parameter of type Record "Sales Header".</param>
5959
/// <param name="ShopifyOrderHeader">Parameter of type Record "Shopify Order Header".</param>
60-
local procedure CreateHeaderFromShopifyOrder(var SalesHeader: Record "Sales Header"; ShopifyOrderHeader: Record "Shpfy Order Header")
60+
internal procedure CreateHeaderFromShopifyOrder(var SalesHeader: Record "Sales Header"; ShopifyOrderHeader: Record "Shpfy Order Header")
6161
var
6262
ShopifyTaxArea: Record "Shpfy Tax Area";
6363
DocLinkToBCDoc: Record "Shpfy Doc. Link To Doc.";
@@ -184,7 +184,7 @@ codeunit 30166 "Shpfy Process Order"
184184
/// </summary>
185185
/// <param name="SalesHeader">Parameter of type Record "Sales Header".</param>
186186
/// <param name="ShopifyOrderHeader">Parameter of type Record "Shopify Order Header".</param>
187-
local procedure CreateLinesFromShopifyOrder(var SalesHeader: Record "Sales Header"; ShopifyOrderHeader: Record "Shpfy Order Header")
187+
internal procedure CreateLinesFromShopifyOrder(var SalesHeader: Record "Sales Header"; ShopifyOrderHeader: Record "Shpfy Order Header")
188188
var
189189
Item: Record Item;
190190
SalesLine: Record "Sales Line";
@@ -432,6 +432,11 @@ codeunit 30166 "Shpfy Process Order"
432432
SalesHeader.Delete(true);
433433
end;
434434

435+
internal procedure SetShopifyShop(Shop: Record "Shpfy Shop")
436+
begin
437+
ShopifyShop := Shop;
438+
end;
439+
435440
[EventSubscriber(ObjectType::Codeunit, Codeunit::"Sales-Post", 'OnInsertShipmentHeaderOnAfterTransferfieldsToSalesShptHeader', '', false, false)]
436441
local procedure TransferShopifyOrderNoToShipmentHeader(SalesHeader: Record "Sales Header"; var SalesShptHeader: Record "Sales Shipment Header")
437442
begin

Apps/W1/Shopify/test/Base/ShpfyInitializeTest.Codeunit.al

+15-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ codeunit 139561 "Shpfy Initialize Test"
2525

2626
internal procedure CreateShop(): Record "Shpfy Shop"
2727
var
28-
GLAccount: Record "G/L Account";
2928
RefundGLAccount: Record "G/L Account";
3029
Shop: Record "Shpfy Shop";
3130
VATPostingSetup: Record "VAT Posting Setup";
@@ -43,8 +42,6 @@ codeunit 139561 "Shpfy Initialize Test"
4342
exit(Shop);
4443

4544
Code := Any.AlphabeticText(MaxStrLen(Code));
46-
GLAccount.SetRange("Direct Posting", true);
47-
GLAccount.FindLast();
4845

4946
LibraryERM.CreateVATPostingSetupWithAccounts(VATPostingSetup,
5047
VATPostingSetup."VAT Calculation Type"::"Normal VAT", LibraryRandom.RandDecInDecimalRange(10, 25, 0));
@@ -65,7 +62,7 @@ codeunit 139561 "Shpfy Initialize Test"
6562
CreateVATPostingSetup(PostingGroupCode, PostingGroupCode);
6663
CreateVATPostingSetup(PostingGroupCode, '');
6764
CreateVATPostingSetup(PostingGroupCode, RefundGLAccount."VAT Prod. Posting Group");
68-
Shop."Shipping Charges Account" := GLAccount."No.";
65+
Shop."Shipping Charges Account" := CreateShippingChargesGLAcc(VATPostingSetup, GenPostingType, PostingGroupCode);
6966
Shop."Customer Posting Group" := PostingGroupCode;
7067
Shop."Gen. Bus. Posting Group" := PostingGroupCode;
7168
Shop."VAT Bus. Posting Group" := PostingGroupCode;
@@ -353,7 +350,7 @@ codeunit 139561 "Shpfy Initialize Test"
353350
LibraryAssert.IsTrue(Values[1] = ShopifyAccessToken, 'invalid access token');
354351
end;
355352

356-
local procedure CreateVATPostingSetup(BusinessPostingGroup: Code[20]; ProductPostingGroup: Code[20])
353+
internal procedure CreateVATPostingSetup(BusinessPostingGroup: Code[20]; ProductPostingGroup: Code[20])
357354
var
358355
GeneralPostingSetup: Record "General Posting Setup";
359356
VatPostingSetup: Record "VAT Posting Setup";
@@ -376,4 +373,17 @@ codeunit 139561 "Shpfy Initialize Test"
376373
end;
377374
end;
378375

376+
local procedure CreateShippingChargesGLAcc(var VATPostingSetup: Record "VAT Posting Setup"; GenPostingType: Enum "General Posting Type"; PostingGroupCode: Code[20]): Code[20]
377+
var
378+
ShippingChargesGLAccount: Record "G/L Account";
379+
begin
380+
ShippingChargesGLAccount.Get(LibraryERM.CreateGLAccountWithVATPostingSetup(VATPostingSetup, GenPostingType::Sale));
381+
ShippingChargesGLAccount."Direct Posting" := true;
382+
ShippingChargesGLAccount.Modify(false);
383+
384+
CreateVATPostingSetup(PostingGroupCode, ShippingChargesGLAccount."VAT Prod. Posting Group");
385+
386+
exit(ShippingChargesGLAccount."No.");
387+
end;
388+
379389
}

0 commit comments

Comments
 (0)