effective_orders 5.1.3 → 5.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade00cb763bc7fbe35b7328f3b3b5950eda644ad3db27a62106b96676ec9a057
-  data.tar.gz: da28c05225df93566ac1633ee0ab681ead8e1c3642bf90f85a27c291c52c4a5d
+  metadata.gz: 642b6831172be548e28cec2adf8c2f13f75ec9ef9af0e1cb15ee48cb763e3edc
+  data.tar.gz: ce4111bbaf7d8fb7a50e16c7ff8a0a43ae412586d2c7063a9c6e910d1337fbc4
 SHA512:
-  metadata.gz: 1217f8ca75c06b59a787f5ddc9f83e65331e904f2a492a01d5b16dca4917c470e5c527fbbd9cc97f3dd05263904b1dc7e87aa3afe11db25e535d65fe31de7287
-  data.tar.gz: 492aa5d8c2a6b1ea7611d0f29f5edc3b09b53bcca717405acb7e9310e1f3966d71ee29680d51340def9e168855a164340a754a4b8259c333c510fab87b21e974
+  metadata.gz: a7e2f6adabe417e43819f95c46e12dcc2c36680c82bedc870041a7665a700428428888927eb35b1dca18ab89d3d695b03183edc3cb35be3e1406f3befa0eee80
+  data.tar.gz: 5650b3ed6960e16d3c630be6697ab9fe69084122a543f2cbbfec875a6defa3fefeb0bb19655affcaadbb4b15e074d5191579aead15107a91f447b401ae31f2aa

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
@@ -198,9 +203,21 @@ module Effective
           # Duplicate an existing order
           self.note_to_buyer ||= item.note_to_buyer
           self.note_internal ||= item.note_internal
+          self.cc ||= item.cc
 
           item.order_items.select { |oi| oi.purchasable.kind_of?(Effective::Product) }.map do |oi|
-            product = Effective::Product.new(name: oi.purchasable.purchasable_name, price: oi.purchasable.price, tax_exempt: oi.purchasable.tax_exempt)
+            purchasable = oi.purchasable
+
+            product = Effective::Product.new(name: purchasable.purchasable_name, price: purchasable.price, tax_exempt: purchasable.tax_exempt)
+
+            # Copy over any extended attributes that may have been created
+            atts = purchasable.dup.attributes.except('name', 'price', 'tax_exempt', 'purchased_order_id').compact
+
+            atts.each do |k, v|
+              next unless product.respond_to?("#{k}=") && product.respond_to?(k)
+              product.send("#{k}=", v) if product.send(k).blank?
+            end
+
             Effective::CartItem.new(quantity: oi.quantity, purchasable: product)
           end
         else
@@ -278,6 +295,10 @@ module Effective
       [card, '-', last4].compact.join(' ')
     end
 
+    def duplicate
+      Effective::Order.new(self)
+    end
+
     # For moneris and moneris_checkout. Just a unique value.
     def transaction_id
       [to_param, billing_name.to_s.parameterize.presence, Time.zone.now.to_i].compact.join('-')
@@ -345,6 +366,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
@@ -425,11 +454,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
@@ -477,8 +502,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
 
@@ -562,6 +587,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,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.3'.freeze
+  VERSION = '5.1.7'.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.3
+  version: 5.1.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails