From 493da83378b3ed67747b424f6411a8a757f7e742 Mon Sep 17 00:00:00 2001 From: Hugo Daniel Date: Thu, 20 Sep 2018 12:35:49 +0200 Subject: [PATCH 1/2] Replace Spree::ShippingMethods index view by our own and apply overrides --- .../index/add_distributor_td.html.haml.deface | 6 --- .../index/add_distributor_th.html.haml.deface | 4 -- .../index/rearrange_cols.html.haml.deface | 1 - .../index/remove_configuration_sidebar.deface | 1 - .../admin/shipping_methods/index.html.haml | 37 +++++++++++++++++++ 5 files changed, 37 insertions(+), 12 deletions(-) delete mode 100644 app/overrides/spree/admin/shipping_methods/index/add_distributor_td.html.haml.deface delete mode 100644 app/overrides/spree/admin/shipping_methods/index/add_distributor_th.html.haml.deface delete mode 100644 app/overrides/spree/admin/shipping_methods/index/rearrange_cols.html.haml.deface delete mode 100644 app/overrides/spree/admin/shipping_methods/index/remove_configuration_sidebar.deface create mode 100644 app/views/spree/admin/shipping_methods/index.html.haml diff --git a/app/overrides/spree/admin/shipping_methods/index/add_distributor_td.html.haml.deface b/app/overrides/spree/admin/shipping_methods/index/add_distributor_td.html.haml.deface deleted file mode 100644 index de48c9544c..0000000000 --- a/app/overrides/spree/admin/shipping_methods/index/add_distributor_td.html.haml.deface +++ /dev/null @@ -1,6 +0,0 @@ -/ insert_after "[data-hook='admin_shipping_methods_index_rows'] td:first-child" - -%td.align-center - - shipping_method.distributors.each do |distributor| - = distributor.name - %br/ diff --git a/app/overrides/spree/admin/shipping_methods/index/add_distributor_th.html.haml.deface b/app/overrides/spree/admin/shipping_methods/index/add_distributor_th.html.haml.deface deleted file mode 100644 index 618d758898..0000000000 --- a/app/overrides/spree/admin/shipping_methods/index/add_distributor_th.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -/ insert_after "[data-hook='admin_shipping_methods_index_headers'] th:first-child" - -%th - = t(:products_distributor) diff --git a/app/overrides/spree/admin/shipping_methods/index/rearrange_cols.html.haml.deface b/app/overrides/spree/admin/shipping_methods/index/rearrange_cols.html.haml.deface deleted file mode 100644 index 523401ff51..0000000000 --- a/app/overrides/spree/admin/shipping_methods/index/rearrange_cols.html.haml.deface +++ /dev/null @@ -1 +0,0 @@ -/ replace_contents "table#listing_shipping_methods colgroup" diff --git a/app/overrides/spree/admin/shipping_methods/index/remove_configuration_sidebar.deface b/app/overrides/spree/admin/shipping_methods/index/remove_configuration_sidebar.deface deleted file mode 100644 index cc3fbcdee1..0000000000 --- a/app/overrides/spree/admin/shipping_methods/index/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/shipping_methods/index.html.haml b/app/views/spree/admin/shipping_methods/index.html.haml new file mode 100644 index 0000000000..3e6f919966 --- /dev/null +++ b/app/views/spree/admin/shipping_methods/index.html.haml @@ -0,0 +1,37 @@ +- content_for :page_title do + = Spree.t(:shipping_methods) +- content_for :page_actions do + %li + = button_link_to Spree.t(:new_shipping_method), new_object_url, :icon => 'icon-plus', :id => 'admin_new_shipping_method_link' +- if @shipping_methods.any? + %table#listing_shipping_methods.index + %colgroup + %col{style: "width: 20%"}/ + %col{style: "width: 15%"}/ + %col{style: "width: 40%"}/ + %col{style: "width: 10%"}/ + %col{style: "width: 15%"}/ + %thead + %tr + %th= Spree.t(:name) + %th= t(:products_distributor) + %th= Spree.t(:zone) + %th= Spree.t(:calculator) + %th= Spree.t(:display) + %th.actions + %tbody + - @shipping_methods.each do |shipping_method| + %tr{class: "#{cycle('odd', 'even')}", id: "#{spree_dom_id shipping_method}"} + %td= shipping_method.name + %td.align-center + - shipping_method.distributors.each do |distributor| + = distributor.name + %br/ + %td= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones + %td= shipping_method.calculator.description + %td.align-center= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on) + %td.actions + = link_to_edit shipping_method, :no_text => true + = link_to_delete shipping_method, :no_text => true +- else + .alpha.twelve.columns.no-objects-found= Spree.t(:no_shipping_methods_found) From b0fa76f519fff67ac41f1f9b23f0dc27370e73a5 Mon Sep 17 00:00:00 2001 From: Hugo Daniel Date: Thu, 20 Sep 2018 14:32:27 +0200 Subject: [PATCH 2/2] Change to new ruby hash syntax --- app/views/spree/admin/shipping_methods/index.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/spree/admin/shipping_methods/index.html.haml b/app/views/spree/admin/shipping_methods/index.html.haml index 3e6f919966..0b0afbacc3 100644 --- a/app/views/spree/admin/shipping_methods/index.html.haml +++ b/app/views/spree/admin/shipping_methods/index.html.haml @@ -2,7 +2,7 @@ = Spree.t(:shipping_methods) - content_for :page_actions do %li - = button_link_to Spree.t(:new_shipping_method), new_object_url, :icon => 'icon-plus', :id => 'admin_new_shipping_method_link' + = button_link_to Spree.t(:new_shipping_method), new_object_url, icon: 'icon-plus', id: 'admin_new_shipping_method_link' - if @shipping_methods.any? %table#listing_shipping_methods.index %colgroup @@ -31,7 +31,7 @@ %td= shipping_method.calculator.description %td.align-center= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on) %td.actions - = link_to_edit shipping_method, :no_text => true - = link_to_delete shipping_method, :no_text => true + = link_to_edit shipping_method, no_text: true + = link_to_delete shipping_method, no_text: true - else .alpha.twelve.columns.no-objects-found= Spree.t(:no_shipping_methods_found)