From aa948552e12a75e2fc79fd25028252d02a55ba07 Mon Sep 17 00:00:00 2001 From: Hugo Daniel Date: Thu, 29 Nov 2018 14:30:46 +0100 Subject: [PATCH] Import payment_methods edit view and apply overrides --- .../edit/add_hubs_sidebar.html.haml.deface | 5 ----- ..._new_payment_method_button.html.haml.deface | 4 ---- .../edit/remove_configuration_sidebar.deface | 1 - .../spree/admin/payment_methods/edit.html.haml | 18 ++++++++++++++++++ 4 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 app/overrides/spree/admin/payment_methods/edit/add_hubs_sidebar.html.haml.deface delete mode 100644 app/overrides/spree/admin/payment_methods/edit/add_new_payment_method_button.html.haml.deface delete mode 100644 app/overrides/spree/admin/payment_methods/edit/remove_configuration_sidebar.deface create mode 100644 app/views/spree/admin/payment_methods/edit.html.haml diff --git a/app/overrides/spree/admin/payment_methods/edit/add_hubs_sidebar.html.haml.deface b/app/overrides/spree/admin/payment_methods/edit/add_hubs_sidebar.html.haml.deface deleted file mode 100644 index 26ee2888bd..0000000000 --- a/app/overrides/spree/admin/payment_methods/edit/add_hubs_sidebar.html.haml.deface +++ /dev/null @@ -1,5 +0,0 @@ -/ insert_after "code[erb-loud]:contains(\"render :partial => 'form', :locals => { :f => f }\")" - -.one.column   -= render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { f: f, klass: :payment_method } -.clear \ No newline at end of file diff --git a/app/overrides/spree/admin/payment_methods/edit/add_new_payment_method_button.html.haml.deface b/app/overrides/spree/admin/payment_methods/edit/add_new_payment_method_button.html.haml.deface deleted file mode 100644 index fa595620e7..0000000000 --- a/app/overrides/spree/admin/payment_methods/edit/add_new_payment_method_button.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -/ insert_after "code[erb-silent]:contains('content_for :page_actions do')" - -%li - = button_link_to t(:new), spree.new_admin_payment_method_path, :icon => 'icon-plus' %> \ No newline at end of file diff --git a/app/overrides/spree/admin/payment_methods/edit/remove_configuration_sidebar.deface b/app/overrides/spree/admin/payment_methods/edit/remove_configuration_sidebar.deface deleted file mode 100644 index cc3fbcdee1..0000000000 --- a/app/overrides/spree/admin/payment_methods/edit/remove_configuration_sidebar.deface +++ /dev/null @@ -1 +0,0 @@ -remove "code[erb-loud]:contains(\"render :partial => 'spree/admin/shared/configuration_menu'\")" \ No newline at end of file diff --git a/app/views/spree/admin/payment_methods/edit.html.haml b/app/views/spree/admin/payment_methods/edit.html.haml new file mode 100644 index 0000000000..527e19df2f --- /dev/null +++ b/app/views/spree/admin/payment_methods/edit.html.haml @@ -0,0 +1,18 @@ +- content_for :page_title do + = t(:editing_payment_method) + %i.icon-arrow-right + = @payment_method.name +- content_for :page_actions do + %li + = button_link_to t(:new), spree.new_admin_payment_method_path, icon: 'icon-plus' + %li + = button_link_to t(:back_to_payment_methods_list), spree.admin_payment_methods_path, icon: 'icon-arrow-left' += render partial: 'spree/shared/error_messages', locals: { target: @payment_method } += form_for @payment_method, url: admin_payment_method_path(@payment_method) do |f| + %fieldset.no-border-top + = render partial: 'form', locals: { f: f } + .one.column   + = render partial: 'spree/admin/shared/hubs_sidebar', locals: { f: f, klass: :payment_method } + .clear + .filter-actions.actions + = button t(:update), 'icon-refresh'