effective_orders 5.1.4 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a084a1145beb50dc672efd5506bb81e497553d73e945195f2f31ea567bbc757
-  data.tar.gz: 2743bac90f7d5f5ff4b2985b97a7404040f875fc12414e308bd188023307512c
+  metadata.gz: 70fd6793f180e1b0106c700cef6aacc0363cf7b2e3c76389e53db1301e6bac4e
+  data.tar.gz: 9fca2375abb56fd3052d2c098324f0dd6eb3d675772700f8ee792a12e54b39a6
 SHA512:
-  metadata.gz: 2ee2c0d212855b3a7883c9ac4194b2b9b796668cdadd57778e23afdfe774fcd07f503f96b0812242bb2e0aa9f872c6a354fa2dd0d10275fc78b3787d9a09a65b
-  data.tar.gz: 2d6ae464bd99a12bfd0e3226d8a1bdb20fa04c4e7b015d185f0432c8be5a92644840a3e9a93b9f437102f5dc03ae9dcc6faa7d7589582235b55609bef976cbe9
+  metadata.gz: 5c33291651b6c2e6789040feca6573827a2f61f64b1b6553692ebfc4b45382949f0814b5257bfa7fc3d65d461b8a36bf01051565acf06474638a9f9771268d4b
+  data.tar.gz: 51155ef9663bc5912b70c7c9be2232a55aa4d7565eeaf19eca83eea7f216b1d809d998259f347a2fc643755215792c323e3b7e8eb4ffd6c5b2f733899f407604

data/app/models/effective/tax_rate_calculator.rb

@@ -24,19 +24,21 @@ module Effective
       @order = order
       @country_code = country_code
       @state_code = state_code
-
-      raise 'expected an order, or a country and state code' unless (order || country_code)
-      raise 'expected an order OR a country and state code. Not both.' if (order && country_code)
     end
 
     def tax_rate
       country = country_code
-      country ||= order.billing_address.country_code if order.billing_address.present?
-      country ||= order.user.billing_address.country_code if order.user.respond_to?(:billing_address) && order.user.billing_address.present?
-
       state = state_code
-      state ||= order.billing_address.state_code if order.billing_address.present?
-      state ||= order.user.billing_address.state_code if order.user.respond_to?(:billing_address) && order.user.billing_address.present?
+
+      if order.present? && order.billing_address.present?
+        country ||= order.billing_address.country_code
+        state ||= order.billing_address.state_code
+      end
+
+      if order.present? && order.user.respond_to?(:billing_address) && order.user.billing_address.present?
+        country ||= order.user.billing_address.country_code
+        state ||= order.user.billing_address.state_code
+      end
 
       rate = RATES[country]
       return rate if rate.kind_of?(Numeric)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.1.4'.freeze
+  VERSION = '5.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails