[27.x][Backport] [Event Request] [Subscription Billing] table 8063 "Vendor Subscription Contract" internal procedure CreateVendorContractLineFromServiceCommitment

.github/AL-Go-Settings.json

@@ -6,7 +6,7 @@
   "runs-on": "windows-2025",
   "cacheImageName": "",
   "UsePsSession": false,
-  "artifact": "https://bcinsider-fvh2ekdjecfjd6gk.b02.azurefd.net/sandbox/27.0.38415.0/base",
+  "artifact": "bcartifacts/Sandbox/27.0//latest",
   "country": "base",
   "useProjectDependencies": true,
   "repoVersion": "27.0",
@@ -21,7 +21,8 @@
           "CLEAN24",
           "CLEAN25",
           "CLEAN26",
-          "CLEAN27"
+          "CLEAN27",
+          "CLEAN28"
         ]
       }
     },

build/Packages.json

@@ -1,10 +1,10 @@
 {
   "Microsoft.Dynamics.BusinessCentral.Translations": {
-    "Version": "27.0.25230.2",
+    "Version": "27.0.25239.3",
     "Source": "NuGet.org"
   },
   "AppBaselines-BCArtifacts": {
-    "Version": "26.5.38258.0",
+    "Version": "26.5.38752.44128",
     "Source": "BCArtifacts",
     "_comment": "Used to fetch app baselines from BC artifacts"
   }

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

@@ -995,12 +995,11 @@ table 30102 "Shpfy Shop"
         JItem: JsonToken;
     begin
         CommunicationMgt.SetShop(Rec);
-        JResponse := CommunicationMgt.ExecuteGraphQL('{"query":"query { shop { name plan { displayName partnerDevelopment shopifyPlus } weightUnit } }"}');
+        JResponse := CommunicationMgt.ExecuteGraphQL('{"query":"query { shop { name plan { publicDisplayName partnerDevelopment shopifyPlus } weightUnit } }"}');
         if JResponse.SelectToken('$.data.shop.plan', JItem) then
             if JItem.IsObject then
-                Rec."B2B Enabled" := JsonHelper.GetValueAsBoolean(JItem, 'partnerDevelopment') or
-                                      JsonHelper.GetValueAsBoolean(JItem, 'shopifyPlus') or
-                                        (JsonHelper.GetValueAsText(JItem, 'displayName') = 'Plus Trial');
+                Rec."B2B Enabled" := JsonHelper.GetValueAsBoolean(JItem, 'shopifyPlus') or
+                                        (JsonHelper.GetValueAsText(JItem, 'publicDisplayName') in ['Plus Trial', 'Development']);
         Rec."Weight Unit" := ConvertToWeightUnit(JsonHelper.GetValueAsText(JResponse, 'data.shop.weightUnit'));
     end;
 

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

@@ -25,23 +25,24 @@ codeunit 30290 "Shpfy Catalog API"
         ShopifyMarketCatalogURLLbl: Label 'https://admin.shopify.com/store/%1/settings/markets/%2/pricing', Comment = '%1 - Shop Name, %2 - Market Catalog Id', Locked = true;
         ShopifyUnifiedMarketCatalogURLLbl: Label 'https://admin.shopify.com/store/%1/catalogs/%2/editor', Comment = '%1 - Shop Name, %2 - Catalog Id', Locked = true;
         CatalogNotFoundLbl: Label 'Catalog is not found.';
+        CurrencyMismatchLbl: Label 'Catalog currency does not match with Shopify. Reimport the catalog.';
 
-    internal procedure CreateCatalog(ShopifyCompany: Record "Shpfy Company"; Customer: Record Customer)
+    internal procedure CreateCatalog(LocationId: BigInteger; CatalogName: Text[500]; ShopifyCompany: Record "Shpfy Company"; Customer: Record Customer)
     var
         Catalog: Record "Shpfy Catalog";
         GraphQLType: Enum "Shpfy GraphQL Type";
         CatalogId: BigInteger;
         JResponse: JsonToken;
         Parameters: Dictionary of [Text, Text];
     begin
-        Parameters.Add('Title', ShopifyCompany.Name);
-        Parameters.Add('CompanyLocationId', Format(ShopifyCompany."Location Id"));
+        Parameters.Add('Title', CatalogName);
+        Parameters.Add('CompanyLocationId', Format(LocationId));
         JResponse := CommunicationMgt.ExecuteGraphQL(GraphQLType::CreateCatalog, Parameters);
         CatalogId := CommunicationMgt.GetIdOfGId(JsonHelper.GetValueAsText(JResponse, 'data.catalogCreate.catalog.id'));
         if CatalogId > 0 then begin
             Catalog.Id := CatalogId;
             Catalog."Shop Code" := Shop.Code;
-            Catalog.Name := ShopifyCompany.Name;
+            Catalog.Name := CatalogName;
             Catalog."Company SystemId" := ShopifyCompany.SystemId;
             Catalog."Customer No." := Customer."No.";
             Catalog."Catalog Type" := CatalogType::Company;
@@ -51,6 +52,11 @@ codeunit 30290 "Shpfy Catalog API"
         end;
     end;
 
+    internal procedure CreateCatalog(ShopifyCompany: Record "Shpfy Company"; Customer: Record Customer)
+    begin
+        CreateCatalog(ShopifyCompany."Location Id", ShopifyCompany.Name, ShopifyCompany, Customer);
+    end;
+
     internal procedure CreatePublication(var Catalog: Record "Shpfy Catalog")
     var
         GraphQLType: Enum "Shpfy GraphQL Type";
@@ -230,10 +236,12 @@ codeunit 30290 "Shpfy Catalog API"
     internal procedure ExtractShopifyCatalogs(var ShopifyCompany: Record "Shpfy Company"; JResponse: JsonObject; var Cursor: Text): Boolean
     var
         Catalog: Record "Shpfy Catalog";
+        ImportOrder: Codeunit "Shpfy Import Order";
         JCatalogs: JsonArray;
         JEdge: JsonToken;
         JNode: JsonObject;
         CatalogId: BigInteger;
+        CurrencyCode: Text;
     begin
         if not JsonHelper.GetJsonArray(JResponse, JCatalogs, 'data.catalogs.edges') then
             exit(false);
@@ -242,18 +250,19 @@ codeunit 30290 "Shpfy Catalog API"
             Cursor := JsonHelper.GetValueAsText(JEdge.AsObject(), 'cursor');
             if JsonHelper.GetJsonObject(JEdge.AsObject(), JNode, 'node') then begin
                 CatalogId := CommunicationMgt.GetIdOfGId(JsonHelper.GetValueAsText(JNode, 'id'));
+                CurrencyCode := JsonHelper.GetValueAsText(JNode, 'priceList.currency');
                 Catalog.SetRange(Id, CatalogId);
                 Catalog.SetRange("Company SystemId", ShopifyCompany.SystemId);
                 Catalog.SetRange("Catalog Type", "Shpfy Catalog Type"::Company);
                 if not Catalog.FindFirst() then begin
                     Catalog.Id := CatalogId;
                     Catalog."Company SystemId" := ShopifyCompany.SystemId;
-                    Catalog."Sync Prices" := false;
                     Catalog."Catalog Type" := "Shpfy Catalog Type"::Company;
                     Catalog.Insert(true);
                 end;
                 Catalog."Shop Code" := Shop.Code;
                 Catalog.Name := CopyStr(JsonHelper.GetValueAsText(JNode, 'title'), 1, MaxStrLen(Catalog.Name));
+                Catalog."Currency Code" := ImportOrder.TranslateCurrencyCode(CurrencyCode);
                 Catalog.Modify(true);
             end;
         end;
@@ -263,6 +272,7 @@ codeunit 30290 "Shpfy Catalog API"
     internal procedure ExtractShopifyMarketCatalogs(JResponse: JsonObject; var Cursor: Text): Boolean
     var
         Catalog: Record "Shpfy Catalog";
+        ImportOrder: Codeunit "Shpfy Import Order";
         JCatalogs: JsonArray;
         JEdge: JsonToken;
         JNode: JsonObject;
@@ -286,7 +296,7 @@ codeunit 30290 "Shpfy Catalog API"
                 end;
                 Catalog."Shop Code" := Shop.Code;
                 Catalog.Name := CopyStr(JsonHelper.GetValueAsText(JNode, 'title'), 1, MaxStrLen(Catalog.Name));
-                Catalog."Currency Code" := CopyStr(CurrencyCode, 1, MaxStrLen(Catalog."Currency Code"));
+                Catalog."Currency Code" := ImportOrder.TranslateCurrencyCode(CurrencyCode);
                 Catalog.Modify(true);
 
                 GetMarketsLinkedToCatalog(Catalog);
@@ -385,17 +395,25 @@ codeunit 30290 "Shpfy Catalog API"
 
     internal procedure ExtractShopifyCatalogProducts(var ProductList: List of [BigInteger]; JResponse: JsonObject; Catalog: Record "Shpfy Catalog"; var Cursor: Text): Boolean
     var
+        ImportOrder: Codeunit "Shpfy Import Order";
         JCatalogProducts: JsonArray;
         JEdge: JsonToken;
         JCatalog: JsonObject;
         JNode: JsonObject;
         ProductId: BigInteger;
+        CurrencyCode: Text;
     begin
         if not JsonHelper.GetJsonObject(JResponse, JCatalog, 'data.catalog') then begin
             SkippedRecord.LogSkippedRecord(Catalog.Id, Catalog.RecordId, CatalogNotFoundLbl, Shop);
             exit(false);
         end;
 
+        CurrencyCode := JsonHelper.GetValueAsText(JCatalog, 'priceList.currency');
+        if Catalog."Currency Code" <> ImportOrder.TranslateCurrencyCode(CurrencyCode) then begin
+            SkippedRecord.LogSkippedRecord(Catalog.Id, Catalog.RecordId, CurrencyMismatchLbl, Shop);
+            exit(false);
+        end;
+
         if JsonHelper.GetJsonArray(JCatalog, JCatalogProducts, 'publication.products.edges') then begin
             foreach JEdge in JCatalogProducts do begin
                 Cursor := JsonHelper.GetValueAsText(JEdge.AsObject(), 'cursor');

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

@@ -33,6 +33,10 @@ page 30159 "Shpfy Catalogs"
                     Editable = false;
                 }
                 field(SyncPrices; Rec."Sync Prices") { }
