effective_orders 4.4.2 → 4.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44adcf0828b7d2908e37632adf7188210fde69b5b31ecada6fd4e489dda14213
-  data.tar.gz: ace9a901e39c54be2b848b6032c741d3ed5595b1d7d7f9007a1ed079d632acee
+  metadata.gz: 53a918aa7baad340d52b29cbee1606af5d82f823dc4f66ba94463e697f8beeb6
+  data.tar.gz: f27dd98180e0cc5d01ec02bbb9a693ec16b01c1874aae1f7f050b8aaf8631e0f
 SHA512:
-  metadata.gz: 43344caae87fe3fdbe44213928cc8297b75fa5e7b437f4fe62be4270973fdbb6b984d29350ffb6c63de5d803f136b5bcbb8b1e313ad7fb9d76765139c3ad1ca4
-  data.tar.gz: 88a9e598b60b201eb776c8ca8e0a7537f07c4352af733c5d6673ef92c88abe238a6ef495fca01fe274235d8d2f0967c3a85587916e54025725f6cb9167a0f852
+  metadata.gz: 79cc98eaa1bc9dc98d267e61f30045acaf2e7a4b70119706d93559b4afbf49018bb4d5161a6dc38a1fa9626815557589d57d8fb36b7710e3d02827de5be5c8ae
+  data.tar.gz: dc79e38e4cbfa81a1feb580dc18fbaf0dab4da8f212c659332be24acc19f08228541ea48fac35e2a2fd60e8fc2004bb589933b971af1ca98a568d277332d3839

data/app/models/effective/order.rb

@@ -79,6 +79,12 @@ module Effective
       }, unless: -> { (free? && EffectiveOrders.free?) || (refund? && EffectiveOrders.refund?) }
     end
 
+    validate(if: -> { tax_rate.present? }) do
+      if (tax_rate > 100.0 || (tax_rate < 0.25 && tax_rate > 0.0000))
+        errors.add(:tax_rate, "is invalid. expected a value between 100.0 (100%) and 0.25 (0.25%) or 0")
+      end
+    end
+
     # User validations -- An admin skips these when working in the admin/ namespace
     with_options unless: -> { pending? || skip_buyer_validations? } do
       validates :tax_rate, presence: { message: "can't be determined based on billing address" }
@@ -437,12 +443,13 @@ module Effective
     protected
 
     def get_tax_rate
-      self.instance_exec(self, &EffectiveOrders.order_tax_rate_method).tap do |rate|
-        rate = rate.to_f
-        if (rate > 100.0 || (rate < 0.25 && rate > 0.0000))
-          raise "expected EffectiveOrders.order_tax_rate_method to return a value between 100.0 (100%) and 0.25 (0.25%) or 0 or nil. Received #{rate}. Please return 5.25 for 5.25% tax."
-        end
+      rate = instance_exec(self, &EffectiveOrders.order_tax_rate_method).to_f
+
+      if (rate > 100.0 || (rate < 0.25 && rate > 0.0000))
+        raise "expected EffectiveOrders.order_tax_rate_method to return a value between 100.0 (100%) and 0.25 (0.25%) or 0 or nil. Received #{rate}. Please return 5.25 for 5.25% tax."
       end
+
+      rate
     end
 
     def get_tax
@@ -454,7 +461,7 @@ module Effective
 
     def assign_order_totals
       self.subtotal = order_items.map { |oi| oi.subtotal }.sum
-      self.tax_rate = get_tax_rate()
+      self.tax_rate = get_tax_rate() unless (tax_rate || 0) > 0
       self.tax = get_tax()
       self.total = subtotal + (tax || 0)
     end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.4.2'.freeze
+  VERSION = '4.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.4.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails