effective_orders 5.1.14 → 5.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea7a1a4554f56dd9230c6d1f4c4c00ae6884fb3d61508c1c437464a9106065b
-  data.tar.gz: 846428fc00eae462dbf46f128b777ec32d22ed8f47415d0b411de9922a39dee6
+  metadata.gz: 889ffac4a7ea9e9402e87b841af4d28b6720e23f512dde7ba4f51978b3ebb045
+  data.tar.gz: 23a247aeb17a3dc13416ac428e9fdaf00bf4d58384b20f3f45d55e705924028c
 SHA512:
-  metadata.gz: f6bcd2880d585a48f68785e62f0b44e52627b68d42e1764ec642bccef8de36810314876bd26b9a24ca0216c2609fb8b8c11649d8c0b63f605f341dcf90c04444
-  data.tar.gz: cf6eced1338c660b98d2e75eca61b645899fcc6888772cef8c4184d07296ef7e3a684a8ed22c2a19231eb42d737305e0da1fcb74357a13138a8eb52f68d1813a
+  metadata.gz: cc23bc2d1e8dd91ea835e18a2e8bb2a0af4d9401b8d4dcdd178a62bf8a36f233a30287c848d97aaceb39875986f00616533d24c610dcdc328548883908e2b68e
+  data.tar.gz: 1d9c8baf3fb9f140123d7829225f4180e2d202a911f5fc695f9f39289e89af585ae60b569900b7c551ddc3e2eee40c78c4d8579975b702a41c9987c706ae24a2

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/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.14'.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.14
+  version: 5.1.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails