effective_orders 5.1.13 → 5.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d17fbe687d0cbbb9a8bea76c5a537d26edd929655f7ca620266ea9c9de1935f2
-  data.tar.gz: 49d1e34f960ce258483823bab108460344934bd6d4d3666655e523a56458f729
+  metadata.gz: fa911b81a28b5ad8ba481ed1703a6836962c8e7f518aa32867c4cb7ab0d69ea4
+  data.tar.gz: 4057277fcb79978c3f683bfdbabec721ae11d9f4672e4b083633772b6eef63bc
 SHA512:
-  metadata.gz: e6aca42047832dbf391eeca8ac2f8fb6a896900ccc6e4e418b1463c3814c98f00838be8dcbfe26a2f7a065554f9f89537fbbd02cd1a01ebabdea1fe404a5abfa
-  data.tar.gz: 536e053ad280f5c755524414e1510a7be9cd270166fb50514299125d2a54b8c313ff1fd71265957816fb1a957e446aa51d01ea70cd439aa3effc0e8fa87ee1f9
+  metadata.gz: 4cc8f8c2f82922a70241ed058cfc9f77bd501d18ef5f04728a7a894ec12877910027c86b24bdeb272227fea33c2c8615fc8e2b848289d49c51393a918baab2e5
+  data.tar.gz: 42f600c039c5d304e11856fcfa609ce6c99a2a43de0453f095b3f5d6f23657bf7a22f1146fe43fe9d87cface7bbabf3ec2d5164bb9d3fe7a0defb22be7553852

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

@@ -68,8 +68,8 @@ module Effective
     before_validation { assign_order_totals }
     before_validation { assign_billing_name }
     before_validation { assign_email }
-    before_validation { assign_last_address }
     before_validation { assign_user_address }
+    before_validation { assign_last_address }
 
     before_validation(if: -> { confirmed_checkout }) do
       assign_attributes(state: EffectiveOrders::CONFIRMED) if pending?
@@ -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/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.13'.freeze
+  VERSION = '5.1.17'.freeze
 end

metadata

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