+                field("Currency Code"; Rec."Currency Code")
+                {
+                    Editable = false;
+                }
                 field(CustomerPriceGroup; Rec."Customer Price Group") { }
                 field(CustomerDiscountGroup; Rec."Customer Discount Group") { }
                 field("Prices Including VAT"; Rec."Prices Including VAT") { }

src/Apps/W1/Shopify/App/src/Catalogs/Pages/ShpfyMarketCatalogs.Page.al

@@ -27,8 +27,19 @@ page 30174 "Shpfy Market Catalogs"
                 field(Id; Rec.Id) { }
                 field(Name; Rec.Name) { }
                 field(SyncPrices; Rec."Sync Prices") { }
-                field("Customer No."; Rec."Customer No.") { }
-                field("Currency Code"; Rec."Currency Code") { }
+#if not CLEAN28
+                field("Customer No."; Rec."Customer No.")
+                {
+                    Visible = false;
+                    ObsoleteReason = 'Customer No. is not used for market catalogs.';
+                    ObsoleteState = Pending;
+                    ObsoleteTag = '28.0';
+                }
+#endif
+                field("Currency Code"; Rec."Currency Code")
+                {
+                    Editable = false;
+                }
                 field(CustomerPriceGroup; Rec."Customer Price Group") { }
                 field(CustomerDiscountGroup; Rec."Customer Discount Group") { }
                 field("Prices Including VAT"; Rec."Prices Including VAT") { }

