diff --git a/app/assets/javascripts/admin/spree/orders/variant_autocomplete.js.erb b/app/assets/javascripts/admin/spree/orders/variant_autocomplete.js.erb index 175942b859..fa6480ab99 100644 --- a/app/assets/javascripts/admin/spree/orders/variant_autocomplete.js.erb +++ b/app/assets/javascripts/admin/spree/orders/variant_autocomplete.js.erb @@ -4,7 +4,8 @@ $(document).ready(function() { initAlert() initConfirm() - initCancelOrder() + initButtonCancel() + initLinkCancel() if ($('#variant_autocomplete_template').length > 0) { window.variantTemplate = Handlebars.compile($('#variant_autocomplete_template').text()); @@ -276,17 +277,23 @@ ofnConfirm = function(callback) { $('#custom-confirm').show(); } -initCancelOrder = function() { - $('#cancel_order_form').submit(function(e){ - ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) => { - if (confirm) { - var redirectTo = new URL(Spree.routes.cancel_order.toString()); - redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation); - redirectTo.searchParams.append("restock_items", restock_items); - window.location.href = redirectTo.toString(); - } - }); - e.preventDefault(); - return false; +initCancelAction = function(e){ + ofnCancelOrderAlert((confirm, sendEmailCancellation, restock_items) => { + if (confirm) { + var redirectTo = new URL(Spree.routes.cancel_order.toString()); + redirectTo.searchParams.append("send_cancellation_email", sendEmailCancellation); + redirectTo.searchParams.append("restock_items", restock_items); + window.location.href = redirectTo.toString(); + } }); + e.preventDefault(); + return false; +}; + +initButtonCancel = function() { + $('#cancel_order_form').submit(initCancelAction) +} + +initLinkCancel = function() { + $('#links-dropdown a[href$="cancel"]').click(initCancelAction); } diff --git a/app/helpers/spree/admin/orders_helper.rb b/app/helpers/spree/admin/orders_helper.rb index e38113528e..92e55fa008 100644 --- a/app/helpers/spree/admin/orders_helper.rb +++ b/app/helpers/spree/admin/orders_helper.rb @@ -105,8 +105,7 @@ module Spree def cancel_order_link { name: t(:cancel_order), url: spree.fire_admin_order_path(@order.number, e: 'cancel'), - icon: 'icon-trash', - confirm: t(:are_you_sure) } + icon: 'icon-trash' } end def cancel_event_link