diff --git a/packages/admin-next/dashboard/src/i18n/translations/en.json b/packages/admin-next/dashboard/src/i18n/translations/en.json index 677113215a6fc..73ee70b077cf4 100644 --- a/packages/admin-next/dashboard/src/i18n/translations/en.json +++ b/packages/admin-next/dashboard/src/i18n/translations/en.json @@ -936,6 +936,9 @@ }, "promotions": { "domain": "Promotions", + "sections": { + "details": "Promotion Details" + }, "fields": { "method": "Method", "type": "Type", @@ -945,6 +948,9 @@ "allocation": "Allocation", "addCondition": "Add condition", "clearAll": "Clear all", + "amount": { + "tooltip": "Select the currency code to enable setting the amount" + }, "conditions": { "rules": { "title": "Who can use this code?", @@ -979,6 +985,9 @@ "addToCampaign": { "title": "Add Promotion To Campaign" }, + "campaign_currency": { + "tooltip": "Currency is carried over from the promotion. Change it on the promotions tab." + }, "form": { "required": "Required", "and": "AND", @@ -1085,7 +1094,10 @@ "end_date": "End date", "total_spend": "Budget spent", "total_used": "Budget used", - "budget_limit": "Budget limit" + "budget_limit": "Budget limit", + "campaign_id": { + "hint": "A list of campaigns with the same currency code as the promotion" + } }, "budget": { "create": { @@ -1116,6 +1128,8 @@ "description": "You are about to remove {{count}} promotion(s) from the campaign. This action cannot be undone." }, "alreadyAdded": "This promotion has already been added to the campaign.", + "alreadyAddedDiffCampaign": "This promotion has already been added to a different campaign ({{name}}).", + "currencyMismatch": "Currency of the promotion and campaign doesn't match", "toast": { "success": "Successfully added {{count}} promotion(s) to campaign" } diff --git a/packages/medusa/src/api/admin/promotions/utils/rule-attributes-map.ts b/packages/medusa/src/api/admin/promotions/utils/rule-attributes-map.ts index a8f0812e911d1..362a5355caded 100644 --- a/packages/medusa/src/api/admin/promotions/utils/rule-attributes-map.ts +++ b/packages/medusa/src/api/admin/promotions/utils/rule-attributes-map.ts @@ -28,7 +28,7 @@ const ruleAttributes = [ }, { id: "customer_group", - value: "customer_group.id", + value: "customer.groups.id", label: "Customer Group", required: false, field_type: "multiselect", @@ -49,7 +49,7 @@ const ruleAttributes = [ }, { id: "sales_channel", - value: "sales_channel.id", + value: "sales_channel_id", label: "Sales Channel", required: false, field_type: "multiselect",