From f92c082df8d5631eda2b773a679be7f9ea021c64 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Fri, 5 Mar 2021 22:18:31 +0000 Subject: [PATCH] Refactor tax adjustment create_label method --- app/models/spree/tax_rate.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/models/spree/tax_rate.rb b/app/models/spree/tax_rate.rb index dc9c75e010..bd00dbd9cc 100644 --- a/app/models/spree/tax_rate.rb +++ b/app/models/spree/tax_rate.rb @@ -90,15 +90,11 @@ module Spree included = included_in_price && default_zone_or_zone_match?(order) - if amount.negative? - label = "#{Spree.t(:refund)} #{create_label}" - end - self.adjustments.create!( adjustable: item, amount: amount, order: order, - label: label || create_label, + label: create_label(amount), included: included ) end @@ -142,8 +138,9 @@ module Spree private - def create_label + def create_label(amount) label = "" + label << "#{Spree.t(:refund)} " if amount.negative? label << "#{(name.presence || tax_category.name)} " label << (show_rate_in_label? ? "#{amount * 100}%" : "") label << " (#{I18n.t('models.tax_rate.included_in_price')})" if included_in_price?