[Shopify] Remove B2B Plus-only plan restriction (#7605)

## Summary

Shopify [expanded B2B
features](https://changelog.shopify.com/posts/key-b2b-features-now-available-on-non-plus-plans)
to all plans (Basic, Grow, Advanced, Plus), not just Plus. The connector
currently restricts B2B to Plus plans only via the `B2B Enabled` field
on the Shop table.

This PR:
- **Obsoletes the `B2B Enabled` field** (117) with
`CLEAN29`/`CLEANSCHEMA32` guards — B2B features (companies, catalogs,
company sync, B2B orders) are now unconditionally available on all plans
- **Introduces `Staff Members Enabled` field** (207) — staff member
GraphQL queries still require Plus, Plus Trial, Development, or Advanced
plans, so this new field gates only staff-member-specific functionality
- **Adds upgrade code** using `DataTransfer` to migrate existing `B2B
Enabled = true` shops to `Staff Members Enabled = true`
- **Removes all consumer code** that checked `B2B Enabled` for B2B
features (ShopCard page visibility, Activities page filter,
ImportOrder/StaffMemberAPI guards)
- **Updates tests** to remove `B2B Enabled` assignments and update staff
visibility test

Fixes
[AB#630316](https://dynamicssmb2.visualstudio.com/1fcb79e7-ab07-432a-a3c6-6cf5a88ba4a5/_workitems/edit/630316)

## Changes by file

| File | Change |
|------|--------|
| `ShpfyShop.Table.al` | Obsolete field 117, add field 207, update
`GetShopSettings()` plan check (adds `Advanced`) |
| `ShpfyShopCard.Page.al` | Remove 6x `Visible = Rec."B2B Enabled"`,
unconditional company/catalog sync, gate StaffMembers on new field |
| `ShpfyActivities.Page.al` | Remove `B2BEnabled` variable and B2B shop
filter |
| `ShpfyImportOrder.Codeunit.al` | Gate `StaffMember` query parameter on
`Staff Members Enabled` instead of `B2B Enabled` |
| `ShpfyStaffMemberAPI.Codeunit.al` | Gate early exit on `Staff Members
Enabled` instead of `B2B Enabled` |
| `ShpfyUpgradeMgt.Codeunit.al` | Add `StaffMembersEnabledUpgrade()`
with `DataTransfer` (source filter + constant value) |
| 4 test files | Remove `B2B Enabled := true` setup, update staff
visibility test |

## How to review

1. **ShpfyShop.Table.al** — verify the obsolete field follows the
`CLEAN29`/`CLEANSCHEMA32` dual-state pattern (compare with field 206).
Verify `GetShopSettings()` now sets `Staff Members Enabled` for Plus,
Plus Trial, Development, and Advanced plans.
2. **ShpfyShopCard.Page.al** — verify all B2B visibility gates are
removed (companies, catalogs, market catalogs, sync companies, B2B
company sync group). Verify `StaffMembers` action is now gated on the
new `Staff Members Enabled` field. Verify the "Sync All" action now
always syncs companies and catalog prices.
3. **ShpfyUpgradeMgt.Codeunit.al** — verify upgrade uses
`AddSourceFilter` on `B2B Enabled = true` + `AddConstantValue(true)` to
`Staff Members Enabled`. Verify tag is registered in
`RegisterPerCompanyTags`.
4. **ShpfyImportOrder.Codeunit.al** /
**ShpfyStaffMemberAPI.Codeunit.al** — verify staff member gating now
uses `Staff Members Enabled` instead of `B2B Enabled`.
5. **Test files** — verify `B2B Enabled` assignments are removed and
staff test uses `Staff Members Enabled`.

## Testing scenarios

- Connect a Basic/Grow plan shop → B2B sections (companies, catalogs)
should be visible and functional
- Connect a Plus/Advanced plan shop → Staff Members action should be
visible, staff member import should work
- Connect a Basic plan shop → Staff Members action should NOT be visible
- Upgrade from previous version → shops that had `B2B Enabled = true`
should now have `Staff Members Enabled = true`

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: onbuyuka

src/Apps/W1/Shopify/App/.docs-updated

@@ -1,4 +1,4 @@
 # Documentation last updated
-commit: 40f9d4ce5f71b412b5dbfa8d17fd5150a13532ea
-date: 2026-03-24
+commit: 343aa21d1e5737d250aabf05cd9233d15c411cdc
+date: 2026-04-08
 scope: full

src/Apps/W1/Shopify/App/CLAUDE.md

@@ -9,7 +9,11 @@ The Shopify Connector bridges Shopify e-commerce with Business Central ERP, bi-d
 
 ## How it works
 
-The Shop table (`ShpfyShop.Table.al`, ID 30102) is the god object. Nearly every configuration setting lives there: sync directions for items/customers/companies, mapping strategies, customer/item template codes, G/L account mappings for shipping/tips/gift cards/refunds, B2B flags, currency handling, webhook settings, and fulfillment service configuration. A single BC company can connect to multiple Shopify shops (each with its own Shop Code), and each shop gets its own set of configuration.
+The Shop table (`ShpfyShop.Table.al`, ID 30102) is the god object. Nearly every configuration setting lives there: sync directions for items/customers/companies, mapping strategies, customer/item template codes, G/L account mappings for shipping/tips/gift cards/refunds, plan-based feature flags, currency handling, webhook settings, and fulfillment service configuration. A single BC company can connect to multiple Shopify shops (each with its own Shop Code), and each shop gets its own set of configuration.
+
+The `"Advanced Shopify Plan"` boolean field (207) on the Shop table gates features that require Plus, Plus Trial, Development, or Advanced plans. `GetShopSettings()` reads the Shopify plan and sets this flag automatically. B2B features (companies, catalogs, company sync) are now unconditionally available on all Shopify plans -- the old `"B2B Enabled"` field (117) has been obsoleted (CLEAN29/CLEANSCHEMA32 guards).
+
+*Updated: 2026-04-08 -- B2B Enabled obsoleted, Advanced Shopify Plan added*
 
 All Shopify API communication goes through GraphQL. The `ShpfyCommunicationMgt.Codeunit.al` is the single entry point for API calls. It constructs URLs using a versioned API path (currently `2026-01`), handles authentication, rate limiting, and retry logic. GraphQL queries are stored as `.graphql` resource files under `.resources/graphql/{Area}/`, loaded at runtime via `NavApp.GetResourceAsText()`. The `ShpfyGraphQLType` enum maps each query to its resource file using `{Area}_{QueryName}` naming, and the dispatcher loads the corresponding file instead of calling interface methods. The `ShpfyGraphQLRateLimit` codeunit (singleton) tracks Shopify's cost-based throttle -- it reads `restoreRate` and `currentlyAvailable` from responses and sleeps before issuing requests that would exceed the budget.
 
@@ -56,7 +60,7 @@ Records link to BC entities via SystemId (GUID), not Code/No. For example, `Shpf
 
 ## Things to know
 
-- The Shop table is the god object -- nearly every configuration setting lives there, with over 100 fields controlling sync directions, mapping strategies, account mappings, B2B flags, webhook config, and more.
+- The Shop table is the god object -- nearly every configuration setting lives there, with over 100 fields controlling sync directions, mapping strategies, account mappings, plan-based feature flags, webhook config, and more. The `"Advanced Shopify Plan"` field gates features requiring Plus/Advanced plans (currently staff members). B2B features are now unconditionally available on all plans.
 - All API calls go through GraphQL, never REST. Queries are `.graphql` resource files in `.resources/graphql/{Area}/`, loaded via `NavApp.GetResourceAsText()` and dispatched through the `ShpfyGraphQLType` enum.
 - Products use hash-based change detection (`"Image Hash"`, `"Tags Hash"`, `"Description Html Hash"`) via a custom hash algorithm to skip unnecessary API calls when nothing has changed.
 - Records link to BC entities via SystemId (GUID), not Code/No. -- FlowFields like `"Item No."` display the human-readable values via CalcFormula lookup. Renumbering BC items does not break Shopify links.

src/Apps/W1/Shopify/App/docs/business-logic.md

@@ -12,7 +12,9 @@ The export flow is driven by `ShpfyProductExport.Codeunit.al`. It iterates all S
 
 The update flow relies heavily on hash-based change detection. Before making any API call, the codeunit computes the current hash of the product's tags, HTML description, and images, then compares them against the stored hashes on the Product record. Only fields that have actually changed result in API calls. This is critical because Shopify's GraphQL API has per-store rate limits, and a full product catalog update without change detection would quickly exhaust the budget.
 
-Price sync can run independently of the full product sync via the `OnlyUpdatePrice` flag. When enabled, prices are batched into a bulk mutation (`ShpfyBulkUpdateProductPrice.Codeunit.al`) for efficiency. If the bulk operation fails, it falls back to individual variant price updates, reverting variant changes on failure.
+Price sync can run independently of the full product sync via the `OnlyUpdatePrice` flag. When enabled, prices are batched into a bulk mutation (`ShpfyBulkUpdateProductPrice.Codeunit.al`) for efficiency. If the bulk operation fails, it falls back to individual variant price updates, reverting variant changes on failure. Item price sync is skipped when the item's unit of measure is invalid, preventing errors from propagating into Shopify pricing data.
+
+*Updated: 2026-04-08 -- Price sync skipped for invalid unit of measure*
 
 The product body HTML is assembled from BC data by `CreateProductBody()` in the export codeunit -- it concatenates extended text, marketing text, and item attributes into an HTML structure. Events fire before and after this assembly (`OnBeforeCreateProductBodyHtml`, `OnAfterCreateProductBodyHtml`), allowing extensions to customize the output.
 
@@ -52,7 +54,9 @@ Order processing is the most complex flow in the connector. It spans multiple co
 
 ### Import
 
-`ShpfyImportOrder.Codeunit.al` takes an order from the staging table and creates the full Order Header and Order Lines. It parses the GraphQL response to populate all address blocks, financial fields (in both currencies), customer IDs, discount codes, attributes, tax lines, and risk assessments. The `OnAfterImportShopifyOrderHeader` and `OnAfterCreateShopifyOrderAndLines` events fire after import.
+`ShpfyImportOrder.Codeunit.al` takes an order from the staging table and creates the full Order Header and Order Lines. It parses the GraphQL response to populate all address blocks, financial fields (in both currencies), customer IDs, discount codes, attributes, tax lines, and risk assessments. Staff member handling during order import is gated by the Shop's `"Advanced Shopify Plan"` flag (true for Plus, Plus Trial, Development, and Advanced plans). The `OnAfterImportShopifyOrderHeader` and `OnAfterCreateShopifyOrderAndLines` events fire after import.
+
+*Updated: 2026-04-08 -- Staff member gating moved from B2B Enabled to Advanced Shopify Plan*
 
 ### Mapping
 
@@ -91,6 +95,10 @@ The `"Create Invoices From Orders"` setting causes fully-fulfilled orders to be
 
 Special line types require attention: gift card purchases map to the `"Sold Gift Card Account"` G/L account, tips map to `"Tip Account"`, and shipping charges map to `"Shipping Charges Account"`. These are all configured on the Shop record.
 
+The Shopify Order page includes contact lookup and validation, allowing users to verify and resolve customer contact information directly from the order.
+
+*Updated: 2026-04-08 -- Contact lookup/validation added to Shopify Order page*
+
 ## Fulfillment
 
 Fulfillment sync runs when BC sales shipments are posted. `ShpfyOrderFulfillments.Codeunit.al` creates fulfillment records in Shopify from the posted shipment data, including tracking numbers and carrier information.
@@ -136,3 +144,9 @@ Export to Shopify is handled by `ShpfyCustomerExport.Codeunit.al`. It creates or
 Company sync follows the same pattern but with `ShpfyCompanyImport.Codeunit.al` and `ShpfyCompanyExport.Codeunit.al`. Company mapping uses `ICompanyMapping` with strategies including By Email/Phone, By Tax ID, and Default Company. The B2B chain is: Company -> Company Location -> Customer (the location's main contact becomes the BC customer).
 
 When a B2B order arrives, the customer resolution differs from D2C: the connector looks up the company's main contact customer ID and the company location to determine the sell-to and ship-to customer numbers. This can result in different BC customers for different company locations of the same Shopify company.
+
+## Test infrastructure
+
+Test mocking uses the HttpClientHandler pattern rather than `IsTestInProgress` checks. Test codeunits inject a mock HTTP handler that intercepts Shopify API calls and returns canned responses, avoiding conditional test logic scattered through production code.
+
+*Updated: 2026-04-08 -- Test mocking migrated from IsTestInProgress to HttpClientHandler*

src/Apps/W1/Shopify/App/docs/data-model.md

@@ -8,6 +8,10 @@ The Shop table is the center of the configuration universe. Every sync operation
 
 Synchronization Info stores the last sync timestamp per shop and sync type (products, customers, orders, inventory, etc.). It is keyed on Shop Code + Synchronization Type. For order sync specifically, the key is the Shop's integer hash (`"Shop Id"`) rather than the Shop Code -- this allows multiple BC companies connected to the same Shopify store to share one order sync cursor without re-importing the same orders.
 
+The Shop table includes plan-based feature flags. The `"Advanced Shopify Plan"` field (207) is set to true for Plus, Plus Trial, Development, and Advanced plans, and currently gates staff member features. The old `"B2B Enabled"` field (117) has been obsoleted (CLEAN29/CLEANSCHEMA32 guards) -- B2B features are now unconditionally available on all plans.
+
+*Updated: 2026-04-08 -- B2B Enabled obsoleted, Advanced Shopify Plan added*
+
 Shop Location maps Shopify fulfillment locations to BC warehouse locations. Each mapping includes a stock calculation enum that determines how to compute available stock for that pairing.
 
 ```mermaid
@@ -131,11 +135,15 @@ erDiagram
     COMPANY }o--|| SHOP : belongs_to
 ```
 
-The B2B order flow differs from D2C: when an order has a `"Company Id"`, the connector uses the company mapping strategy instead of the customer mapping strategy, and it looks up the company location to determine the bill-to/ship-to customer.
+The B2B order flow differs from D2C: when an order has a `"Company Id"`, the connector uses the company mapping strategy instead of the customer mapping strategy, and it looks up the company location to determine the bill-to/ship-to customer. B2B features (companies, catalogs, company sync) are available on all Shopify plans -- they are no longer gated by a plan-specific flag.
+
+*Updated: 2026-04-08 -- B2B no longer gated by plan*
 
 ## Payments and transactions
 
-Order Transactions record the individual payment events on an order (authorization, capture, refund). They are imported from Shopify and store amounts, gateway names, and status.
+Order Transactions record the individual payment events on an order (authorization, capture, refund). They are imported from Shopify and store amounts, gateway names, and status. A `"Shop"` field links each transaction to its Shop record (populated via upgrade DataTransfer from Order Header).
+
+*Updated: 2026-04-08 -- Shop field added to OrderTransaction*
 
 Gift Cards have their own table because they serve dual roles: as a line item when purchased and as a payment instrument when redeemed.
 

src/Apps/W1/Shopify/App/src/Base/Codeunits/ShpfyUpgradeMgt.Codeunit.al

@@ -42,6 +42,7 @@ codeunit 30106 "Shpfy Upgrade Mgt."
         SetShopifyCatalogsType();
         CreateInvoicesFromOrdersUpgrade();
         OrderTransactionShopCodeUpgrade();
+        HasAdvancedShopifyPlanUpgrade();
     end;
 
     internal procedure UpgradeTemplatesData()
@@ -514,6 +515,24 @@ codeunit 30106 "Shpfy Upgrade Mgt."
         UpgradeTag.SetUpgradeTag(GetOrderTransactionShopCodeUpgradeTag());
     end;
 
+    local procedure HasAdvancedShopifyPlanUpgrade()
+    var
+        Shop: Record "Shpfy Shop";
+        UpgradeTag: Codeunit "Upgrade Tag";
+        ShopDataTransfer: DataTransfer;
+    begin
+        if UpgradeTag.HasUpgradeTag(GetHasAdvancedShopifyPlanUpgradeTag()) then
+            exit;
+
+        ShopDataTransfer.SetTables(Database::"Shpfy Shop", Database::"Shpfy Shop");
+        ShopDataTransfer.AddSourceFilter(Shop.FieldNo("B2B Enabled"), '=%1', true);
+        ShopDataTransfer.AddConstantValue(true, Shop.FieldNo("Advanced Shopify Plan"));
+        ShopDataTransfer.UpdateAuditFields := false;
+        ShopDataTransfer.CopyFields();
+
+        UpgradeTag.SetUpgradeTag(GetHasAdvancedShopifyPlanUpgradeTag());
+    end;
+
     internal procedure GetAllowOutgoingRequestseUpgradeTag(): Code[250]
     begin
         exit('MS-445989-AllowOutgoingRequestseUpgradeTag-20220816');
@@ -589,6 +608,11 @@ codeunit 30106 "Shpfy Upgrade Mgt."
         exit('MS-610671-OrderTransactionShopCodeUpgrade-20251022');
     end;
 
+    local procedure GetHasAdvancedShopifyPlanUpgradeTag(): Code[250]
+    begin
+        exit('MS-630316-HasAdvancedShopifyPlanUpgrade-20260408');
+    end;
+
     local procedure GetDateBeforeFeature(): DateTime
     begin
         exit(CreateDateTime(DMY2Date(1, 8, 2022), 0T));
@@ -608,5 +632,6 @@ codeunit 30106 "Shpfy Upgrade Mgt."
         PerCompanyUpgradeTags.Add(GetShopifyCatalogsTypeUpgradeTag());
         PerCompanyUpgradeTags.Add(GetCreateInvoicesFromOrdersUpgradeTag());
         PerCompanyUpgradeTags.Add(GetOrderTransactionShopCodeUpgradeTag());
+        PerCompanyUpgradeTags.Add(GetHasAdvancedShopifyPlanUpgradeTag());
     end;
 }

src/Apps/W1/Shopify/App/src/Base/Pages/ShpfyActivities.Page.al

@@ -38,7 +38,6 @@ page 30100 "Shpfy Activities"
                     ApplicationArea = All;
                     DrillDownPageId = "Shpfy Companies";
                     ToolTip = 'Specifies the number of imported companoes that aren''t mapped.';
-                    Visible = B2BEnabled;
                 }
                 field(UnmappedProducts; Rec."Unmapped Products")
                 {
@@ -154,10 +153,6 @@ page 30100 "Shpfy Activities"
                 Commit();
             end;
 
-        Shop.SetRange("B2B Enabled", true);
-        B2BEnabled := not Shop.IsEmpty();
-
-        Shop.Reset();
         Shop.SetRange(Enabled, true);
         if Shop.FindFirst() then begin
             ApiVersion := CommunicationMgt.GetApiVersion();
@@ -166,6 +161,4 @@ page 30100 "Shpfy Activities"
         end;
     end;
 
-    var
-        B2BEnabled: Boolean;
 }

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

@@ -352,7 +352,6 @@ page 30101 "Shpfy Shop Card"
             }
             group("B2B Company Synchronization")
             {
-                Visible = Rec."B2B Enabled";
                 field("Company Import From Shopify"; Rec."Company Import From Shopify")
                 {
                     ApplicationArea = All;
@@ -389,6 +388,7 @@ page 30101 "Shpfy Shop Card"
                 field("Auto Create Catalog"; Rec."Auto Create Catalog")
                 {
                     ApplicationArea = All;
+                    Visible = Rec."Advanced Shopify Plan";
                 }
                 field("Company Metafields To Shopify"; Rec."Company Metafields To Shopify")
                 {
@@ -745,7 +745,6 @@ page 30101 "Shpfy Shop Card"
                 RunObject = Page "Shpfy Companies";
                 RunPageLink = "Shop Id" = field("Shop Id");
                 ToolTip = 'Add, view or edit detailed information for the companies.';
-                Visible = Rec."B2B Enabled";
             }
             action(Catalogs)
             {
@@ -759,7 +758,7 @@ page 30101 "Shpfy Shop Card"
                 RunObject = Page "Shpfy Catalogs";
                 RunPageLink = "Shop Code" = field(Code);
                 ToolTip = 'View a list of Shopify B2B catalogs for the shop.';
-                Visible = Rec."B2B Enabled";
+                Visible = Rec."Advanced Shopify Plan";
             }
             action(MarketCatalogs)
             {
@@ -773,7 +772,6 @@ page 30101 "Shpfy Shop Card"
                 RunObject = Page "Shpfy Market Catalogs";
                 RunPageLink = "Shop Code" = field(Code);
                 ToolTip = 'View a list of Shopify market catalogs for the shop.';
-                Visible = Rec."B2B Enabled";
             }
             action(Languages)
             {
@@ -839,7 +837,7 @@ page 30101 "Shpfy Shop Card"
                 RunObject = Page "Shpfy Staff Mapping";
                 RunPageLink = "Shop Code" = field(Code);
                 ToolTip = 'View a list of Shopify Staff Members for the shop.';
-                Visible = Rec."B2B Enabled";
+                Visible = Rec."Advanced Shopify Plan";
             }
         }
         area(Processing)
@@ -1009,7 +1007,6 @@ page 30101 "Shpfy Shop Card"
                     PromotedCategory = Category5;
                     PromotedOnly = true;
                     ToolTip = 'Synchronize the companies with Shopify. The way companies are synchronized depends on the B2B settings in the Shopify Shop Card.';
-                    Visible = Rec."B2B Enabled";
 
                     trigger OnAction()
                     var
@@ -1126,10 +1123,8 @@ page 30101 "Shpfy Shop Card"
                         BackgroundSyncs.InventorySync(Rec);
                         BackgroundSyncs.ProductImagesSync(Rec, '');
                         BackgroundSyncs.ProductPricesSync(Rec);
-                        if Rec."B2B Enabled" then begin
-                            BackgroundSyncs.CompanySync(Rec);
-                            BackgroundSyncs.CatalogPricesSync(Rec, '', "Shpfy Catalog Type"::" ");
-                        end;
+                        BackgroundSyncs.CompanySync(Rec);
+                        BackgroundSyncs.CatalogPricesSync(Rec, '', "Shpfy Catalog Type"::" ");
                     end;
                 }
             }

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

@@ -717,11 +717,21 @@ table 30102 "Shpfy Shop"
             DataClassification = SystemMetadata;
             InitValue = true;
         }
+#if not CLEANSCHEMA32
         field(117; "B2B Enabled"; Boolean)
         {
             Caption = 'B2B Enabled';
             DataClassification = SystemMetadata;
+            ObsoleteReason = 'B2B features are now available on all Shopify plans.';
+#if CLEAN29
+            ObsoleteState = Removed;
+            ObsoleteTag = '32.0';
+#else
+            ObsoleteState = Pending;
+            ObsoleteTag = '29.0';
+#endif
         }
+#endif
         field(118; "Can Update Shopify Companies"; Boolean)
         {
             Caption = 'Can Update Shopify Companies';
@@ -928,6 +938,11 @@ table 30102 "Shpfy Shop"
 #endif
         }
 #endif
+        field(207; "Advanced Shopify Plan"; Boolean)
+        {
+            Caption = 'Advanced Shopify Plan';
+            DataClassification = SystemMetadata;
+        }
     }
 
     keys
@@ -1114,8 +1129,8 @@ table 30102 "Shpfy Shop"
         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, 'shopifyPlus') or
-                                        (JsonHelper.GetValueAsText(JItem, 'publicDisplayName') in ['Plus Trial', 'Development']);
+                Rec."Advanced Shopify Plan" := JsonHelper.GetValueAsBoolean(JItem, 'shopifyPlus') or
+                                                (JsonHelper.GetValueAsText(JItem, 'publicDisplayName') in ['Plus Trial', 'Development', 'Advanced']);
         Rec."Weight Unit" := ConvertToWeightUnit(JsonHelper.GetValueAsText(JResponse, 'data.shop.weightUnit'));
     end;