effective_orders 5.1.10 → 5.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a31f4212c1ca7b711c0d7d03b69e58c6f1e0f77511883fa78409622323367062
-  data.tar.gz: b79a13299a5ab09053ce2350f38195c6dd1eb5daf2e6bb7eda235ee521b78c39
+  metadata.gz: 9ea7a1a4554f56dd9230c6d1f4c4c00ae6884fb3d61508c1c437464a9106065b
+  data.tar.gz: 846428fc00eae462dbf46f128b777ec32d22ed8f47415d0b411de9922a39dee6
 SHA512:
-  metadata.gz: 2068342ba84af239527321d6d566c1cd81cad00e91076dafbde3e77c02c491b4f8320d622b2144ec79b875db135da434e35604b7fa9af23e709ac0516990bd39
-  data.tar.gz: 7ac19a161ebafaa92c463ebbc36d0a825c99eb4a8ccd20d5bd0d797fd91443413cb6187abe4a50820d8bdf6d565e8232e74caf788a9a7448c1ca27c9e25e1910
+  metadata.gz: f6bcd2880d585a48f68785e62f0b44e52627b68d42e1764ec642bccef8de36810314876bd26b9a24ca0216c2609fb8b8c11649d8c0b63f605f341dcf90c04444
+  data.tar.gz: cf6eced1338c660b98d2e75eca61b645899fcc6888772cef8c4184d07296ef7e3a684a8ed22c2a19231eb42d737305e0da1fcb74357a13138a8eb52f68d1813a

data/app/datatables/admin/effective_orders_datatable.rb

@@ -17,8 +17,10 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
     unless attributes[:skip_filters]
       scope :all
       scope :purchased
-      scope :deferred
-      scope :refunds
+
+      scope :deferred if EffectiveOrders.deferred_providers.present?
+      scope :refunds if EffectiveOrders.refund
+
       scope :not_purchased
     end
   end

data/app/datatables/effective_orders_datatable.rb

@@ -4,8 +4,11 @@ class EffectiveOrdersDatatable < Effective::Datatable
   filters do
     unless attributes[:not_purchased]
       scope :purchased, default: true
-      scope :deferred
-      scope :refunds
+
+      scope :deferred if EffectiveOrders.deferred_providers.present?
+      scope :refunds if EffectiveOrders.refund
+
+      scope :all
     end
   end
 

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

@@ -265,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
 

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_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,10 +5,7 @@
       = 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|
-      - if order.refund?
-        = f.hidden_field :purchased_at, value: Time.zone.now
-      - else
-        = f.date_field :purchased_at, required: true
+      = f.hidden_field :purchased_at, value: Time.zone.now
 
       = f.select :payment_provider, EffectiveOrders.payment_providers, required: true
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.1.10'.freeze
+  VERSION = '5.1.14'.freeze
 end

metadata

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