effective_orders 5.1.4 → 5.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a084a1145beb50dc672efd5506bb81e497553d73e945195f2f31ea567bbc757
-  data.tar.gz: 2743bac90f7d5f5ff4b2985b97a7404040f875fc12414e308bd188023307512c
+  metadata.gz: a32c61a739e40a41c7af3d4de0f254f8f1bf0aa673de5c98d82b404f700f1616
+  data.tar.gz: 53f2b2f8e550b45e16fc1b844f6a8ebc30336d3ee10e3ac493a3cd4de07d9b85
 SHA512:
-  metadata.gz: 2ee2c0d212855b3a7883c9ac4194b2b9b796668cdadd57778e23afdfe774fcd07f503f96b0812242bb2e0aa9f872c6a354fa2dd0d10275fc78b3787d9a09a65b
-  data.tar.gz: 2d6ae464bd99a12bfd0e3226d8a1bdb20fa04c4e7b015d185f0432c8be5a92644840a3e9a93b9f437102f5dc03ae9dcc6faa7d7589582235b55609bef976cbe9
+  metadata.gz: dc2ee60878dc3c1cb2f2f81d86462f5aae9cca2297c1e2859ef90af51ebe9f511d3db580cfd0eddbb5d788f97ff84d2f467e7b65e5dc988d03b060148f3b09a5
+  data.tar.gz: caf788b76fb2affe7ee4d5229d95c9fb62a2da798b1a7a3d981b38f9b8ba8d66f415fdefe8b3560220f3ce8441507a0273897785054e2721dbaa17bead649577

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/app/views/effective/orders/_order_notes.html.haml

@@ -11,7 +11,7 @@
       %tbody
         %tr
           - if order.note.present?
-            %td= order.note
+            %td= simple_format(order.note)
 
           - if order.note_to_buyer.present?
-            %td= order.note_to_buyer
+            %td= simple_format(order.note_to_buyer)

data/app/views/effective/orders/mark_as_paid/_form.html.haml

@@ -1,6 +1,8 @@
 .card
   .card-body
-    %h2 Admin: Mark as Paid
+    %h2
+      Admin:
+      = order.refund? ? 'Complete Refund' : 'Mark as Paid'
 
     = effective_form_with(model: order, url: effective_orders.mark_as_paid_order_path(order), method: :post) do |f|
       = f.date_field :purchased_at, required: true
@@ -21,4 +23,4 @@
 
       = f.text_area :note_to_buyer, hint: 'This message will be displayed on the receipt.'
 
-      = f.submit order_checkout_label(:mark_as_paid), center: true
+      = f.submit order_checkout_label(order.refund? ? :refund : :mark_as_paid), center: true

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.1.4'.freeze
+  VERSION = '5.1.8'.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.8
 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