diff --git a/app/controllers/admin/schedules_controller.rb b/app/controllers/admin/schedules_controller.rb index 472d0f240c..e38752db7b 100644 --- a/app/controllers/admin/schedules_controller.rb +++ b/app/controllers/admin/schedules_controller.rb @@ -18,7 +18,6 @@ module Admin failure: lambda { render json: { errors: @schedule.errors.full_messages }, status: :unprocessable_entity } } } - def index respond_to do |format| format.json do diff --git a/app/controllers/admin/standing_orders_controller.rb b/app/controllers/admin/standing_orders_controller.rb index c8aff973cb..17250baa8c 100644 --- a/app/controllers/admin/standing_orders_controller.rb +++ b/app/controllers/admin/standing_orders_controller.rb @@ -80,7 +80,7 @@ module Admin def collection if request.format.json? permissions.editable_standing_orders.ransack(params[:q]).result - .preload([:shop, :customer, :schedule, :standing_line_items, :ship_address, :bill_address, proxy_orders: {order: :order_cycle}]) + .preload([:shop, :customer, :schedule, :standing_line_items, :ship_address, :bill_address, proxy_orders: { order: :order_cycle }]) else StandingOrder.where("1=0") end diff --git a/app/helpers/admin/standing_orders_helper.rb b/app/helpers/admin/standing_orders_helper.rb index 95529891f7..2cb4bb9de2 100644 --- a/app/helpers/admin/standing_orders_helper.rb +++ b/app/helpers/admin/standing_orders_helper.rb @@ -3,7 +3,7 @@ module Admin def standing_orders_setup_complete?(shops) return false unless shops.any? shops = shops.select{ |shop| shipping_and_payment_methods_ok?(shop) && customers_ok?(shop) } - Schedule.joins(:order_cycles).where(order_cycles: { coordinator_id: shops}).any? + Schedule.joins(:order_cycles).where(order_cycles: { coordinator_id: shops }).any? end def shipping_and_payment_methods_ok?(shop) diff --git a/app/mailers/standing_order_mailer.rb b/app/mailers/standing_order_mailer.rb index 8f256c1c3e..7e92ed03f3 100644 --- a/app/mailers/standing_order_mailer.rb +++ b/app/mailers/standing_order_mailer.rb @@ -29,26 +29,26 @@ class StandingOrderMailer < Spree::BaseMailer def placement_summary_email(summary) @shop = Enterprise.find(summary.shop_id) @summary = summary - mail(:to => @shop.email, - :from => from_address, - :subject => "#{Spree::Config[:site_name]} #{t('standing_order_mailer.placement_summary_email.subject')}") + mail(to: @shop.email, + from: from_address, + subject: "#{Spree::Config[:site_name]} #{t('standing_order_mailer.placement_summary_email.subject')}") end def confirmation_summary_email(summary) @shop = Enterprise.find(summary.shop_id) @summary = summary - mail(:to => @shop.email, - :from => from_address, - :subject => "#{Spree::Config[:site_name]} #{t('standing_order_mailer.confirmation_summary_email.subject')}") + mail(to: @shop.email, + from: from_address, + subject: "#{Spree::Config[:site_name]} #{t('standing_order_mailer.confirmation_summary_email.subject')}") end private def send_mail(order) subject = "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{order.number}" - mail(:to => order.email, - :from => from_address, - :subject => subject, - :reply_to => order.distributor.email) + mail(to: order.email, + from: from_address, + subject: subject, + reply_to: order.distributor.email) end end diff --git a/app/models/spree/variant_decorator.rb b/app/models/spree/variant_decorator.rb index 2e543785a4..3f967daf7c 100644 --- a/app/models/spree/variant_decorator.rb +++ b/app/models/spree/variant_decorator.rb @@ -43,9 +43,9 @@ Spree::Variant.class_eval do } scope :in_schedule, lambda { |schedule| - joins(exchanges: { order_cycle: :schedules}). + joins(exchanges: { order_cycle: :schedules }). merge(Exchange.outgoing). - where(schedules: { id: schedule}). + where(schedules: { id: schedule }). select('DISTINCT spree_variants.*') } diff --git a/app/services/standing_order_validator.rb b/app/services/standing_order_validator.rb index 292ea7376b..906ce64c43 100644 --- a/app/services/standing_order_validator.rb +++ b/app/services/standing_order_validator.rb @@ -102,7 +102,7 @@ class StandingOrderValidator @available_variant_ids ||= Spree::Variant.joins(exchanges: { order_cycle: :schedules }) .where(id: standing_line_items.map(&:variant_id)) - .where(schedules: { id: schedule}, exchanges: { incoming: false, receiver_id: shop }) + .where(schedules: { id: schedule }, exchanges: { incoming: false, receiver_id: shop }) .merge(OrderCycle.not_closed) .select('DISTINCT spree_variants.id') .pluck(:id) diff --git a/lib/open_food_network/scope_variants_for_search.rb b/lib/open_food_network/scope_variants_for_search.rb index a613f96df7..d04502dd4c 100644 --- a/lib/open_food_network/scope_variants_for_search.rb +++ b/lib/open_food_network/scope_variants_for_search.rb @@ -24,11 +24,11 @@ module OpenFoodNetwork attr_reader :params def search_params - { :product_name_cont => params[:q], :sku_cont => params[:q] } + { product_name_cont: params[:q], sku_cont: params[:q] } end def query_scope - Spree::Variant.where(is_master: false).ransack(search_params.merge(:m => 'or')).result + Spree::Variant.where(is_master: false).ransack(search_params.merge(m: 'or')).result end def scope_to_schedule