effective_orders 5.1.2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e62ea845d2b3982fbb11f3f6c50c7e225ad96d928a7ba957a19b7e3b997eb1d8
-  data.tar.gz: 49350bba4a80a42aca9e0d81d9fd1140fdace45b57db00ea951fd61ca3234b08
+  metadata.gz: ade00cb763bc7fbe35b7328f3b3b5950eda644ad3db27a62106b96676ec9a057
+  data.tar.gz: da28c05225df93566ac1633ee0ab681ead8e1c3642bf90f85a27c291c52c4a5d
 SHA512:
-  metadata.gz: 434791b34029447935fe2ebd8d1520ecb4abd59d9d31fcb11f08ed3b8db3c07841b46cb75d4f40fd36072a636f84a1a4b524b08565b5cbe4155ba39f8bf40553
-  data.tar.gz: 4a2e1df8a24b1cadf8bb845655de1e1b2adba896c6b74b52fda7fcb4d2ef80302958bbbd6b72221b88738b9f8c595279daefb9381244c6fa09df81df812b4838
+  metadata.gz: 1217f8ca75c06b59a787f5ddc9f83e65331e904f2a492a01d5b16dca4917c470e5c527fbbd9cc97f3dd05263904b1dc7e87aa3afe11db25e535d65fe31de7287
+  data.tar.gz: 492aa5d8c2a6b1ea7611d0f29f5edc3b09b53bcca717405acb7e9310e1f3966d71ee29680d51340def9e168855a164340a754a4b8259c333c510fab87b21e974

data/app/models/effective/order.rb

@@ -225,7 +225,6 @@ module Effective
       retval.size == 1 ? retval.first : retval
     end
 
-
     def update_prices!
       raise('already purchased') if purchased?
       raise('must be pending or confirmed') unless pending? || confirmed?

data/app/models/effective/tax_rate_calculator.rb

@@ -30,8 +30,13 @@ module Effective
     end
 
     def tax_rate
-      country = country_code || (order.billing_address.country_code if order.billing_address.present?)
-      state = state_code || (order.billing_address.state_code if order.billing_address.present?)
+      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?
 
       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.2'.freeze
+  VERSION = '5.1.3'.freeze
 end

metadata

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