From 87431c188ed5c79677c9d353c2f58eb4e70e7dea Mon Sep 17 00:00:00 2001 From: Cillian O'Ruanaidh Date: Fri, 15 Jul 2022 15:51:23 +0100 Subject: [PATCH] Use ShippingMethod :frontend method and drop :backend to avoid ClassLength Rubocop error --- app/models/spree/shipping_method.rb | 4 ---- app/views/admin/order_cycles/checkout_options.html.haml | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/models/spree/shipping_method.rb b/app/models/spree/shipping_method.rb index 44cac5eab0..589bc8ce8c 100644 --- a/app/models/spree/shipping_method.rb +++ b/app/models/spree/shipping_method.rb @@ -71,10 +71,6 @@ module Spree spree_calculators.__send__ model_name_without_spree_namespace end - def backend? - !frontend? - end - # Some shipping methods are only meant to be set via backend def frontend? display_on != "back_end" diff --git a/app/views/admin/order_cycles/checkout_options.html.haml b/app/views/admin/order_cycles/checkout_options.html.haml index dd5841a020..d95b231187 100644 --- a/app/views/admin/order_cycles/checkout_options.html.haml +++ b/app/views/admin/order_cycles/checkout_options.html.haml @@ -32,14 +32,14 @@ - if shipping_methods.any? - shipping_methods.each do |shipping_method| %p - %label{ class: ("disabled" if shipping_method.backend?) } + %label{ class: ("disabled" unless shipping_method.frontend?) } = check_box_tag "order_cycle[selected_shipping_method_ids][]", shipping_method.id, @order_cycle.shipping_methods.include?(shipping_method), - disabled: shipping_method.backend?, + disabled: !shipping_method.frontend?, id: "order_cycle_selected_shipping_method_ids_#{shipping_method.id}", - data: ({ "action" => "change->select-all#toggleCheckbox", "select-all-target" => "checkbox" } unless shipping_method.backend?) + data: ({ "action" => "change->select-all#toggleCheckbox", "select-all-target" => "checkbox" } if shipping_method.frontend?) = shipping_method.name - - if shipping_method.backend? + - unless shipping_method.frontend? = "(#{t('.back_end')})" - if @order_cycle.distributors.many? —