Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix: Give cancel confirmation dialogs distinct button labels (V-3625) (#14619)

Damian Legawiecf74c50f39b1d
diff --git a/packages/dashboard/src/components/spree/order-post-sale-cards.tsx b/packages/dashboard/src/components/spree/order-post-sale-cards.tsx
index 69f640d367..217b98d1f6 100644
--- a/packages/dashboard/src/components/spree/order-post-sale-cards.tsx
+++ b/packages/dashboard/src/components/spree/order-post-sale-cards.tsx
@@ -140,7 +140,12 @@ export function OrderExchangesCard({ order }: { order: Order }) {
await confirm({
message: t('admin.pages.orders.detail.returns.confirm.cancel'),
variant: 'destructive',
- confirmLabel: t('admin.actions.cancel'),
+ confirmLabel: t(
+ 'admin.pages.orders.detail.exchanges.confirm.cancel_confirm',
+ ),
+ cancelLabel: t(
+ 'admin.pages.orders.detail.exchanges.confirm.cancel_dismiss',
+ ),
})
) {
cancel.mutate({ exchangeId: exchange.id })
@@ -297,7 +302,12 @@ export function OrderClaimsCard({ order }: { order: Order }) {
await confirm({
message: t('admin.pages.orders.detail.returns.confirm.cancel'),
variant: 'destructive',
- confirmLabel: t('admin.actions.cancel'),
+ confirmLabel: t(
+ 'admin.pages.orders.detail.claims.confirm.cancel_confirm',
+ ),
+ cancelLabel: t(
+ 'admin.pages.orders.detail.claims.confirm.cancel_dismiss',
+ ),
})
) {
cancel.mutate({ claimId: claim.id })
diff --git a/packages/dashboard/src/components/spree/order-returns-card.tsx b/packages/dashboard/src/components/spree/order-returns-card.tsx
index 3a83f519ab..aced6656b9 100644
--- a/packages/dashboard/src/components/spree/order-returns-card.tsx
+++ b/packages/dashboard/src/components/spree/order-returns-card.tsx
@@ -148,7 +148,12 @@ export function OrderReturnsCard({ order }: { order: Order }) {
await confirm({
message: t('admin.pages.orders.detail.returns.confirm.cancel'),
variant: 'destructive',
- confirmLabel: t('admin.actions.cancel'),
+ confirmLabel: t(
+ 'admin.pages.orders.detail.returns.confirm.cancel_confirm',
+ ),
+ cancelLabel: t(
+ 'admin.pages.orders.detail.returns.confirm.cancel_dismiss',
+ ),
})
) {
cancel.mutate({ returnId: returnRecord.id })
diff --git a/packages/dashboard/src/components/spree/orders/fulfillments-card.tsx b/packages/dashboard/src/components/spree/orders/fulfillments-card.tsx
index 540ecd16ee..0bf9315491 100644
--- a/packages/dashboard/src/components/spree/orders/fulfillments-card.tsx
+++ b/packages/dashboard/src/components/spree/orders/fulfillments-card.tsx
@@ -524,7 +524,8 @@ function FulfillmentRow({ order, fulfillment }: { order: Order; fulfillment: Ful
await confirm({
message: t('admin.orders.detail.confirm.cancel_shipment_message'),
variant: 'destructive',
- confirmLabel: t('admin.actions.cancel'),
+ confirmLabel: t('admin.orders.detail.confirm.cancel_shipment_confirm'),
+ cancelLabel: t('admin.orders.detail.confirm.cancel_shipment_dismiss'),
})
) {
cancel.mutate(fulfillment.id)
diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.json
index 38a01b8d92..bfe35590bb 100644
--- a/packages/dashboard/src/locales/ar.json
+++ b/packages/dashboard/src/locales/ar.json
@@ -2738,6 +2738,8 @@
"confirm": {
"approve_message": "هل توافق على هذا الطلب؟",
"cancel_message": "هل أنت متأكد أنك تريد إلغاء هذا الطلب؟",
+ "cancel_shipment_confirm": "إلغاء الوفاء",
+ "cancel_shipment_dismiss": "الإبقاء على الوفاء",
"cancel_shipment_message": "إلغاء هذا الوفاء؟",
"capture_message": "القبض على هذه الدفعة؟",
"complete_message": "هل تريد إكمال مسودة الطلب هذه الآن؟",
@@ -3203,6 +3205,8 @@
"resolve_replacement": "الحل بالاستبدال"
},
"confirm": {
+ "cancel_confirm": "إلغاء المطالبة",
+ "cancel_dismiss": "الإبقاء على المطالبة",
"deny": "هل تريد رفض هذه المطالبة؟ لن يحصل العميل على استرداد أو استبدال."
},
"create_title": "مطالبة جديدة",
@@ -3230,6 +3234,10 @@
"create": "استبدال جديد",
"fulfill": "شحن البديل"
},
+ "confirm": {
+ "cancel_confirm": "إلغاء الاستبدال",
+ "cancel_dismiss": "الإبقاء على الاستبدال"
+ },
"create_title": "استبدال جديد",
"empty": "لا توجد استبدالات لهذا الطلب.",
"price_difference": "فرق السعر",
@@ -3246,7 +3254,9 @@
"buy_label": "شراء ملصق إرجاع",
"buy_label_confirm": "شراء ملصق إرجاع مدفوع مسبقًا؟ سيُخصم من حساب شركة الشحن فور إصداره.",
"confirm": {
- "cancel": "إلغاء هذا المرتجع؟ لن تتم إعادة أي مخزون ولن يتم تحويل أي مبلغ."
+ "cancel": "إلغاء هذا المرتجع؟ لن تتم إعادة أي مخزون ولن يتم تحويل أي مبلغ.",
+ "cancel_confirm": "إلغاء المرتجع",
+ "cancel_dismiss": "الإبقاء على المرتجع"
},
"create_title": "مرتجع جديد",
"empty": "لا توجد مرتجعات لهذا الطلب.",
diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.json
index 6429ecff8a..8d20c5c4e8 100644
--- a/packages/dashboard/src/locales/de.json
+++ b/packages/dashboard/src/locales/de.json
@@ -2720,6 +2720,8 @@
"confirm": {
"approve_message": "Diesen Auftrag genehmigen?",
"cancel_message": "Möchten Sie diesen Auftrag wirklich stornieren?",
+ "cancel_shipment_confirm": "Lieferung stornieren",
+ "cancel_shipment_dismiss": "Lieferung behalten",
"cancel_shipment_message": "Diese Lieferung stornieren?",
"capture_message": "Diese Zahlung einziehen?",
"complete_message": "Diesen Auftragsentwurf jetzt abschließen?",
@@ -3186,6 +3188,8 @@
"resolve_replacement": "Mit Ersatz lösen"
},
"confirm": {
+ "cancel_confirm": "Reklamation stornieren",
+ "cancel_dismiss": "Reklamation behalten",
"deny": "Diese Reklamation ablehnen? Die Kundin oder der Kunde erhält weder eine Rückerstattung noch Ersatz."
},
"create_title": "Neue Reklamation",
@@ -3213,6 +3217,10 @@
"create": "Neuer Umtausch",
"fulfill": "Ersatz versenden"
},
+ "confirm": {
+ "cancel_confirm": "Umtausch stornieren",
+ "cancel_dismiss": "Umtausch behalten"
+ },
"create_title": "Neuer Umtausch",
"empty": "Kein Umtausch für diese Bestellung.",
"price_difference": "Preisdifferenz",
@@ -3229,7 +3237,9 @@
"buy_label": "Rücksendeetikett kaufen",
"buy_label_confirm": "Ein vorfrankiertes Rücksendeetikett kaufen? Ihr Konto wird belastet, sobald das Etikett ausgestellt ist.",
"confirm": {
- "cancel": "Diese Retoure stornieren? Es wird nichts eingelagert und kein Geld bewegt."
+ "cancel": "Diese Retoure stornieren? Es wird nichts eingelagert und kein Geld bewegt.",
+ "cancel_confirm": "Retoure stornieren",
+ "cancel_dismiss": "Retoure behalten"
},
"create_title": "Neue Retoure",
"empty": "Keine Retouren für diese Bestellung.",
diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.json
index 8f368f4355..920177ff14 100644
--- a/packages/dashboard/src/locales/en.json
+++ b/packages/dashboard/src/locales/en.json
@@ -2720,6 +2720,8 @@
"confirm": {
"approve_message": "Approve this order?",
"cancel_message": "Are you sure you want to cancel this order?",
+ "cancel_shipment_confirm": "Cancel fulfillment",
+ "cancel_shipment_dismiss": "Keep fulfillment",
"cancel_shipment_message": "Cancel this fulfillment?",
"capture_message": "Capture this payment?",
"complete_message": "Complete this draft order now?",
@@ -3186,6 +3188,8 @@
"resolve_replacement": "Resolve with replacement"
},
"confirm": {
+ "cancel_confirm": "Cancel claim",
+ "cancel_dismiss": "Keep claim",
"deny": "Deny this claim? The customer will not receive a refund or replacement."
},
"create_title": "New claim",
@@ -3213,6 +3217,10 @@
"create": "New exchange",
"fulfill": "Ship replacement"
},
+ "confirm": {
+ "cancel_confirm": "Cancel exchange",
+ "cancel_dismiss": "Keep exchange"
+ },
"create_title": "New exchange",
"empty": "No exchanges for this order.",
"price_difference": "Price difference",
@@ -3229,7 +3237,9 @@
"buy_label": "Buy return label",
"buy_label_confirm": "Buy a prepaid return label? Your carrier account is charged as soon as the label is issued.",
"confirm": {
- "cancel": "Cancel this return? Nothing will be restocked and no money will move."
+ "cancel": "Cancel this return? Nothing will be restocked and no money will move.",
+ "cancel_confirm": "Cancel return",
+ "cancel_dismiss": "Keep return"
},
"create_title": "New return",
"empty": "No returns for this order.",
diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.json
index 40b98b986b..68e1f45045 100644
--- a/packages/dashboard/src/locales/fr.json
+++ b/packages/dashboard/src/locales/fr.json
@@ -2720,6 +2720,8 @@
"confirm": {
"approve_message": "Approuver cette commande ?",
"cancel_message": "Voulez-vous vraiment annuler cette commande ?",
+ "cancel_shipment_confirm": "Annuler l'envoi",
+ "cancel_shipment_dismiss": "Conserver l'envoi",
"cancel_shipment_message": "Annuler cet envoi ?",
"capture_message": "Capturer ce paiement ?",
"complete_message": "Finaliser cette commande brouillon maintenant ?",
@@ -3186,6 +3188,8 @@
"resolve_replacement": "Résoudre par remplacement"
},
"confirm": {
+ "cancel_confirm": "Annuler la réclamation",
+ "cancel_dismiss": "Conserver la réclamation",
"deny": "Refuser cette réclamation ? Le client ne recevra ni remboursement ni remplacement."
},
"create_title": "Nouvelle réclamation",
@@ -3213,6 +3217,10 @@
"create": "Nouvel échange",
"fulfill": "Expédier le remplacement"
},
+ "confirm": {
+ "cancel_confirm": "Annuler l'échange",
+ "cancel_dismiss": "Conserver l'échange"
+ },
"create_title": "Nouvel échange",
"empty": "Aucun échange pour cette commande.",
"price_difference": "Différence de prix",
@@ -3229,7 +3237,9 @@
"buy_label": "Acheter une étiquette de retour",
"buy_label_confirm": "Acheter une étiquette de retour prépayée ? Votre compte transporteur est débité dès son émission.",
"confirm": {
- "cancel": "Annuler ce retour ? Aucun article ne sera remis en stock et aucun montant ne sera remboursé."
+ "cancel": "Annuler ce retour ? Aucun article ne sera remis en stock et aucun montant ne sera remboursé.",
+ "cancel_confirm": "Annuler le retour",
+ "cancel_dismiss": "Conserver le retour"
},
"create_title": "Nouveau retour",
"empty": "Aucun retour pour cette commande.",
diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.json
index bb368083fe..8976daf511 100644
--- a/packages/dashboard/src/locales/pl.json
+++ b/packages/dashboard/src/locales/pl.json
@@ -2744,6 +2744,8 @@
"confirm": {
"approve_message": "Zatwierdzić to zamówienie?",
"cancel_message": "Czy na pewno chcesz anulować to zamówienie?",
+ "cancel_shipment_confirm": "Anuluj realizację",
+ "cancel_shipment_dismiss": "Zachowaj realizację",
"cancel_shipment_message": "Anulować tę realizację?",
"capture_message": "Pobrać tę płatność?",
"complete_message": "Sfinalizować teraz to zamówienie robocze?",
@@ -3218,6 +3220,8 @@
"resolve_replacement": "Rozwiąż zamiennikiem"
},
"confirm": {
+ "cancel_confirm": "Anuluj reklamację",
+ "cancel_dismiss": "Zachowaj reklamację",
"deny": "Odrzucić to zgłoszenie? Klient nie otrzyma zwrotu pieniędzy ani wymiany."
},
"create_title": "Nowa reklamacja",
@@ -3245,6 +3249,10 @@
"create": "Nowa wymiana",
"fulfill": "Wyślij zamiennik"
},
+ "confirm": {
+ "cancel_confirm": "Anuluj wymianę",
+ "cancel_dismiss": "Zachowaj wymianę"
+ },
"create_title": "Nowa wymiana",
"empty": "Brak wymian dla tego zamówienia.",
"price_difference": "Różnica w cenie",
@@ -3261,7 +3269,9 @@
"buy_label": "Kup etykietę zwrotną",
"buy_label_confirm": "Kupić opłaconą etykietę zwrotną? Twoje konto zostanie obciążone w momencie jej wystawienia.",
"confirm": {
- "cancel": "Anulować ten zwrot? Nic nie wróci do magazynu i żadne pieniądze nie zostaną zwrócone."
+ "cancel": "Anulować ten zwrot? Nic nie wróci do magazynu i żadne pieniądze nie zostaną zwrócone.",
+ "cancel_confirm": "Anuluj zwrot",
+ "cancel_dismiss": "Zachowaj zwrot"
},
"create_title": "Nowy zwrot",
"empty": "Brak zwrotów dla tego zamówienia.",
diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.json
index fe3624fdc9..0a6a32321b 100644
--- a/packages/dashboard/src/locales/zh-CN.json
+++ b/packages/dashboard/src/locales/zh-CN.json
@@ -2713,6 +2713,8 @@
"confirm": {
"approve_message": "批准此订单吗?",
"cancel_message": "确定要取消此订单吗?",
+ "cancel_shipment_confirm": "取消履约单",
+ "cancel_shipment_dismiss": "保留履约单",
"cancel_shipment_message": "取消此履约单吗?",
"capture_message": "捕获此付款吗?",
"complete_message": "现在完成此草稿订单吗?",
@@ -3178,6 +3180,8 @@
"resolve_replacement": "以换货解决"
},
"confirm": {
+ "cancel_confirm": "取消索赔",
+ "cancel_dismiss": "保留索赔",
"deny": "拒绝此索赔?客户将不会收到退款或补发商品。"
},
"create_title": "新建索赔",
@@ -3205,6 +3209,10 @@
"create": "新建换货",
"fulfill": "寄出替换商品"
},
+ "confirm": {
+ "cancel_confirm": "取消换货",
+ "cancel_dismiss": "保留换货"
+ },
"create_title": "新建换货",
"empty": "此订单暂无换货。",
"price_difference": "差价",
@@ -3221,7 +3229,9 @@
"buy_label": "购买退货面单",
"buy_label_confirm": "购买预付退货面单?面单一经出具即从您的承运商账户扣款。",
"confirm": {
- "cancel": "取消此退货?不会恢复库存,也不会退款。"
+ "cancel": "取消此退货?不会恢复库存,也不会退款。",
+ "cancel_confirm": "取消退货",
+ "cancel_dismiss": "保留退货"
},
"create_title": "新建退货",
"empty": "此订单暂无退货。",