effective_orders 6.25.3 → 6.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5810f60d95e3a7f06f066b6c1204bdb2a20b0d3b7a7700207d028c761d299ca
-  data.tar.gz: e97c1d2b731673006b4c262c2a81798c084412ddce20425a60dc6fa4eca83438
+  metadata.gz: 5a6cc64b4d3c8818b17aef520b1f2df8d2fae53fd356a23d5894173dc8e8a912
+  data.tar.gz: 7ff8238897bd82324aa3371edf338b3990ce86799b370f8e14bbf3a24b040acd
 SHA512:
-  metadata.gz: 1e7960a6685d4b047fd2d2b1de5c2376c13e54ac923e39050933cd3e24bd277f7d035be070dd2e77118fd6670a15bd6c0950a54a9007cc28ff21fa4725aad6a8
-  data.tar.gz: 18dea18d2282f8a003c5706b5466b3738253bf417bffbd8b8ab6a5b4189155102487a52267c61556c73091edcb0d709569275df0c5f8eaa04ac321111e8a1fc4
+  metadata.gz: d2edd3b449476638442508c6e5bd7866200b0b5af446a7b637359a8e22bf34ff7424c7ac53ba8ce62727fdbd90e80fcf5002ad3d8a409bb403c779c166bf2475
+  data.tar.gz: 5d00adeedb3939c46283b4cc0335ce4301f587dc44ce9675216cec68b1cffcfef92eebab40b917039e86acac13a65bd018a98ab55344a8a2229ecdde3ffebec4

data/app/controllers/admin/orders_controller.rb

@@ -16,7 +16,7 @@ module Admin
 
     submit :save, 'Save', success: -> {
       message = flash_success(resource, params[:action])
-      message << ". A request for payment has been sent to #{resource.emails_send_to}" if resource.send_payment_request_to_buyer?
+      message << ". A request for payment has been sent to #{resource.emails_send_to}" if resource.send_payment_request?
       message
     }
 
@@ -78,7 +78,7 @@ module Admin
       @order = Effective::Order.deep.was_not_purchased.find(params[:id])
       authorize_effective_order!
 
-      if @order.send_payment_request_to_buyer!
+      if @order.send_payment_request!
         flash[:success] = "A request for payment has been sent to #{@order.emails_send_to}"
       else
         flash[:danger] = 'Unable to send payment request'
@@ -93,7 +93,7 @@ module Admin
       begin
         authorize_effective_order!
 
-        @orders.each { |order| order.send_payment_request_to_buyer! }
+        @orders.each { |order| order.send_payment_request! }
         render json: { status: 200, message: "Successfully sent #{@orders.length} payment request emails"}
       rescue Exception => e
         render json: { status: 500, message: "Bulk send payment request error: #{e.message}" }

data/app/datatables/admin/effective_orders_datatable.rb

@@ -10,7 +10,7 @@ module Admin
 
         bulk_action(
           'Send invoice email to selected purchased orders',
-          effective_orders.bulk_send_order_email_to_buyer_orders_path,
+          effective_orders.bulk_send_order_email_orders_path,
           data: { confirm: 'Send invoice emails?' }
         )
       end

data/app/mailers/effective/orders_mailer.rb

@@ -26,7 +26,7 @@ module Effective
       raise('expected an Effective::Order') unless resource.kind_of?(Effective::Order)
 
       @order = resource
-      @order_email = Effective::OrderEmail.new(resource)
+      @order_email = Effective::OrderEmail.new(resource, opts)
 
       subject = subject_for(__method__, @order_email.subject, @order, opts)
       headers = headers_for(@order, opts)

data/app/models/effective/order.rb

@@ -43,7 +43,7 @@ module Effective
     attr_accessor :confirmed_checkout   # Set on the Checkout Step 1
 
     # Settings in the /admin action forms
-    attr_accessor :send_payment_request_to_buyer # Set by Admin::Orders#new. Should the payment request email be sent after creating an order?
+    attr_accessor :send_payment_request # Set by Admin::Orders#new. Should the payment request email be sent after creating an order?
     attr_accessor :send_mark_as_paid_email_to_buyer  # Set by Admin::Orders#mark_as_paid
     attr_accessor :skip_buyer_validations # Set by Admin::Orders#create
     attr_accessor :mailer_preview # Set by the mailer preview. Disabled delayed payment validations
@@ -635,16 +635,17 @@ module Effective
       self.addresses.clear if addresses.any? { |address| address.valid? == false }
       save!
 
-      if send_payment_request_to_buyer?
-        after_commit { send_payment_request_to_buyer! }
+      if send_payment_request?
+        after_commit { send_payment_request! }
       end
 
       true
     end
 
-    # Used by admin checkout only
+    # Used to indicate the order has a billing address and is ready for checkout
     def confirm!
       return false if purchased?
+      return save! if deferred?
       confirmed!
     end
 
@@ -892,6 +893,7 @@ module Effective
       false
     end
 
+    # Used internally to send emails to the buyer or admin depending on order status
     def send_order_emails!
       return false if skip_order_emails?
 
@@ -910,18 +912,24 @@ module Effective
       end
     end
 
-    def send_payment_request_to_buyer?
-      EffectiveResources.truthy?(send_payment_request_to_buyer)
+    def send_payment_request?
+      EffectiveResources.truthy?(send_payment_request)
     end
 
     # Admin datatable action
