effective_orders 5.1.8 → 5.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a32c61a739e40a41c7af3d4de0f254f8f1bf0aa673de5c98d82b404f700f1616
-  data.tar.gz: 53f2b2f8e550b45e16fc1b844f6a8ebc30336d3ee10e3ac493a3cd4de07d9b85
+  metadata.gz: 436e77b078b12d2931ad0bf50e1f8572bfb6dca3cc7b021e0a867660ddd327c2
+  data.tar.gz: 128a0aece9b52ec31d4e5ff31ddd6a66f5179aeb7078542a5a5561d662745ebd
 SHA512:
-  metadata.gz: dc2ee60878dc3c1cb2f2f81d86462f5aae9cca2297c1e2859ef90af51ebe9f511d3db580cfd0eddbb5d788f97ff84d2f467e7b65e5dc988d03b060148f3b09a5
-  data.tar.gz: caf788b76fb2affe7ee4d5229d95c9fb62a2da798b1a7a3d981b38f9b8ba8d66f415fdefe8b3560220f3ce8441507a0273897785054e2721dbaa17bead649577
+  metadata.gz: 9b567e4f3078270590a92a12c4f27326a9c525b30e3ec8b2ed9ab31bc7d34f48b0fbab6a9ba0be8d00da8fd132b5d8032072b58e8c20da74f1e9b4017601b848
+  data.tar.gz: 0127161fde74a4fb97aec8c54ade566fed751e5bfd49f9d694b6a18d64d27bdd020a4106399c11121f1a661e9f127c56368a3771c977586cdf55b542147ffa5e

data/app/mailers/effective/orders_mailer.rb

@@ -43,7 +43,7 @@ module Effective
         @order = (order_param.kind_of?(Effective::Order) ? order_param : Effective::Order.find(order_param))
         @user = @order.user
 
-        @subject = subject_for(@order, :payment_request_to_buyer, "Request for Payment: Invoice ##{@order.to_param}")
+        @subject = subject_for(@order, :payment_request_to_buyer, "Payment request - Order ##{@order.to_param}")
 
         mail({to: @order.email, cc: @order.cc, subject: @subject}.compact)
       end

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()
@@ -264,14 +265,30 @@ module Effective
     end
 
     def label
-      if refund?
-        "Refund"
+      if refund? && purchased?
+        'Refund'
       elsif purchased?
-        "Receipt"
-      elsif pending?
-        "Pending Order"
+        'Receipt'
+      elsif refund? && (pending? || confirmed?)
+        'Pending Refund'
+      elsif (pending? || confirmed?)
+        'Pending Order'
       else
-        "Order"
+        'Order'
+      end
+    end
+
+    def total_label
+      if refund? && purchased?
+        'Total Paid'
+      elsif purchased?
+        'Total Paid'
+      elsif refund? && (pending? || confirmed?)
+        'Total Due'
+      elsif (pending? || confirmed?)
+        'Total Due'
+      else
+        'Total'
       end
     end
 
@@ -334,6 +351,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/admin/orders/_datatable_actions.html.haml

@@ -6,7 +6,7 @@
 
   - if order.purchased?
     = dropdown_link_to 'Email receipt to buyer', effective_orders.send_buyer_receipt_order_path(order),
-      data: { confirm: "Send receipt to #{order.emails_send_to}?" }
+      data: { method: :post, confirm: "Send receipt to #{order.emails_send_to}?" }
 
   - if order.pending? || order.confirmed? || order.deferred?
     = dropdown_link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),

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_items.html.haml

@@ -62,11 +62,6 @@
             %th.download
 
           %th.total
-            - if order.pending?
-              Amount Due
-            - elsif order.purchased?
-              Amount Paid
-            - else
-              Total
+            = order.total_label
 
           %td.price.total-price= price_to_currency(order.total)

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

@@ -5,7 +5,10 @@
       = 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
 
@@ -23,4 +26,4 @@
 
       = f.text_area :note_to_buyer, hint: 'This message will be displayed on the receipt.'
 
-      = f.submit order_checkout_label(order.refund? ? :refund : :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.8'.freeze
+  VERSION = '5.1.12'.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.8
+  version: 5.1.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails