effective_orders 5.1.5 → 5.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fd6793f180e1b0106c700cef6aacc0363cf7b2e3c76389e53db1301e6bac4e
-  data.tar.gz: 9fca2375abb56fd3052d2c098324f0dd6eb3d675772700f8ee792a12e54b39a6
+  metadata.gz: aebed7dcf8c4b8c6e754b4425d407020ab7e3078baa82e0e5ddb10d748041d74
+  data.tar.gz: a834e0574e803ad7af2e568395814a3fc7e2b129953dcc37e52bea17bae1a963
 SHA512:
-  metadata.gz: 5c33291651b6c2e6789040feca6573827a2f61f64b1b6553692ebfc4b45382949f0814b5257bfa7fc3d65d461b8a36bf01051565acf06474638a9f9771268d4b
-  data.tar.gz: 51155ef9663bc5912b70c7c9be2232a55aa4d7565eeaf19eca83eea7f216b1d809d998259f347a2fc643755215792c323e3b7e8eb4ffd6c5b2f733899f407604
+  metadata.gz: b4162e7ec6328b52f4dc36b3a79199966980948cc8dbb9612a460105e4f9682c70586424be157baf897b07f501bff158499e80f3c77ea7f229b3351fa9bc9d61
+  data.tar.gz: 27eff0b3035f2dbaf1e426aa7337a933b8f90ef44e88da04eac4fab0ba77f3d7d8ea3695b6bd3cf6e7d42f933f5186868076e45fb25c66717b1d8e423401883d

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,9 +69,10 @@ 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?
+      assign_attributes(state: EffectiveOrders::CONFIRMED) if pending?
     end
 
     before_save(if: -> { state_was == EffectiveOrders::PURCHASED }) do
@@ -142,6 +143,7 @@ module Effective
     scope :confirmed, -> { where(state: EffectiveOrders::CONFIRMED) }
     scope :deferred, -> { where(state: EffectiveOrders::DEFERRED) }
     scope :declined, -> { where(state: EffectiveOrders::DECLINED) }
+    scope :abandoned, -> { where(state: EffectiveOrders::ABANDONED) }
     scope :refunds, -> { purchased.where('total < ?', 0) }
 
     # Effective::Order.new()
@@ -156,30 +158,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 +204,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 +296,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('-')
@@ -313,6 +335,10 @@ module Effective
       state == EffectiveOrders::DECLINED
     end
 
+    def abandoned?
+      state == EffectiveOrders::ABANDONED
+    end
+
     def purchasables
       order_items.map { |order_item| order_item.purchasable }
     end
@@ -345,6 +371,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 +459,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 +507,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 +592,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/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,9 +1,14 @@
 .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
+      - if order.refund?
+        = f.hidden_field :purchased_at, value: Time.zone.now
+      - else
+        = f.date_field :purchased_at, required: true
 
       = f.select :payment_provider, EffectiveOrders.payment_providers, required: true
 
@@ -21,4 +26,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 'Admin: ' + order_checkout_label(order.refund? ? :refund : :mark_as_paid)

data/lib/effective_orders/version.rb

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

data/lib/effective_orders.rb

@@ -10,7 +10,16 @@ module EffectiveOrders
   DEFERRED = 'deferred'      # Deferred providers. Cheque or Phone was selected.
   PURCHASED = 'purchased'    # Purchased by provider
   DECLINED = 'declined'      # Declined by provider
-  STATES = { PENDING => PENDING, CONFIRMED => CONFIRMED, DEFERRED => DEFERRED, PURCHASED => PURCHASED, DECLINED => DECLINED }
+  ABANDONED = 'abandoned'    # Not set by this gem. Can be set outside it.
+
+  STATES = {
+    PENDING => PENDING,
+    CONFIRMED => CONFIRMED,
+    DEFERRED => DEFERRED,
+    PURCHASED => PURCHASED,
+    DECLINED => DECLINED,
+    ABANDONED => ABANDONED
+  }
 
   # Subscription statuses (as per stripe)
   ACTIVE = 'active'

metadata

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