effective_orders 5.1.12 → 5.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 436e77b078b12d2931ad0bf50e1f8572bfb6dca3cc7b021e0a867660ddd327c2
-  data.tar.gz: 128a0aece9b52ec31d4e5ff31ddd6a66f5179aeb7078542a5a5561d662745ebd
+  metadata.gz: 10fa799dadd79ae6192722a7d29f480ad372d365c4c295ad20caba9333adf870
+  data.tar.gz: 50bef2fb6897946ef1c4cfd5ea4f1ec1206f7c6c7bdbcd5f2c870e74df4f64ff
 SHA512:
-  metadata.gz: 9b567e4f3078270590a92a12c4f27326a9c525b30e3ec8b2ed9ab31bc7d34f48b0fbab6a9ba0be8d00da8fd132b5d8032072b58e8c20da74f1e9b4017601b848
-  data.tar.gz: 0127161fde74a4fb97aec8c54ade566fed751e5bfd49f9d694b6a18d64d27bdd020a4106399c11121f1a661e9f127c56368a3771c977586cdf55b542147ffa5e
+  metadata.gz: 30618483d585285861731af2412da46038280c262ce8b505eccf28c8cbd299cbade02cc23e591a93a356f4da7dff7e841befce1f2e79700c07e2d9be5a184952
+  data.tar.gz: 94e91ea2d22d080468617a22327bfd3122e092d5f8e347abe5fb571ab7ffda771d2f67a0ed1ae71b971380a38e514bb58c3d54bc9ba39639aa929cc536fef9d7

data/app/controllers/effective/providers/free.rb

@@ -20,8 +20,7 @@ module Effective
           payment: 'free order. no payment required.',
           provider: 'free',
           card: 'none',
-          purchased_url: free_params[:purchased_url],
-          email: false
+          purchased_url: free_params[:purchased_url]
         )
       end
 

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/models/effective/order.rb

@@ -388,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/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.12'.freeze
+  VERSION = '5.1.16'.freeze
 end

metadata

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