-    def send_payment_request_to_buyer!
-      EffectiveOrders.send_email(:order_email, self, payment_request: true) unless (purchased? || refund?)
+    def send_payment_request!
+      return if (purchased_or_deferred? || refund?)
+
+      EffectiveOrders.send_email(:order_email, self, payment_request: true)
+      EffectiveOrders.send_email(:order_email_to_admin, self, payment_request: true) if EffectiveOrders.send_payment_request_to_admin
     end
 
     # Admin datatable action
-    def send_order_email_to_buyer!
-      EffectiveOrders.send_email(:order_email, self) if purchased_or_deferred?
+    def send_order_email!
+      return unless purchased_or_deferred?
+
+      EffectiveOrders.send_email(:order_email, self)
+      EffectiveOrders.send_email(:order_email_to_admin, self) if EffectiveOrders.send_order_receipt_to_admin
     end
 
     def log_changes_formatted_value(attribute, value)

data/app/views/admin/orders/_form_order.html.haml

@@ -17,9 +17,9 @@
   = f.email_cc_field :cc, hint: "Cc the above on any emailed receipts or payment requests."
 
   - if f.object.new_record?
-    = f.check_box :send_payment_request_to_buyer,
+    = f.check_box :send_payment_request,
       label: 'Yes, send a payment request email to the buyer and any cc.',
-      value: (f.object.send_payment_request_to_buyer.nil? ? EffectiveOrders.send_payment_request_to_buyer : f.object.send_payment_request_to_buyer?)
+      value: (f.object.send_payment_request.nil? ? EffectiveOrders.send_payment_request_to_buyer : f.object.send_payment_request?)
 
   %hr
 

data/app/views/effective/orders/_datatable_actions.html.haml

@@ -4,6 +4,6 @@
   - else
     = dropdown_link_to 'View', effective_orders.order_path(order)
 
-  - if EffectiveResources.authorized?(controller, :send_order_email_to_buyer, order)
-    = dropdown_link_to 'E-mail Receipt', effective_orders.send_order_email_to_buyer_order_path(order),
+  - if EffectiveResources.authorized?(controller, :send_order_email, order)
+    = dropdown_link_to 'E-mail Receipt', effective_orders.send_order_email_order_path(order),
       data: { method: :post, confirm: "Send receipt to #{order.emails.first}?" }

data/app/views/effective/orders/edit.html.haml

@@ -1,4 +1,4 @@
 = render 'layout' do
   %h1.effective-heading= @page_title
 
-  = render_checkout_step1(@order)
+  .mb-4= render_checkout_step1(@order)

data/config/effective_orders.rb

@@ -106,9 +106,9 @@ EffectiveOrders.setup do |config|
   config.send_order_declined_to_admin = false
   config.send_order_declined_to_buyer = false
   config.send_payment_request_to_buyer = true
-  config.send_pending_order_invoice_to_buyer = true
-  config.send_refund_notification_to_admin = true
+  config.send_payment_request_to_admin = true
 
+  config.send_refund_notification_to_admin = true
   config.send_order_receipts_when_mark_as_paid = true
   config.send_order_receipts_when_free = true
 

data/config/locales/effective_orders.en.yml

@@ -6,8 +6,8 @@ en:
   activerecord:
     actions:
       effective/order:
-        send_order_email_to_buyer: 'Send order email'
-        send_order_email_to_buyer_confirm: 'Send order email to @resource.emails_send_to?'
+        send_order_email: 'Send order email'
+        send_order_email_confirm: 'Send order email to @resource.emails_send_to?'
 
   datatables:
     admin/report_transactions_datatable: 'Report: Individual Transactions'

data/config/routes.rb

@@ -7,7 +7,7 @@ EffectiveOrders::Engine.routes.draw do
         get :purchased
         get :deferred
         get :declined
-        post :send_order_email_to_buyer
+        post :send_order_email
 
         post :cheque
         post :deluxe              # 1-off payment and purchase
@@ -25,7 +25,7 @@ EffectiveOrders::Engine.routes.draw do
       end
 
       collection do
-        post :bulk_send_order_email_to_buyer
+        post :bulk_send_order_email
 
         post :moneris_postback
         post :paypal_postback
@@ -56,7 +56,7 @@ EffectiveOrders::Engine.routes.draw do
     resources :orders do
       member do
         post :send_payment_request
-        post :send_order_email_to_buyer
+        post :send_order_email
 
         delete :void
         post :unvoid

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.25.3'.freeze
+  VERSION = '6.26.0'.freeze
 end

data/lib/effective_orders.rb

@@ -36,7 +36,7 @@ module EffectiveOrders
       # Emails
       :send_order_receipt_to_admin, :send_order_receipt_to_buyer, 
       :send_order_declined_to_admin, :send_order_declined_to_buyer, 
-      :send_payment_request_to_buyer, :send_pending_order_invoice_to_buyer,
+      :send_payment_request_to_admin, :send_payment_request_to_buyer,
       :send_order_receipts_when_mark_as_paid, :send_order_receipts_when_free,
       :send_subscription_events,
       :send_subscription_trialing, :send_subscription_trial_expired,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.25.3
+  version: 6.26.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-23 00:00:00.000000000 Z
+date: 2025-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails