diff --git a/app/controllers/spree/admin/adjustments_controller.rb b/app/controllers/spree/admin/adjustments_controller.rb index 2712b5858f..f4fccde7ca 100644 --- a/app/controllers/spree/admin/adjustments_controller.rb +++ b/app/controllers/spree/admin/adjustments_controller.rb @@ -30,6 +30,9 @@ module Spree end def skip_changing_canceled_orders + return unless @order.canceled? + + flash[:error] = t("admin.adjustments.skipped_changing_canceled_order") redirect_to admin_order_adjustments_path(@order) if @order.canceled? end diff --git a/config/locales/en.yml b/config/locales/en.yml index a110afc92e..cbd249e33a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -366,6 +366,8 @@ en: rename: "Rename" admin: + adjustments: + skipped_changing_canceled_order: "You can't change a cancelled order." # Common properties / models begins_at: Begins At begins_on: Begins On