effective_orders 6.18.0 → 6.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0559a1dd68e0c43937ccf7a6e13c0f4e8f54c0bf79382744a360f5151b613340'
-  data.tar.gz: 1ae3981f93b86d70bc6706b7688351d3ea555aa9700265e9dc62616eb449f96c
+  metadata.gz: 30573ea76732efc461d77ac72855675f2a8de7010a81e9d651fafaceb86c75c5
+  data.tar.gz: 605bb5659cb3b7faf9e0940ed59367b3abfc09535f9f42dcb4048594f1408c09
 SHA512:
-  metadata.gz: 4e44abc94fabf240ca5d7c8d446c362f2aca1e59afffc55724753471499acec7fb9bf52d6e6a78469a7763f820c659dfb4a033a80bc09f6452d498fce9283b80
-  data.tar.gz: c648c5762abbb8b39842e1424a78631e614128404ffe73859232bc350d619ba4df5a5da1e22f3632bf357b94b4a8dd66ece50d1b080272903f5b124a500684ed
+  metadata.gz: 4f14a09c4ea459f96eb727ac1b7bd8249e1fd42f087a1afca09e3c5705837ddb5ff7b859ab81e654a1e1607f5e4875a82ae8df58c846b50cef79b0296ce9e809
+  data.tar.gz: c2863834450dad29c443746f3dc4c0db11115ffb03796dd4e35d99d707e12bc81c15cc7d609625dd9ae222f42e276e8d8aa046c089fb0572b66862efa23ceb61

data/app/mailers/effective/orders_mailer.rb

@@ -59,7 +59,8 @@ module Effective
       mail(to: @order.emails, cc: @order.cc.presence, subject: subject, **headers)
     end
 
-    # This is sent when someone chooses to Pay by Cheque
+    # This is sent when someone chooses to Pay by Cheque or Pay by E-transfer
+    # This is not automatically sent for a delayed purchase
     def pending_order_invoice_to_buyer(resource, opts = {})
       raise('expected an Effective::Order') unless resource.kind_of?(Effective::Order)
 
@@ -67,7 +68,9 @@ module Effective
       subject = subject_for(__method__, "Pending Order: ##{@order.to_param}", resource, opts)
       headers = headers_for(resource, opts)
 
-      mail(to: @order.emails, cc: @order.cc.presence, subject: subject, **headers)
+      cc = (@order.cc.to_s.split(',') + [mailer_admin] - [nil, '', ' ']).compact.presence
+
+      mail(to: @order.emails, cc: cc, subject: subject, **headers)
     end
 
     # This is sent to admin when someone Accepts Refund

data/app/models/effective/order.rb

@@ -475,6 +475,10 @@ module Effective
       false
     end
 
+    def purchased_or_deferred?
+      purchased? || deferred?
+    end
+
     def purchased_with_credit_card?
       purchased? && EffectiveOrders.credit_card_payment_providers.include?(payment_provider)
     end
@@ -811,7 +815,7 @@ module Effective
 
       raise "Failed to defer order: #{error || errors.full_messages.to_sentence}" unless error.nil?
 
-      send_payment_request_to_buyer! if email
+      send_pending_order_invoice_to_buyer! if email
 
       true
     end

data/app/views/effective/orders_mailer/pending_order_invoice_to_buyer.html.haml

@@ -2,12 +2,22 @@
 
 %p We have received notice of your intention to purchase the following items.
 
-%p Please remit payment at your earliest convenience.
+- if @order.delayed?
+  %p{style: "margin-bottom: 4px; font-weight: bold;"} Please note:
+  %ul{style: "margin-top: 0;"}
+    %li Your credit card will be charged on <strong>#{@order.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>.
+    %li Changes and cancellations must be made before this date.
+    %li A receipt will be sent after the transaction is completed.
 
-%p #{link_to('Click here', effective_orders.order_url(@order))} to review your order online.
+- elsif @order.deferred?
+  %p Please remit payment at your earliest convenience.
 
-- if EffectiveOrders.deferred_providers.present?
-  - providers = EffectiveOrders.deferred_providers.to_sentence(last_word_connector: ', or', two_words_connector: ' or ')
-  %p When we receive your #{providers} we will mark your order paid.
+  - if EffectiveOrders.deferred_providers.present?
+    - providers = EffectiveOrders.deferred_providers.to_sentence(last_word_connector: ', or', two_words_connector: ' or ')
+    %p When we receive your #{providers} we will mark your order paid.
 
 = render(@order, no_order_actions: true)
+
+%hr
+%p{style: "text-align: center;"}
+  = link_to('View your order', effective_orders.order_url(@order))

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.18.0'.freeze
+  VERSION = '6.18.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.18.0
+  version: 6.18.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails