Skip to content

Add Order Management Support To login scratch Command #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cwarden merged 1 commit into from
Mar 20, 2026
Merged

Add Order Management Support To login scratch Command #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions command/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const (
ServiceCloud
ScvMultipartyAndConsult
ServiceCloudVoicePartnerTelephony
OrderManagement
)

var ScratchFeatureIds = map[ScratchFeature][]string{
Expand All @@ -57,6 +58,7 @@ var ScratchFeatureIds = map[ScratchFeature][]string{
ServiceCloud: {"ServiceCloud"},
ScvMultipartyAndConsult: {"ScvMultipartyAndConsult"},
ServiceCloudVoicePartnerTelephony: {"ServiceCloudVoicePartnerTelephony"},
OrderManagement: {"OrderManagement"},
}

type ScratchProduct enumflag.Flag
Expand Down Expand Up @@ -111,6 +113,8 @@ const (
EnableApexApprovalLockUnlock
PermsetsInFieldCreation
EnableLightningPreviewPref
EnableOrders
EnableEnhancedCommerceOrders
)

var ScratchSettingIds = map[ScratchSetting][]string{
Expand All @@ -121,6 +125,8 @@ var ScratchSettingIds = map[ScratchSetting][]string{
EnableApexApprovalLockUnlock: {"enableApexApprovalLockUnlock"},
PermsetsInFieldCreation: {"permsetsInFieldCreation"},
EnableLightningPreviewPref: {"enableLightningPreviewPref"},
EnableOrders: {"enableOrders"},
EnableEnhancedCommerceOrders: {"enableEnhancedCommerceOrders"},
}

type ScratchRelease enumflag.Flag
Expand Down Expand Up @@ -216,6 +222,7 @@ Available Features:
HealthCloudAddOn - Enables Health Cloud add-on
HealthCloudUser - Enables Health Cloud user licenses
InsightsPlatform - Enables Insights Platform
OrderManagement - Enables Salesforce Order Management
PersonAccounts - Enables Person Accounts (B2C account model)
ScvMultipartyAndConsult - Enables Service Cloud Voice multiparty and consult (requires quantity, default: 10)
ServiceCloud - Enables Service Cloud
Expand All @@ -224,7 +231,7 @@ Available Features:
WavePlatform - Enables Wave Platform (CRM Analytics)

Available Products:
b2bcommerce - B2B Commerce (enables B2BCommerce feature and commerceEnabled setting)
b2bcommerce - B2B Commerce (enables B2BCommerce, OrderManagement features and commerceEnabled, enableOrders, enableEnhancedCommerceOrders settings)
communities - Experience Cloud (enables Communities feature and networksEnabled setting)
crmanalytics - CRM Analytics (enables AnalyticsAdminPerms, WavePlatform, InsightsPlatform, EinsteinAnalyticsPlus, EinsteinBuilderFree, DevelopmentWave)
fsc - Financial Services Cloud (enables PersonAccounts, ContactsToMultipleAccounts, FinancialServicesUser)
Expand All @@ -248,6 +255,8 @@ Available Settings (deployed after org creation):
enableApexApprovalLockUnlock - Allow Apex to lock/unlock approval processes
permsetsInFieldCreation - Allow assigning permission sets during field creation
enableLightningPreviewPref - Enable Lightning Experience preview pref
enableOrders - Enable Orders
enableEnhancedCommerceOrders - Enable Enhanced Commerce Orders

Available Releases:
preview - Create scratch org on the next (preview) release
Expand Down Expand Up @@ -338,7 +347,7 @@ func expandProductsToFeatures(products []ScratchProduct, features []ScratchFeatu
CommunitiesProduct: {Communities},
HealthCloudProduct: {HealthCloudAddOn, HealthCloudUser},
CRMAnalyticsProduct: {AnalyticsAdminPerms, WavePlatform, InsightsPlatform, EinsteinAnalyticsPlus, EinsteinBuilderFree, DevelopmentWave},
B2BCommerceProduct: {B2BCommerce},
B2BCommerceProduct: {B2BCommerce, OrderManagement},
}

featureSet := make(map[ScratchFeature]bool)
Expand Down Expand Up @@ -382,7 +391,7 @@ func convertSettingsToStrings(settings []ScratchSetting) []string {
func expandProductsToSettings(products []ScratchProduct, settings []ScratchSetting) []string {
productSettings := map[ScratchProduct][]ScratchSetting{
CommunitiesProduct: {NetworksEnabled},
B2BCommerceProduct: {CommerceEnabled},
B2BCommerceProduct: {CommerceEnabled, EnableOrders, EnableEnhancedCommerceOrders},
}

settingSet := make(map[ScratchSetting]bool)
Expand Down
36 changes: 28 additions & 8 deletions command/login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,18 @@ func TestExpandProductsToFeatures_CommunitiesProduct(t *testing.T) {

func TestExpandProductsToFeatures_B2BCommerceProduct(t *testing.T) {
result := expandProductsToFeatures([]ScratchProduct{B2BCommerceProduct}, []ScratchFeature{}, map[string]string{})
if len(result) != 1 {
t.Errorf("Expected 1 feature from b2bcommerce product, got %d", len(result))
if len(result) != 2 {
t.Errorf("Expected 2 features from b2bcommerce product, got %d", len(result))
}
if result[0] != "B2BCommerce" {
t.Errorf("Expected B2BCommerce, got %s", result[0])
featureMap := make(map[string]bool)
for _, f := range result {
featureMap[f] = true
}
if !featureMap["B2BCommerce"] {
t.Error("Expected B2BCommerce in b2bcommerce product")
}
if !featureMap["OrderManagement"] {
t.Error("Expected OrderManagement in b2bcommerce product")
}
}

Expand Down Expand Up @@ -248,11 +255,21 @@ func TestExpandProductsToSettings_CommunitiesProduct(t *testing.T) {

func TestExpandProductsToSettings_B2BCommerceProduct(t *testing.T) {
result := expandProductsToSettings([]ScratchProduct{B2BCommerceProduct}, []ScratchSetting{})
if len(result) != 1 {
t.Errorf("Expected 1 setting from b2bcommerce product, got %d", len(result))
if len(result) != 3 {
t.Errorf("Expected 3 settings from b2bcommerce product, got %d", len(result))
}
if result[0] != "commerceEnabled" {
t.Errorf("Expected commerceEnabled, got %s", result[0])
settingMap := make(map[string]bool)
for _, s := range result {
settingMap[s] = true
}
if !settingMap["commerceEnabled"] {
t.Error("Expected commerceEnabled in b2bcommerce product")
}
if !settingMap["enableOrders"] {
t.Error("Expected enableOrders in b2bcommerce product")
}
if !settingMap["enableEnhancedCommerceOrders"] {
t.Error("Expected enableEnhancedCommerceOrders in b2bcommerce product")
}
}

Expand Down Expand Up @@ -326,6 +343,7 @@ func TestScratchFeatureIds_AllFeaturesDefined(t *testing.T) {
"HealthCloudAddOn": true,
"HealthCloudUser": true,
"InsightsPlatform": true,
"OrderManagement": true,
"PersonAccounts": true,
"ScvMultipartyAndConsult": true,
"ServiceCloud": true,
Expand Down Expand Up @@ -436,6 +454,8 @@ func TestScratchSettingIds_AllSettingsDefined(t *testing.T) {
"enableApexApprovalLockUnlock": true,
"permsetsInFieldCreation": true,
"enableLightningPreviewPref": true,
"enableOrders": true,
"enableEnhancedCommerceOrders": true,
}

if len(ScratchSettingIds) != len(expectedSettings) {
Expand Down
5 changes: 4 additions & 1 deletion docs/force_login_scratch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Available Features:
HealthCloudAddOn - Enables Health Cloud add-on
HealthCloudUser - Enables Health Cloud user licenses
InsightsPlatform - Enables Insights Platform
OrderManagement - Enables Salesforce Order Management
PersonAccounts - Enables Person Accounts (B2C account model)
ScvMultipartyAndConsult - Enables Service Cloud Voice multiparty and consult (requires quantity, default: 10)
ServiceCloud - Enables Service Cloud
Expand All @@ -28,7 +29,7 @@ Available Features:
WavePlatform - Enables Wave Platform (CRM Analytics)

Available Products:
b2bcommerce - B2B Commerce (enables B2BCommerce feature and commerceEnabled setting)
b2bcommerce - B2B Commerce (enables B2BCommerce, OrderManagement features and commerceEnabled, enableOrders, enableEnhancedCommerceOrders settings)
communities - Experience Cloud (enables Communities feature and networksEnabled setting)
crmanalytics - CRM Analytics (enables AnalyticsAdminPerms, WavePlatform, InsightsPlatform, EinsteinAnalyticsPlus, EinsteinBuilderFree, DevelopmentWave)
fsc - Financial Services Cloud (enables PersonAccounts, ContactsToMultipleAccounts, FinancialServicesUser)
Expand All @@ -52,6 +53,8 @@ Available Settings (deployed after org creation):
enableApexApprovalLockUnlock - Allow Apex to lock/unlock approval processes
permsetsInFieldCreation - Allow assigning permission sets during field creation
enableLightningPreviewPref - Enable Lightning Experience preview pref
enableOrders - Enable Orders
enableEnhancedCommerceOrders - Enable Enhanced Commerce Orders

Available Releases:
preview - Create scratch org on the next (preview) release
Expand Down
13 changes: 13 additions & 0 deletions lib/scratch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ func buildSettingsMetadata(settings []string) ForceMetadataFiles {
userManagementSettings := false
lightningExperienceSettings := false
commerceSettings := false
orderSettings := false

for _, setting := range settings {
switch setting {
Expand All @@ -231,6 +232,8 @@ func buildSettingsMetadata(settings []string) ForceMetadataFiles {
files["unpackaged/settings/Communities.settings"] = []byte(communitiesSettings)
case "commerceEnabled":
commerceSettings = true
case "enableOrders", "enableEnhancedCommerceOrders":
orderSettings = true
case "enableApexApprovalLockUnlock":
apexSettings = true
case "permsetsInFieldCreation":
Expand Down Expand Up @@ -276,6 +279,16 @@ func buildSettingsMetadata(settings []string) ForceMetadataFiles {
files["unpackaged/settings/Commerce.settings"] = commerceBuffer.Bytes()
}

if orderSettings {
var orderBuffer bytes.Buffer
orderBuffer.WriteString(`<?xml version="1.0" encoding="UTF-8"?>
<OrderSettings xmlns="http://soap.sforce.com/2006/04/metadata">
<enableOrders>true</enableOrders>
<enableEnhancedCommerceOrders>true</enableEnhancedCommerceOrders>
</OrderSettings>`)
files["unpackaged/settings/Order.settings"] = orderBuffer.Bytes()
}

return files
}

Expand Down
41 changes: 41 additions & 0 deletions lib/scratch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,47 @@ func TestBuildSettingsMetadata_ExcludesCommerceSettingsWhenUnused(t *testing.T)
}
}

func TestBuildSettingsMetadata_AddsOrderSettings_for_enableOrders(t *testing.T) {
files := buildSettingsMetadata([]string{"enableOrders"})

content, ok := files["unpackaged/settings/Order.settings"]
if !ok {
t.Fatalf("Order.settings not generated")
}
if !strings.Contains(string(content), "<enableOrders>true</enableOrders>") {
t.Errorf("Order.settings missing enableOrders preference:\n%s", content)
}
if !strings.Contains(string(content), "<enableEnhancedCommerceOrders>true</enableEnhancedCommerceOrders>") {
t.Errorf("Order.settings missing enableEnhancedCommerceOrders preference:\n%s", content)
}
if !strings.Contains(string(content), "<OrderSettings ") {
t.Errorf("Order.settings missing OrderSettings metadata type:\n%s", content)
}
}

func TestBuildSettingsMetadata_AddsOrderSettings_for_enableEnhancedCommerceOrders(t *testing.T) {
files := buildSettingsMetadata([]string{"enableEnhancedCommerceOrders"})

content, ok := files["unpackaged/settings/Order.settings"]
if !ok {
t.Fatalf("Order.settings not generated")
}
if !strings.Contains(string(content), "<enableOrders>true</enableOrders>") {
t.Errorf("Order.settings missing enableOrders preference:\n%s", content)
}
if !strings.Contains(string(content), "<enableEnhancedCommerceOrders>true</enableEnhancedCommerceOrders>") {
t.Errorf("Order.settings missing enableEnhancedCommerceOrders preference:\n%s", content)
}
}

func TestBuildSettingsMetadata_ExcludesOrderSettingsWhenUnused(t *testing.T) {
files := buildSettingsMetadata([]string{"enableEnhancedNotes"})

if _, ok := files["unpackaged/settings/Order.settings"]; ok {
t.Fatalf("Order.settings should not be generated when not requested")
}
}

func TestGetScratchOrg_returns_error_when_SignupUsername_is_nil(t *testing.T) {
f := &Force{}
f.Credentials = &ForceSession{}
Expand Down
Loading