Add Spree::ZERO constant

core/app/models/concerns/spree/user_reporting.rb

@@ -17,7 +17,7 @@ def average_order_value
       if order_count.to_i > 0
         lifetime_value / order_count
       else
-        BigDecimal("0.00")
+        Spree::ZERO
       end
     end
   end

core/app/models/spree/calculator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/preferences/persistable'
-
 module Spree
   class Calculator < Spree::Base
     include Spree::Preferences::Persistable

core/app/models/spree/payment_method.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/preferences/persistable'
 require 'spree/preferences/statically_configurable'
 
 module Spree

core/lib/spree/core.rb

@@ -103,6 +103,7 @@ class GatewayError < RuntimeError; end
 require 'spree/bus'
 require 'spree/config'
 require 'spree/core/engine'
+require 'spree/zero'
 
 require 'spree/i18n'
 require 'spree/localized_number'

core/lib/spree/preferences/preferable.rb

@@ -160,11 +160,7 @@ def convert_preference_value(value, type, preference_encryptor = nil)
         when :password
           value.to_s
         when :decimal
-          begin
-            value.to_s.to_d
-          rescue ArgumentError
-            BigDecimal(0)
-          end
+          value.to_s.to_d
         when :integer
           value.to_i
         when :boolean

core/lib/spree/zero.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Spree::ZERO = BigDecimal(0).freeze

core/spec/models/spree/payment_spec.rb

@@ -1146,7 +1146,7 @@
         # this is a strange default for ActiveRecord
 
         it '#amount' do
-          expect(subject.amount).to eql(BigDecimal('0'))
+          expect(subject.amount).to eql(Spree::ZERO)
         end
       end
 

core/spec/models/spree/user_spec.rb

@@ -115,7 +115,7 @@ def load_orders
       end
       context "without orders" do
         it "returns 0.00" do
-          expect(subject.lifetime_value).to eq BigDecimal("0.00")
+          expect(subject.lifetime_value).to eq Spree::ZERO
         end
       end
     end
@@ -144,7 +144,7 @@ def load_orders
       end
       context "without orders" do
         it "returns 0.00" do
-          expect(subject.average_order_value).to eq BigDecimal("0.00")
+          expect(subject.average_order_value).to eq Spree::ZERO
         end
       end
     end

legacy_promotions/app/models/spree/calculator/flexi_rate.rb

@@ -13,7 +13,7 @@ def compute(object)
       items_count = object.quantity
       items_count = [items_count, preferred_max_items].min unless preferred_max_items.zero?
 
-      return BigDecimal(0) if items_count == 0
+      return Spree::ZERO if items_count == 0
 
       additional_items_count = items_count - 1
       preferred_first_item + preferred_additional_item * additional_items_count

legacy_promotions/app/models/spree/calculator/tiered_flat_rate.rb

@@ -35,8 +35,6 @@ def compute(object)
 
     def cast_to_d(value)
       value.to_s.to_d
-    rescue ArgumentError
-      BigDecimal(0)
     end
 
     def preferred_tiers_content

legacy_promotions/app/models/spree/calculator/tiered_percent.rb

@@ -42,8 +42,6 @@ def compute(object)
 
     def cast_to_d(value)
       value.to_s.to_d
-    rescue ArgumentError
-      BigDecimal(0)
     end
 
     def preferred_tiers_content

legacy_promotions/app/models/spree/promotion/actions/create_adjustment.rb

@@ -43,7 +43,7 @@ def perform(options = {})
         # item_total and ship_total
         def compute_amount(calculable)
           amount = calculator.compute(calculable)
-          amount ||= BigDecimal(0)
+          amount ||= Spree::ZERO
           amount = amount.abs
           [(calculable.item_total + calculable.ship_total), amount].min * -1
         end

legacy_promotions/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -37,7 +37,7 @@ def compute_amount(adjustable)
           order = adjustable.is_a?(Order) ? adjustable : adjustable.order
           return 0 unless promotion.line_item_actionable?(order, adjustable)
           promotion_amount = calculator.compute(adjustable)
-          promotion_amount ||= BigDecimal(0)
+          promotion_amount ||= Spree::ZERO
           promotion_amount = promotion_amount.abs
           [adjustable.amount, promotion_amount].min * -1
         end

legacy_promotions/app/models/spree/promotion/actions/create_quantity_adjustments.rb

@@ -57,7 +57,7 @@ class CreateQuantityAdjustments < CreateItemAdjustments
         #
         def compute_amount(line_item)
           adjustment_amount = calculator.compute(PartialLineItem.new(line_item))
-          adjustment_amount ||= BigDecimal(0)
+          adjustment_amount ||= Spree::ZERO
           adjustment_amount = adjustment_amount.abs
 
           order = line_item.order

legacy_promotions/app/models/spree/promotion_action.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/preferences/persistable'
-
 module Spree
   # Base class for all types of promotion action.
   #

legacy_promotions/app/models/spree/promotion_chooser.rb

@@ -18,7 +18,7 @@ def update
         end
         best_promotion_adjustment.amount
       else
-        BigDecimal('0')
+        Spree::ZERO
       end
     end
 

legacy_promotions/app/models/spree/promotion_rule.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/preferences/persistable'
-
 module Spree
   # Base class for all promotion rules
   class PromotionRule < Spree::Base

promotions/app/models/solidus_promotions/benefit.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spree/preferences/persistable"
-
 module SolidusPromotions
   # Base class for all types of benefit.
   #
@@ -44,7 +42,7 @@ def discount(adjustable)
 
     # Ensure a negative amount which does not exceed the object's amount
     def compute_amount(adjustable)
-      promotion_amount = calculator.compute(adjustable) || BigDecimal("0")
+      promotion_amount = calculator.compute(adjustable) || Spree::ZERO
       [adjustable.discountable_amount, promotion_amount.abs].min * -1
     end
 

promotions/app/models/solidus_promotions/benefits/adjust_line_item_quantity_groups.rb

@@ -53,7 +53,7 @@ class AdjustLineItemQuantityGroups < AdjustLineItem
       #
       def compute_amount(line_item)
         adjustment_amount = calculator.compute(Item.new(line_item))
-        return BigDecimal("0") if adjustment_amount.nil? || adjustment_amount.zero?
+        return Spree::ZERO if adjustment_amount.nil? || adjustment_amount.zero?
 
         adjustment_amount = adjustment_amount.abs
 

promotions/app/models/solidus_promotions/calculators/flexi_rate.rb

@@ -16,7 +16,7 @@ def compute(object)
         items_count = object.quantity
         items_count = [items_count, preferred_max_items].min unless preferred_max_items.zero?
 
-        return BigDecimal("0") if items_count == 0
+        return Spree::ZERO if items_count == 0
 
         additional_items_count = items_count - 1
         preferred_first_item + preferred_additional_item * additional_items_count

promotions/app/models/solidus_promotions/calculators/tiered_flat_rate.rb

@@ -40,8 +40,6 @@ def compute_item(object)
 
       def cast_to_d(value)
         value.to_s.to_d
-      rescue ArgumentError
-        BigDecimal("0")
       end
 
       def preferred_tiers_content

promotions/app/models/solidus_promotions/calculators/tiered_percent.rb

@@ -47,8 +47,6 @@ def compute_item(object)
 
       def cast_to_d(value)
         value.to_s.to_d
-      rescue ArgumentError
-        BigDecimal("0")
       end
 
       def preferred_tiers_content

promotions/app/models/solidus_promotions/condition.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spree/preferences/persistable"
-
 module SolidusPromotions
   class Condition < Spree::Base
     include Spree::Preferences::Persistable