From 252697b782f229cb553588557c8c658d5fbefc83 Mon Sep 17 00:00:00 2001 From: Neal Chambers Date: Fri, 9 Jun 2023 16:39:26 +0900 Subject: [PATCH] Rewrite If and Unless Statements to be more Readable --- app/controllers/admin/enterprise_fees_controller.rb | 4 +++- app/controllers/admin/enterprises_controller.rb | 8 ++++++-- app/helpers/order_cycles_helper.rb | 6 ++++-- app/helpers/spree/orders_helper.rb | 4 +++- app/models/column_preference.rb | 4 +++- app/services/checkout/post_checkout_actions.rb | 4 +++- app/services/products_renderer.rb | 6 ++++-- 7 files changed, 26 insertions(+), 10 deletions(-) diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb index 6eab5c143d..ea8c0bc276 100644 --- a/app/controllers/admin/enterprise_fees_controller.rb +++ b/app/controllers/admin/enterprise_fees_controller.rb @@ -62,7 +62,9 @@ module Admin when :for_order_cycle order_cycle = OrderCycle.find_by(id: params[:order_cycle_id]) if params[:order_cycle_id] coordinator = Enterprise.find_by(id: params[:coordinator_id]) if params[:coordinator_id] - order_cycle = OrderCycle.new(coordinator: coordinator) if order_cycle.nil? && coordinator.present? + if order_cycle.nil? && coordinator.present? + order_cycle = OrderCycle.new(coordinator: coordinator) + end enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user, order_cycle).visible_enterprises EnterpriseFee.for_enterprises(enterprises).order('enterprise_id', 'fee_type', 'name') diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb index 01d0a84dc8..93e95581cd 100644 --- a/app/controllers/admin/enterprises_controller.rb +++ b/app/controllers/admin/enterprises_controller.rb @@ -178,7 +178,9 @@ module Admin when :for_order_cycle @order_cycle = OrderCycle.find_by(id: params[:order_cycle_id]) if params[:order_cycle_id] coordinator = Enterprise.find_by(id: params[:coordinator_id]) if params[:coordinator_id] - @order_cycle = OrderCycle.new(coordinator: coordinator) if @order_cycle.nil? && coordinator.present? + if @order_cycle.nil? && coordinator.present? + @order_cycle = OrderCycle.new(coordinator: coordinator) + end enterprises = OpenFoodNetwork::OrderCyclePermissions.new(spree_current_user, @order_cycle) .visible_enterprises @@ -324,7 +326,9 @@ module Admin :producer_properties_attributes).nil? names = Spree::Property.pluck(:name) enterprise_params[:producer_properties_attributes].each do |key, property| - enterprise_params[:producer_properties_attributes].delete key unless names.include? property[:property_name] + unless names.include? property[:property_name] + enterprise_params[:producer_properties_attributes].delete key + end end end end diff --git a/app/helpers/order_cycles_helper.rb b/app/helpers/order_cycles_helper.rb index c97e0c1a96..a68a4d5906 100644 --- a/app/helpers/order_cycles_helper.rb +++ b/app/helpers/order_cycles_helper.rb @@ -53,7 +53,8 @@ module OrderCyclesHelper end def simple_index - @simple_index ||= !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles? + @simple_index ||= + !OpenFoodNetwork::Permissions.new(spree_current_user).can_manage_complex_order_cycles? end def pickup_time(order_cycle = current_order_cycle) @@ -73,7 +74,8 @@ module OrderCyclesHelper def validated_enterprise_options(enterprises, options = {}) enterprises.map do |e| disabled_message = nil - if options[:shipping_and_payment_methods] && (e.shipping_methods.empty? || e.payment_methods.available.empty?) + if options[:shipping_and_payment_methods] && + (e.shipping_methods.empty? || e.payment_methods.available.empty?) if e.shipping_methods.empty? && e.payment_methods.available.empty? disabled_message = I18n.t(:no_shipping_or_payment) elsif e.shipping_methods.empty? diff --git a/app/helpers/spree/orders_helper.rb b/app/helpers/spree/orders_helper.rb index 06b20e70c0..a79547a59f 100644 --- a/app/helpers/spree/orders_helper.rb +++ b/app/helpers/spree/orders_helper.rb @@ -18,7 +18,9 @@ module Spree def changeable_orders # Only returns open order for the current user + shop + oc combo return @changeable_orders unless @changeable_orders.nil? - return @changeable_orders = [] unless spree_current_user && current_distributor && current_order_cycle + unless spree_current_user && current_distributor && current_order_cycle + return @changeable_orders = [] + end return @changeable_orders = [] unless current_distributor.allow_order_changes? @changeable_orders = Spree::Order.complete.where( diff --git a/app/models/column_preference.rb b/app/models/column_preference.rb index a4e52b577c..3a08aa3a85 100644 --- a/app/models/column_preference.rb +++ b/app/models/column_preference.rb @@ -48,6 +48,8 @@ class ColumnPreference < ApplicationRecord def self.filter(default_preferences, user, action_name) return unless action_name == 'order_cycles_index' - default_preferences.delete(:schedules) unless user.admin? || user.enterprises.where(enable_subscriptions: true).any? + return if user.admin? || user.enterprises.where(enable_subscriptions: true).any? + + default_preferences.delete(:schedules) end end diff --git a/app/services/checkout/post_checkout_actions.rb b/app/services/checkout/post_checkout_actions.rb index f7926f57fb..5e8071012d 100644 --- a/app/services/checkout/post_checkout_actions.rb +++ b/app/services/checkout/post_checkout_actions.rb @@ -30,7 +30,9 @@ module Checkout def set_customer_terms_and_conditions_accepted_at(params) return unless params[:order] - @order.customer.update(terms_and_conditions_accepted_at: Time.zone.now) if params[:order][:terms_and_conditions_accepted] + return unless params[:order][:terms_and_conditions_accepted] + + @order.customer.update(terms_and_conditions_accepted_at: Time.zone.now) end end end diff --git a/app/services/products_renderer.rb b/app/services/products_renderer.rb index c977f9cf02..a37f5d8576 100644 --- a/app/services/products_renderer.rb +++ b/app/services/products_renderer.rb @@ -68,12 +68,14 @@ class ProductsRenderer end def products_order - if distributor.preferred_shopfront_product_sorting_method == "by_producer" && distributor.preferred_shopfront_producer_order.present? + if (distributor.preferred_shopfront_product_sorting_method == "by_producer") && + distributor.preferred_shopfront_producer_order.present? distributor .preferred_shopfront_producer_order .split(",").map { |id| "spree_products.supplier_id=#{id} DESC" } .join(", ") + ", spree_products.name ASC, spree_products.id ASC" - elsif distributor.preferred_shopfront_product_sorting_method == "by_category" && distributor.preferred_shopfront_taxon_order.present? + elsif distributor.preferred_shopfront_product_sorting_method == "by_category" && + distributor.preferred_shopfront_taxon_order.present? distributor .preferred_shopfront_taxon_order .split(",").map { |id| "spree_products.primary_taxon_id=#{id} DESC" }