effective_orders 5.1.2 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e62ea845d2b3982fbb11f3f6c50c7e225ad96d928a7ba957a19b7e3b997eb1d8
-  data.tar.gz: 49350bba4a80a42aca9e0d81d9fd1140fdace45b57db00ea951fd61ca3234b08
+  metadata.gz: '063584ca12ed4cb46363a9c7c99f729889bf536eb0a1afb6021e04f07349532b'
+  data.tar.gz: 313908b8ff6797d96c7139a3598b6790a3fda9fb358e69a240e0ccb5afcd8569
 SHA512:
-  metadata.gz: 434791b34029447935fe2ebd8d1520ecb4abd59d9d31fcb11f08ed3b8db3c07841b46cb75d4f40fd36072a636f84a1a4b524b08565b5cbe4155ba39f8bf40553
-  data.tar.gz: 4a2e1df8a24b1cadf8bb845655de1e1b2adba896c6b74b52fda7fcb4d2ef80302958bbbd6b72221b88738b9f8c595279daefb9381244c6fa09df81df812b4838
+  metadata.gz: 71a032b3e32b4387801d3630e58df4ee9b91f890a0d87e42c1c4eacb5cb49875e7494316089c01d9d9bdf8a10e246d09caa8d4d2bb400897221661957fc63034
+  data.tar.gz: 7149e03e2c5f5f830a53f235eafd6c712213d5dd6eb4958554d752e7f8e51d124188cebe432284a8ddde462e2fd5ff7ec21999a00465220fbc9d4cb5f5a84a08

data/app/controllers/effective/concerns/purchase.rb

@@ -11,7 +11,7 @@ module Effective
         Effective::Cart.where(user: @order.user).destroy_all
 
         if flash[:success].blank?
-          if email && EffectiveOrders.mailer[:send_order_receipt_to_buyer]
+          if email && @order.send_order_receipt_to_buyer?
             flash[:success] = "Payment successful! A receipt has been sent to #{@order.emails_send_to}"
           else
             flash[:success] = "Payment successful! An email receipt has not been sent."

data/app/models/effective/order.rb

@@ -69,6 +69,7 @@ module Effective
     before_validation { assign_billing_name }
     before_validation { assign_email }
     before_validation { assign_last_address }
+    before_validation { assign_user_address }
 
     before_validation(if: -> { confirmed_checkout }) do
       self.state = EffectiveOrders::CONFIRMED if pending?
@@ -156,30 +157,34 @@ module Effective
     def initialize(atts = nil, &block)
       super(state: EffectiveOrders::PENDING) # Initialize with state: PENDING
 
-      return unless atts.present?
+      return self unless atts.present?
 
       if atts.kind_of?(Hash)
-        items = Array(atts.delete(:item)) + Array(atts.delete(:items))
+        items = Array(atts[:item]) + Array(atts[:items])
 
-        self.user = atts.delete(:user) || (items.first.user if items.first.respond_to?(:user))
+        self.user = atts[:user] || (items.first.user if items.first.respond_to?(:user))
 
-        if (address = atts.delete(:billing_address)).present?
+        if (address = atts[:billing_address]).present?
           self.billing_address = address
           self.billing_address.full_name ||= user.to_s.presence
         end
 
-        if (address = atts.delete(:shipping_address)).present?
+        if (address = atts[:shipping_address]).present?
           self.shipping_address = address
           self.shipping_address.full_name ||= user.to_s.presence
         end
 
-        atts.each { |key, value| self.send("#{key}=", value) }
+        atts.except(:item, :items, :user, :billing_address, :shipping_address).each do |key, value|
+          self.send("#{key}=", value)
+        end
 
         add(items) if items.present?
       else # Attributes are not a Hash
         self.user = atts.user if atts.respond_to?(:user)
         add(atts)
       end
+
+      self
     end
 
     # Items can be an Effective::Cart, an Effective::order, a single acts_as_purchasable, or multiple acts_as_purchasables
@@ -225,7 +230,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?
@@ -346,6 +350,14 @@ module Effective
       order_items.map { |oi| oi.quantity }.sum
     end
 
+    def send_order_receipt_to_admin?
+      EffectiveOrders.mailer[:send_order_receipt_to_admin] && !free?
+    end
+
+    def send_order_receipt_to_buyer?
+      EffectiveOrders.mailer[:send_order_receipt_to_buyer] && !free?
+    end
+
     def send_payment_request_to_buyer?
       EffectiveResources.truthy?(send_payment_request_to_buyer) && !free? && !refund?
     end
@@ -426,11 +438,7 @@ module Effective
     def defer!(provider: 'none', email: true)
       return false if purchased?
 
-      assign_attributes(
-        state: EffectiveOrders::DEFERRED,
-        payment_provider: provider
-      )
-
+      assign_attributes(state: EffectiveOrders::DEFERRED, payment_provider: provider)
       save!
 
       send_payment_request_to_buyer! if email
@@ -478,8 +486,8 @@ module Effective
     end
 
     def send_order_receipts!
-      send_order_receipt_to_admin! if EffectiveOrders.mailer[:send_order_receipt_to_admin]
-      send_order_receipt_to_buyer! if EffectiveOrders.mailer[:send_order_receipt_to_buyer]
+      send_order_receipt_to_admin! if send_order_receipt_to_admin?
+      send_order_receipt_to_buyer! if send_order_receipt_to_buyer?
       send_refund_notification! if refund?
     end
 
@@ -563,6 +571,23 @@ module Effective
       end
     end
 
+    def assign_user_address
+      return unless user.present?
+      return unless (EffectiveOrders.billing_address || EffectiveOrders.shipping_address)
+      return if EffectiveOrders.billing_address && billing_address.present?
+      return if EffectiveOrders.shipping_address && shipping_address.present?
+
+      if billing_address.blank? && user.respond_to?(:billing_address) && user.billing_address.present?
+        self.billing_address = user.billing_address
+        self.billing_address.full_name ||= user.to_s.presence
+      end
+
+      if shipping_address.blank? && user.respond_to?(:shipping_address) && user.shipping_address.present?
+        self.shipping_address = user.shipping_address
+        self.shipping_address.full_name ||= user.to_s.presence
+      end
+    end
+
     def update_purchasables_purchased_order!
       order_items.each { |oi| oi.purchasable&.update_column(:purchased_order_id, self.id) }
     end

data/app/models/effective/tax_rate_calculator.rb

@@ -24,14 +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 || (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
+      state = state_code
+
+      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.2'.freeze
+  VERSION = '5.1.6'.freeze
 end

data/lib/effective_orders.rb

@@ -107,7 +107,7 @@ module EffectiveOrders
 
   # The Effective::Order.payment_provider value must be in this collection
   def self.payment_providers
-    [
+    @payment_providers ||= [
       ('cheque' if cheque?),
       ('credit card' if mark_as_paid?),
       ('free' if free?),

metadata

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