effective_orders 5.1.11 → 5.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ceb232058ad48722e375f9ada63ee99219ca2c6e4171ebc4be851dc5218518
-  data.tar.gz: a7ec1aabca5e20e22d834a6d9bca6a3efc277f2b2aabc03f888d274145fbaa80
+  metadata.gz: 889ffac4a7ea9e9402e87b841af4d28b6720e23f512dde7ba4f51978b3ebb045
+  data.tar.gz: 23a247aeb17a3dc13416ac428e9fdaf00bf4d58384b20f3f45d55e705924028c
 SHA512:
-  metadata.gz: d04a7b6902627945ecfae1c56b2133a3dba96b586a6f8eea8b61327de03c84c6e6cddbd374eff1b21d0030625014c5ab0471fb96ea7a37058373853d5be189c4
-  data.tar.gz: 95d763d0f61864d12fc6fde4a27f884af573ac218ea0f4947f7c00e8410308c6fd42d996519eb4b5872d19d79c67ca6ce68c5be1316468be451cf96a5f721213
+  metadata.gz: cc23bc2d1e8dd91ea835e18a2e8bb2a0af4d9401b8d4dcdd178a62bf8a36f233a30287c848d97aaceb39875986f00616533d24c610dcdc328548883908e2b68e
+  data.tar.gz: 1d9c8baf3fb9f140123d7829225f4180e2d202a911f5fc695f9f39289e89af585ae60b569900b7c551ddc3e2eee40c78c4d8579975b702a41c9987c706ae24a2

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
 
@@ -372,15 +388,20 @@ module Effective
     end
 
     def send_order_receipt_to_admin?
-      EffectiveOrders.mailer[:send_order_receipt_to_admin] && !free?
+      return false if free? && !EffectiveOrders.mailer[:send_order_receipts_when_free]
+      EffectiveOrders.mailer[:send_order_receipt_to_admin]
     end
 
     def send_order_receipt_to_buyer?
-      EffectiveOrders.mailer[:send_order_receipt_to_buyer] && !free?
+      return false if free? && !EffectiveOrders.mailer[:send_order_receipts_when_free]
+      EffectiveOrders.mailer[:send_order_receipt_to_buyer]
     end
 
     def send_payment_request_to_buyer?
-      EffectiveResources.truthy?(send_payment_request_to_buyer) && !free? && !refund?
+      return false if free? && !EffectiveOrders.mailer[:send_order_receipts_when_free]
+      return false if refund?
+
+      EffectiveResources.truthy?(send_payment_request_to_buyer)
     end
 
     def send_mark_as_paid_email_to_buyer?

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

@@ -95,6 +95,7 @@ EffectiveOrders.setup do |config|
     send_payment_request_to_buyer: true,
     send_pending_order_invoice_to_buyer: true,
     send_order_receipts_when_mark_as_paid: false,
+    send_order_receipts_when_free: false,
 
     send_subscription_event_to_admin: true,
     send_subscription_created: true,

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.1.11'.freeze
+  VERSION = '5.1.15'.freeze
 end

metadata

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