src/Apps/W1/Shopify/App/src/Companies/Codeunits/ShpfyCompanyAPI.Codeunit.al

@@ -47,7 +47,7 @@ codeunit 30286 "Shpfy Company API"
                         CompanyContactRoles.Add(JsonHelper.GetValueAsText(JItem, 'node.name'), CommunicationMgt.GetIdOfGId(JsonHelper.GetValueAsText(JItem, 'node.id')));
             end;
         if ShopifyCompany.Id > 0 then begin
-            CompanyContactId := AssignCompanyMainContact(ShopifyCompany.Id, ShopifyCustomer.Id, ShopifyCompany."Location Id", CompanyContactRoles);
+            CompanyContactId := AssignCompanyContact(ShopifyCompany.Id, ShopifyCustomer.Id, ShopifyCompany."Location Id", CompanyContactRoles, true);
             ShopifyCompany."Main Contact Id" := CompanyContactId;
             exit(true);
         end else
@@ -156,7 +156,7 @@ codeunit 30286 "Shpfy Company API"
         exit(GraphQuery.ToText());
     end;
 
-    local procedure AssignCompanyMainContact(CompanyId: BigInteger; CustomerId: BigInteger; LocationId: BigInteger; CompanyContactRoles: Dictionary of [Text, BigInteger]): BigInteger
+    local procedure AssignCompanyContact(CompanyId: BigInteger; CustomerId: BigInteger; LocationId: BigInteger; CompanyContactRoles: Dictionary of [Text, BigInteger]; IsMainContact: Boolean): BigInteger
     var
         GraphQLType: Enum "Shpfy GraphQL Type";
         JResponse: JsonToken;
