Shopify Connector Tax ID, Multiple Company Locations, Tax ID export, Company Mapping by Tax ID, Payment Terms Export/Import, Company External ID

Apps/W1/Shopify/app/src/Base/Pages/ShpfyShopCard.Page.al

@@ -410,6 +410,11 @@ page 30101 "Shpfy Shop Card"
                     ApplicationArea = All;
                     ToolTip = 'Specifies how to map companies.';
                 }
+                field("Shpfy Comp.Tax Id Mapping"; Rec."Shpfy Comp. Tax Id Mapping")
+                {
+                    ApplicationArea = All;
+                    ToolTip = 'Specifies how to map Shopify Tax ID with Business Central.';
+                }
                 field("Auto Create Unknown Companies"; Rec."Auto Create Unknown Companies")
                 {
                     ApplicationArea = All;

Apps/W1/Shopify/app/src/Base/Tables/ShpfyShop.Table.al

@@ -793,6 +793,11 @@ table 30102 "Shpfy Shop"
             Caption = 'Weight Unit';
             DataClassification = CustomerContent;
         }
+        field(130; "Shpfy Comp. Tax Id Mapping"; Enum "Shpfy Comp. Tax Id Mapping")
+        {
+            Caption = 'Company Tax Id Mapping';
+            DataClassification = CustomerContent;
+        }
         field(200; "Shop Id"; Integer)
         {
             DataClassification = SystemMetadata;

Apps/W1/Shopify/app/src/Catalogs/Codeunits/ShpfyCatalogAPI.Codeunit.al

@@ -1,6 +1,7 @@
 namespace Microsoft.Integration.Shopify;
 
 using Microsoft.Finance.GeneralLedger.Setup;
+using Microsoft.Sales.Customer;
 
 /// <summary>
 /// Codeunit Shpfy Catalog API (ID 30290).
@@ -15,7 +16,7 @@ codeunit 30290 "Shpfy Catalog API"
         JsonHelper: Codeunit "Shpfy Json Helper";
         ShopifyCatalogURLLbl: Label 'https://admin.shopify.com/store/%1/catalogs/%2/editor', Comment = '%1 - Shop Name, %2 - Catalog Id', Locked = true;
 
-    internal procedure CreateCatalog(ShopifyCompany: Record "Shpfy Company")
+    internal procedure CreateCatalog(ShopifyCompany: Record "Shpfy Company"; Customer: Record Customer)
     var
         Catalog: Record "Shpfy Catalog";
         GraphQLType: Enum "Shpfy GraphQL Type";
@@ -32,6 +33,7 @@ codeunit 30290 "Shpfy Catalog API"
             Catalog."Shop Code" := Shop.Code;
             Catalog.Name := ShopifyCompany.Name;
             Catalog."Company SystemId" := ShopifyCompany.SystemId;
+            Catalog."Customer No." := Customer."No.";
             Catalog.Insert();
             CreatePublication(Catalog);
             CreatePriceList(Catalog);

Apps/W1/Shopify/app/src/Catalogs/Pages/ShpfyCatalogs.Page.al

@@ -28,7 +28,7 @@ page 30159 "Shpfy Catalogs"
                 field("Customer No."; Rec."Customer No.")
                 {
                     ApplicationArea = All;
-                    Visible = false;
+                    Editable = false;
                     ToolTip = 'Specifies the customer''s no.  When Customer No. is Selected: Parameters like ''Customer Discount Group'', ''Customer Price Group'', and ''Allow Line Discount'' on the customer card take precedence over catalog settings';
                 }
                 field(Name; Rec.Name)

Apps/W1/Shopify/app/src/Companies/Codeunits/ShpfyCompByDefaultComp.Codeunit.al

@@ -1,9 +1,11 @@
 namespace Microsoft.Integration.Shopify;
 
+using Microsoft.Sales.Customer;
+
 /// <summary>
 /// Codeunit Shpfy Comp. By Default Comp. (ID 30305) implements Interface Shpfy ICompany Mapping.
 /// </summary>
-codeunit 30305 "Shpfy Comp. By Default Comp." implements "Shpfy ICompany Mapping"
+codeunit 30305 "Shpfy Comp. By Default Comp." implements "Shpfy ICompany Mapping", "Shpfy IFind Company Mapping"
 {
     Access = Internal;
 
@@ -15,4 +17,35 @@ codeunit 30305 "Shpfy Comp. By Default Comp." implements "Shpfy ICompany Mapping
         Shop.Get(ShopCode);
         exit(Shop."Default Company No.");
     end;
+
+    internal procedure FindMapping(var ShopifyCompany: Record "Shpfy Company"; var TempShopifyCustomer: Record "Shpfy Customer" temporary): Boolean
+    var
+        Customer: Record Customer;
+        ShopifyCustomer: Record "Shpfy Customer";
+    begin
+        if not IsNullGuid(ShopifyCompany."Customer SystemId") then
+            if Customer.GetBySystemId(ShopifyCompany."Customer SystemId") then
+                exit(true)
+            else begin
+                Clear(ShopifyCompany."Customer SystemId");
+                ShopifyCompany.Modify(true);
+            end;
+
+        if IsNullGuid(ShopifyCompany."Customer SystemId") then begin
+            Shop.Get(ShopifyCompany."Shop Code");
+            if Customer.Get(Shop."Default Company No.") then begin
+                ShopifyCompany."Customer SystemId" := Customer.SystemId;
+
+                if not ShopifyCustomer.Get(TempShopifyCustomer.Id) then begin
+                    ShopifyCustomer.Copy(TempShopifyCustomer);
+                    ShopifyCustomer."Customer SystemId" := Customer.SystemId;
+                    ShopifyCustomer.Insert(true);
+                end;
+
+                ShopifyCompany."Main Contact Customer Id" := ShopifyCustomer.Id;
+                ShopifyCompany.Modify(true);
+                exit(true);
+            end;
+        end;
+    end;
 }

Apps/W1/Shopify/app/src/Companies/Codeunits/ShpfyCompByEmailPhone.Codeunit.al

@@ -1,30 +1,51 @@
 namespace Microsoft.Integration.Shopify;
 
+using Microsoft.Sales.Customer;
+
 /// <summary>
 /// Codeunit ShoShpfypify Comp. By Email/Phone (ID 30304) implements Interface Shpfy ICompany Mapping.
 /// </summary>
-codeunit 30304 "Shpfy Comp. By Email/Phone" implements "Shpfy ICompany Mapping"
+codeunit 30304 "Shpfy Comp. By Email/Phone" implements "Shpfy ICompany Mapping", "Shpfy IFind Company Mapping"
 {
     Access = Internal;
 
     internal procedure DoMapping(CompanyId: BigInteger; ShopCode: Code[20]; TemplateCode: Code[20]; AllowCreate: Boolean): Code[20]
     var
         ShopifyCompany: Record "Shpfy Company";
     begin
-        ShopifyCompany.SetAutoCalcFields("Customer No.");
         if ShopifyCompany.Get(CompanyId) then begin
             if not IsNullGuid(ShopifyCompany."Customer SystemId") then begin
                 ShopifyCompany.CalcFields("Customer No.");
                 if ShopifyCompany."Customer No." = '' then begin
                     Clear(ShopifyCompany."Customer SystemId");
-                    ShopifyCompany.Modify();
+                    ShopifyCompany.Modify(true);
                 end else
                     exit(ShopifyCompany."Customer No.");
             end;
             exit(CreateCompany(CompanyId, ShopCode, TemplateCode, AllowCreate));
         end else
             exit(CreateCompany(CompanyId, ShopCode, TemplateCode, AllowCreate));
-        exit('');
+    end;
+
+    internal procedure FindMapping(var ShopifyCompany: Record "Shpfy Company"; var TempShopifyCustomer: Record "Shpfy Customer" temporary): Boolean
+    var
+        Customer: Record Customer;
+    begin
+        if not IsNullGuid(ShopifyCompany."Customer SystemId") then
+            if Customer.GetBySystemId(ShopifyCompany."Customer SystemId") then
+                exit(true)
+            else begin
+                Clear(ShopifyCompany."Customer SystemId");
+                ShopifyCompany.Modify(true);
+            end;
+
+        if IsNullGuid(ShopifyCompany."Customer SystemId") then begin
+            if TempShopifyCustomer.Email <> '' then
+                exit(FindByEmail(ShopifyCompany, TempShopifyCustomer));
+
+            if TempShopifyCustomer."Phone No." <> '' then
+                exit(FindByPhoneNo(ShopifyCompany, TempShopifyCustomer));
+        end;
     end;
 
     local procedure CreateCompany(CompanyId: BigInteger; ShopCode: Code[20]; TemplateCode: Code[20]; AllowCreate: Boolean): Code[20]
@@ -37,11 +58,61 @@ codeunit 30304 "Shpfy Comp. By Email/Phone" implements "Shpfy ICompany Mapping"
         CompanyImport.SetAllowCreate(AllowCreate);
         CompanyImport.SetTemplateCode(TemplateCode);
         TempCompany.Id := CompanyId;
-        TempCompany.Insert();
+        TempCompany.Insert(false);
+
         CompanyImport.Run(TempCompany);
         CompanyImport.GetCompany(ShopifyCompany);
         if ShopifyCompany.Find() then
             ShopifyCompany.CalcFields("Customer No.");
+
         exit(ShopifyCompany."Customer No.");
     end;
+
+    local procedure FindByEmail(var ShopifyCompany: Record "Shpfy Company"; TempShopifyCustomer: Record "Shpfy Customer" temporary): Boolean
+    var
+        Customer: Record Customer;
+        ShopifyCustomer: Record "Shpfy Customer";
+    begin
+        Customer.SetFilter("E-Mail", '@' + TempShopifyCustomer.Email);
+        if Customer.FindFirst() then begin
+            ShopifyCompany."Customer SystemId" := Customer.SystemId;
+
+            if not ShopifyCustomer.Get(TempShopifyCustomer.Id) then begin
+                ShopifyCustomer.Copy(TempShopifyCustomer);
+                ShopifyCustomer."Customer SystemId" := Customer.SystemId;
+                ShopifyCustomer.Insert(true);
+            end;
+
+            ShopifyCompany."Main Contact Customer Id" := ShopifyCustomer.Id;
+            ShopifyCompany.Modify(true);
+            exit(true);
+        end;
+    end;
+
+    local procedure FindByPhoneNo(var ShopifyCompany: Record "Shpfy Company"; TempShopifyCustomer: Record "Shpfy Customer" temporary): Boolean
+    var
+        Customer: Record Customer;
+        ShopifyCustomer: Record "Shpfy Customer";
+        CustomerMapping: Codeunit "Shpfy Customer Mapping";
+        PhoneFilter: Text;
+    begin
+        PhoneFilter := CustomerMapping.CreatePhoneFilter(TempShopifyCustomer."Phone No.");
+        if PhoneFilter <> '' then begin
+            Clear(Customer);
+            Customer.SetFilter("Phone No.", PhoneFilter);
+            if Customer.FindFirst() then begin
+                ShopifyCompany."Customer SystemId" := Customer.SystemId;
+
+                if not ShopifyCustomer.Get(TempShopifyCustomer.Id) then begin
+                    ShopifyCustomer.Copy(TempShopifyCustomer);
+                    ShopifyCustomer."Customer SystemId" := Customer.SystemId;
+                    ShopifyCustomer.Insert(true);
+                end;
+
+                ShopifyCompany."Main Contact Customer Id" := ShopifyCustomer.Id;
+                ShopifyCompany.Modify(true);
+                exit(true);
+            end;
+        end;
+    end;
 }

Apps/W1/Shopify/app/src/Companies/Codeunits/ShpfyCompByTaxId.Codeunit.al

@@ -0,0 +1,96 @@
+namespace Microsoft.Integration.Shopify;
+
+using Microsoft.Sales.Customer;
+
+/// <summary>
+/// Codeunit Shpfy Comp. By Tax Id (ID 30366) implements Interface Shpfy ICompany Mapping.
+/// </summary>
+codeunit 30366 "Shpfy Comp. By Tax Id" implements "Shpfy ICompany Mapping", "Shpfy IFind Company Mapping"
+{
+    Access = Internal;
+
+    internal procedure DoMapping(CompanyId: BigInteger; ShopCode: Code[20]; TemplateCode: Code[20]; AllowCreate: Boolean): Code[20]
+    var
+        ShopifyCompany: Record "Shpfy Company";
+    begin
+        if ShopifyCompany.Get(CompanyId) then begin
+            if not IsNullGuid(ShopifyCompany."Customer SystemId") then begin
+                ShopifyCompany.CalcFields("Customer No.");
+                if ShopifyCompany."Customer No." = '' then begin
+                    Clear(ShopifyCompany."Customer SystemId");
+                    ShopifyCompany.Modify(true);
+                end else
+                    exit(ShopifyCompany."Customer No.");
+            end;
+            exit(CreateCompany(CompanyId, ShopCode, TemplateCode, AllowCreate));
+        end else
+            exit(CreateCompany(CompanyId, ShopCode, TemplateCode, AllowCreate));
+    end;
+
+    internal procedure FindMapping(var ShopifyCompany: Record "Shpfy Company"; var TempShopifyCustomer: Record "Shpfy Customer" temporary): Boolean
+    var
+        Customer: Record Customer;
+        CompanyLocation: Record "Shpfy Company Location";
+    begin
+        if not IsNullGuid(ShopifyCompany."Customer SystemId") then
+            if Customer.GetBySystemId(ShopifyCompany."Customer SystemId") then
+                exit(true)
+            else begin
+                Clear(ShopifyCompany."Customer SystemId");
+                ShopifyCompany.Modify(true);
+            end;
+
+        if IsNullGuid(ShopifyCompany."Customer SystemId") then
+            if ShopifyCompany."Location Id" <> 0 then begin
+                CompanyLocation.Get(ShopifyCompany."Location Id");
+                if CompanyLocation."Tax Registration Id" <> '' then
+                    exit(FindByTaxRegistrationId(ShopifyCompany, TempShopifyCustomer, CompanyLocation));
+            end;
+    end;
+
+    local procedure CreateCompany(CompanyId: BigInteger; ShopCode: Code[20]; TemplateCode: Code[20]; AllowCreate: Boolean): Code[20]
+    var
+        ShopifyCompany: Record "Shpfy Company";
+        TempShopifyCompany: Record "Shpfy Company" temporary;
+        CompanyImport: Codeunit "Shpfy Company Import";
+    begin
+        CompanyImport.SetShop(ShopCode);
+        CompanyImport.SetAllowCreate(AllowCreate);
+        CompanyImport.SetTemplateCode(TemplateCode);
+        TempShopifyCompany.Id := CompanyId;
+        TempShopifyCompany.Insert(false);
+
+        CompanyImport.Run(TempShopifyCompany);
+        CompanyImport.GetCompany(ShopifyCompany);
+        if ShopifyCompany.Find() then
+            ShopifyCompany.CalcFields("Customer No.");
+
+        exit(ShopifyCompany."Customer No.");
+    end;
+
+    local procedure FindByTaxRegistrationId(var ShopifyCompany: Record "Shpfy Company"; var TempShopifyCustomer: Record "Shpfy Customer" temporary; CompanyLocation: Record "Shpfy Company Location"): Boolean
+    var
+        Customer: Record Customer;
+        ShopifyCustomer: Record "Shpfy Customer";
+        Shop: Record "Shpfy Shop";
+        TaxRegistrationIdMapping: Interface "Shpfy Tax Registration Id Mapping";
+    begin
+        Clear(Customer);
+        Shop.Get(ShopifyCompany."Shop Code");
+        TaxRegistrationIdMapping := Shop."Shpfy Comp. Tax Id Mapping";
+        TaxRegistrationIdMapping.SetMappingFiltersForCustomers(Customer, CompanyLocation);
+        if Customer.FindFirst() then begin
+            ShopifyCompany."Customer SystemId" := Customer.SystemId;
+
+            if not ShopifyCustomer.Get(TempShopifyCustomer.Id) then begin
+                ShopifyCustomer.Copy(TempShopifyCustomer);
+                ShopifyCustomer."Customer SystemId" := Customer.SystemId;
+                ShopifyCustomer.Insert(true);
+            end;
+
+            ShopifyCompany."Main Contact Customer Id" := ShopifyCustomer.Id;
+            ShopifyCompany.Modify(true);
+            exit(true);
+        end;
+    end;
+}