From 6e8fe080cb632471693c066e1cd74412bc4d8d70 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sat, 5 Sep 2020 18:39:56 +0100 Subject: [PATCH] Fix easy rubocop issues --- app/models/spree/adjustment.rb | 2 +- app/models/spree/payment/processing.rb | 10 +++++----- app/models/spree/tax_rate.rb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/spree/adjustment.rb b/app/models/spree/adjustment.rb index ec86edcad4..8d398860fc 100644 --- a/app/models/spree/adjustment.rb +++ b/app/models/spree/adjustment.rb @@ -128,7 +128,7 @@ module Spree end def display_amount - Spree::Money.new(amount, { currency: currency }) + Spree::Money.new(amount, currency: currency) end def immutable? diff --git a/app/models/spree/payment/processing.rb b/app/models/spree/payment/processing.rb index c3316a898d..c5a9979ee3 100644 --- a/app/models/spree/payment/processing.rb +++ b/app/models/spree/payment/processing.rb @@ -179,11 +179,11 @@ module Spree # For more information, please see Spree::Payment#set_unique_identifier order_id: gateway_order_id } - options.merge!({ shipping: order.ship_total * 100, - tax: order.tax_total * 100, - subtotal: order.item_total * 100, - discount: 0, - currency: currency }) + options.merge!(shipping: order.ship_total * 100, + tax: order.tax_total * 100, + subtotal: order.item_total * 100, + discount: 0, + currency: currency) options.merge!({ billing_address: order.bill_address.try(:active_merchant_hash), shipping_address: order.ship_address.try(:active_merchant_hash) }) diff --git a/app/models/spree/tax_rate.rb b/app/models/spree/tax_rate.rb index dcdd078fd7..0e25c59b63 100644 --- a/app/models/spree/tax_rate.rb +++ b/app/models/spree/tax_rate.rb @@ -39,7 +39,7 @@ module Spree order.adjustments.tax.destroy_all order.line_item_adjustments.where(originator_type: 'Spree::TaxRate').destroy_all - self.match(order).each do |rate| + match(order).each do |rate| rate.adjust(order) end end