@@ -168,10 +168,12 @@ codeunit 30286 "Shpfy Company API"
         JResponse := CommunicationMgt.ExecuteGraphQL(GraphQLType::CompanyAssignCustomerAsContact, Parameters);
         CompanyContactId := CommunicationMgt.GetIdOfGId(JsonHelper.GetValueAsText(JResponse, 'data.companyAssignCustomerAsContact.companyContact.id'));
         if CompanyContactId > 0 then begin
-            Clear(Parameters);
-            Parameters.Add('CompanyId', Format(CompanyId));
-            Parameters.Add('CompanyContactId', Format(CompanyContactId));
-            JResponse := CommunicationMgt.ExecuteGraphQL(GraphQLType::CompanyAssignMainContact, Parameters);
+            if IsMainContact then begin
+                Clear(Parameters);
+                Parameters.Add('CompanyId', Format(CompanyId));
+                Parameters.Add('CompanyContactId', Format(CompanyContactId));
+                JResponse := CommunicationMgt.ExecuteGraphQL(GraphQLType::CompanyAssignMainContact, Parameters);
+            end;
             AssignCompanyContactRoles(CompanyContactId, LocationId, CompanyContactRoles);
         end;
         exit(CompanyContactId);
@@ -420,7 +422,9 @@ codeunit 30286 "Shpfy Company API"
     internal procedure CreateCompanyLocation(Customer: Record Customer)
     var
         ShopifyCompany: Record "Shpfy Company";
+        ShopifyCustomer: Record "Shpfy Customer";
         CompanyLocation: Record "Shpfy Company Location";
+        CompanyExport: Codeunit "Shpfy Company Export";
         SkippedRecord: Codeunit "Shpfy Skipped Record";
         CustomerAlreadyExportedCompanyLbl: Label 'Customer %1 is already exported as a company', Comment = '%1 = Customer No.';
         CustomerAlreadyExportedLocationLbl: Label 'Customer %1 is already exported as a location', Comment = '%1 = Customer No.';
@@ -436,7 +440,9 @@ codeunit 30286 "Shpfy Company API"
             SkippedRecord.LogSkippedRecord(Customer.RecordId, StrSubstNo(CustomerAlreadyExportedLocationLbl, Customer."No."), Shop);
             exit;
         end;
-        CreateCustomerAsCompanyLocation(Customer, this.Company);
+        CompanyExport.SetShop(Shop.Code);
+        if CompanyExport.CreateCompanyContact(Customer, ShopifyCustomer) then
+            CreateCustomerAsCompanyLocation(Customer, this.Company, ShopifyCustomer);
     end;
 
     internal procedure SetCompany(ShopifyCompany: Record "Shpfy Company")
@@ -448,8 +454,9 @@ codeunit 30286 "Shpfy Company API"
     /// Creates a customer as a company location in Shopify using GraphQL API.
     /// This procedure handles the API communication and error processing.
     /// </summary>
-    /// <param name="CompanyLocation">The Shopify company location record containing the data to be sent to Shopify.</param>
     /// <param name="Customer">The Business Central customer record used to populate additional fields.</param>
+    /// <param name="ShopifyCompany">The Shopify company record used to populate additional fields.</param>
+    /// <param name="ShopifyCustomer">The Shopify customer record used to populate additional fields.</param>
     /// <remarks>
     /// This procedure:
     /// - Fills the Shopify company location with data from the customer
@@ -461,13 +468,18 @@ codeunit 30286 "Shpfy Company API"
     /// The procedure supports both billing and shipping addresses, with billing address used for both when billingSameAsShipping is true.
     /// Error handling includes field-specific error messages from Shopify API.
     /// </remarks>
-    local procedure CreateCustomerAsCompanyLocation(Customer: Record Customer; ShopifyCompany: Record "Shpfy Company")
+    internal procedure CreateCustomerAsCompanyLocation(Customer: Record Customer; ShopifyCompany: Record "Shpfy Company"; ShopifyCustomer: Record "Shpfy Customer")
     var
         CompanyLocation: Record "Shpfy Company Location";
         CompanyExport: Codeunit "Shpfy Company Export";
+        CatalogAPI: Codeunit "Shpfy Catalog API";
         GraphQuery: TextBuilder;
         JResponse: JsonToken;
         JCompanyLocation: JsonToken;
+        JContactRoles: JsonArray;
+        JItem: JsonToken;
+        LocationId: BigInteger;
+        CompanyContactRoles: Dictionary of [Text, BigInteger];
         CompanyIdTxt: Label 'gid://shopify/Company/%1', Comment = '%1 = Company Id', Locked = true;
         PaymentTermsTemplateIdTxt: Label 'gid://shopify/PaymentTermsTemplate/%1', Comment = '%1 = Payment Terms Template Id', Locked = true;
     begin
