effective_orders 5.1.6 → 5.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '063584ca12ed4cb46363a9c7c99f729889bf536eb0a1afb6021e04f07349532b'
-  data.tar.gz: 313908b8ff6797d96c7139a3598b6790a3fda9fb358e69a240e0ccb5afcd8569
+  metadata.gz: a31f4212c1ca7b711c0d7d03b69e58c6f1e0f77511883fa78409622323367062
+  data.tar.gz: b79a13299a5ab09053ce2350f38195c6dd1eb5daf2e6bb7eda235ee521b78c39
 SHA512:
-  metadata.gz: 71a032b3e32b4387801d3630e58df4ee9b91f890a0d87e42c1c4eacb5cb49875e7494316089c01d9d9bdf8a10e246d09caa8d4d2bb400897221661957fc63034
-  data.tar.gz: 7149e03e2c5f5f830a53f235eafd6c712213d5dd6eb4958554d752e7f8e51d124188cebe432284a8ddde462e2fd5ff7ec21999a00465220fbc9d4cb5f5a84a08
+  metadata.gz: 2068342ba84af239527321d6d566c1cd81cad00e91076dafbde3e77c02c491b4f8320d622b2144ec79b875db135da434e35604b7fa9af23e709ac0516990bd39
+  data.tar.gz: 7ac19a161ebafaa92c463ebbc36d0a825c99eb4a8ccd20d5bd0d797fd91443413cb6187abe4a50820d8bdf6d565e8232e74caf788a9a7448c1ca27c9e25e1910

data/app/models/effective/order.rb

@@ -72,7 +72,7 @@ module Effective
     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
@@ -143,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()
@@ -203,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
@@ -283,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('-')
@@ -318,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

data/app/views/effective/orders/_order_actions.html.haml

@@ -5,7 +5,7 @@
   - if order.purchased?
     = link_to 'E-mail Receipt', effective_orders.send_buyer_receipt_order_path(order),
       class: 'btn btn-secondary',
-      data: { confirm: "Send receipt to #{order.emails_send_to}?" }
+      data: { method: :post, confirm: "Send receipt to #{order.emails_send_to}?" }
 
   - if order.persisted? && EffectiveResources.authorized?(controller, :admin, :effective_orders)
     - if order.pending? || order.confirmed? || order.deferred?

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/config/routes.rb

@@ -5,7 +5,7 @@ EffectiveOrders::Engine.routes.draw do
         get :purchased
         get :deferred
         get :declined
-        get :send_buyer_receipt
+        post :send_buyer_receipt
 
         post :free
         post :mark_as_paid

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.1.6'.freeze
+  VERSION = '5.1.10'.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.6
+  version: 5.1.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails