From e013d81e3dde0cbc3b3e5718b6b1a94bd6578d9d Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 10 Sep 2021 14:38:54 +1000 Subject: [PATCH] Simplify safe navigation operator use `<` and `[]` --- app/models/proxy_order.rb | 4 ++-- app/models/spree/order.rb | 2 +- app/models/tag_rule/filter_products.rb | 2 +- app/serializers/api/admin/proxy_order_serializer.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/proxy_order.rb b/app/models/proxy_order.rb index 0b3e46a445..b258208e4d 100644 --- a/app/models/proxy_order.rb +++ b/app/models/proxy_order.rb @@ -33,7 +33,7 @@ class ProxyOrder < ApplicationRecord end def cancel - return false unless order_cycle.orders_close_at&. > Time.zone.now + return false unless order_cycle.orders_close_at&.>(Time.zone.now) transaction do update_column(:canceled_at, Time.zone.now) @@ -43,7 +43,7 @@ class ProxyOrder < ApplicationRecord end def resume - return false unless order_cycle.orders_close_at&.send(:>, Time.zone.now) + return false unless order_cycle.orders_close_at&.>(Time.zone.now) transaction do update_column(:canceled_at, nil) diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb index 9e5f274bfb..d762cecb99 100644 --- a/app/models/spree/order.rb +++ b/app/models/spree/order.rb @@ -675,7 +675,7 @@ module Spree end def skip_payment_for_subscription? - subscription.present? && order_cycle.orders_close_at&.send(:>, Time.zone.now) + subscription.present? && order_cycle.orders_close_at&.>(Time.zone.now) end def require_customer? diff --git a/app/models/tag_rule/filter_products.rb b/app/models/tag_rule/filter_products.rb index f3c6d9e7f2..fb3908fefa 100644 --- a/app/models/tag_rule/filter_products.rb +++ b/app/models/tag_rule/filter_products.rb @@ -10,7 +10,7 @@ class TagRule end def tags_match?(variant) - variant_tags = variant&.send(:[], "tag_list") || [] + variant_tags = variant&.[]("tag_list") || [] preferred_tags = preferred_variant_tags.split(",") (variant_tags & preferred_tags).any? end diff --git a/app/serializers/api/admin/proxy_order_serializer.rb b/app/serializers/api/admin/proxy_order_serializer.rb index 3944283d1a..61a0940d40 100644 --- a/app/serializers/api/admin/proxy_order_serializer.rb +++ b/app/serializers/api/admin/proxy_order_serializer.rb @@ -13,7 +13,7 @@ module Api end def update_issues - options[:order_update_issues]&.send(:[], object.order_id) || [] + options[:order_update_issues]&.[](object.order_id) || [] end def completed_at