@@ -476,8 +488,6 @@ codeunit 30286 "Shpfy Company API"
 
         GraphQuery.Append('{"query": "mutation { companyLocationCreate( companyId: \"' + StrSubstNo(CompanyIdTxt, ShopifyCompany.Id) + '\", input: {');
 
-        if ShopifyCompany."External Id" <> '' then
-            AddFieldToGraphQuery(GraphQuery, 'externalId', ShopifyCompany."External Id");
         if CompanyLocation.Name <> '' then
             AddFieldToGraphQuery(GraphQuery, 'name', CompanyLocation.Name);
         if CompanyLocation."Phone No." <> '' then
@@ -505,15 +515,23 @@ codeunit 30286 "Shpfy Company API"
         if CompanyLocation."Shpfy Payment Terms Id" <> 0 then
             AddFieldToGraphQuery(GraphQuery, 'paymentTermsTemplateId', StrSubstNo(PaymentTermsTemplateIdTxt, CompanyLocation."Shpfy Payment Terms Id"));
         GraphQuery.Remove(GraphQuery.Length - 1, 2);
-        GraphQuery.Append('}}) { companyLocation { id name billingAddress { address1 address2 city countryCode phone province recipient zip zoneCode } ');
+        GraphQuery.Append('}}) { companyLocation { id name company { contactRoles(first:10) {edges {node {id name}}}} billingAddress { address1 address2 city countryCode phone province recipient zip zoneCode } ');
         GraphQuery.Append('shippingAddress { address1 address2 city countryCode phone province recipient zip zoneCode } ');
         GraphQuery.Append('buyerExperienceConfiguration { paymentTermsTemplate { id } checkoutToDraft editableShippingAddress } taxRegistrationId taxExemptions } ');
         GraphQuery.Append('userErrors { field message } } }"}');
 
         JResponse := CommunicationMgt.ExecuteGraphQL(GraphQuery.ToText());
         if JResponse.SelectToken('$.data.companyLocationCreate.companyLocation', JCompanyLocation) then
-            if not JsonHelper.IsTokenNull(JCompanyLocation) then
-                CreateCustomerLocation(JCompanyLocation.AsObject(), ShopifyCompany, Customer.SystemId);
+            if not JsonHelper.IsTokenNull(JCompanyLocation) then begin
+                LocationId := CreateCustomerLocation(JCompanyLocation.AsObject(), ShopifyCompany, Customer.SystemId);
+                if JsonHelper.GetJsonArray(JCompanyLocation, JContactRoles, 'company.contactRoles.edges') then begin
+                    foreach JItem in JContactRoles do
+                        CompanyContactRoles.Add(JsonHelper.GetValueAsText(JItem, 'node.name'), CommunicationMgt.GetIdOfGId(JsonHelper.GetValueAsText(JItem, 'node.id')));
+                    AssignCompanyContact(ShopifyCompany.Id, ShopifyCustomer.Id, LocationId, CompanyContactRoles, false);
+                    if Shop."Auto Create Catalog" then
+                        CatalogAPI.CreateCatalog(LocationId, Customer.Name, ShopifyCompany, Customer);
+                end;
+            end;
     end;
 
     /// <summary>
@@ -534,7 +552,7 @@ codeunit 30286 "Shpfy Company API"
     /// The procedure assumes the JSON structure matches Shopify's companyLocationCreate response format.
     /// All text fields are properly truncated to match the field lengths in the table definition.
     /// </remarks>
-    local procedure CreateCustomerLocation(JCompanyLocation: JsonObject; ShopifyCompany: Record "Shpfy Company"; CustomerId: Guid)
+    local procedure CreateCustomerLocation(JCompanyLocation: JsonObject; ShopifyCompany: Record "Shpfy Company"; CustomerId: Guid): BigInteger
     var
         CompanyLocation: Record "Shpfy Company Location";
         CompanyLocationId: BigInteger;
@@ -564,6 +582,7 @@ codeunit 30286 "Shpfy Company API"
         CompanyLocation."Shpfy Payment Terms Id" := CommunicationMgt.GetIdOfGId(JsonHelper.GetValueAsText(JCompanyLocation, 'buyerExperienceConfiguration.paymentTermsTemplate.id'));
         CompanyLocation."Customer Id" := CustomerId;
         CompanyLocation.Modify(true);
+        exit(CompanyLocationId);
     end;
 
     local procedure ExtractShopifyCompanyLocations(var ShopifyCompany: Record "Shpfy Company"; JResponse: JsonObject; var Cursor: Text; var IsDefaultCompanyLocation: Boolean): Boolean