effective_orders 6.19.7 → 6.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c7744d975158314e5a8aae78d2b52b4ff6e5a4831183a0f2a40263289f8cb5
-  data.tar.gz: dc0fc3c30d79d8f24a9fef4eee5e2ee6eb74dae923135e4322f94b362efa4d30
+  metadata.gz: 5266c20d5867e006a46275ad40820436f7401b7355f9ed5fb196aedee94180d3
+  data.tar.gz: 5469f434c36294e847718c1bcdbd92d04778ab1dd658784819fb21e99bc02902
 SHA512:
-  metadata.gz: 57cbc4ca5b87d853028a3565da0ee861fb5017f4c5c453ce36f4185cbf9f22c5b42c8cc2109a17aad3ee20d2104a43e8fb635050a587adfa2d6c4ac52adee87a
-  data.tar.gz: 89b5deb6aebee4e5c5bee096538ac1fb516e7b08ca815eea891dba7ccff8caf20c7383de5c2fae21839feb3dbb3e92b068c96aab1d38e384cdd4e5455d9b41e4
+  metadata.gz: 38b74f58fe8cd5ec06a8eadeecaa8bfc115aa16190f642ba9b6e0893f86261e022625e0bc800282bf95eb0cb6c9ec8eeb93b17c40838a97f28c62c25b671d08b
+  data.tar.gz: 6eb685f21f1b99a421831b5cf188650b2e7447149fcf1f8d799c5ebb203b42f5868e9519102d6cf4aa1ffbdea66dc679121e435c7aebcd2300715df9a6fcca6e

data/app/controllers/effective/concerns/purchase.rb

@@ -21,7 +21,7 @@ module Effective
         Effective::Cart.where(user: @order.current_user).destroy_all if @order.current_user.present?
 
         if flash[:success].blank?
-          if email && @order.send_order_receipt_to_buyer?
+          if email && EffectiveOrders.send_order_receipt_to_buyer
             flash[:success] = "Payment successful! A receipt has been sent to #{@order.email}"
           else
             flash[:success] = "Payment successful! An email receipt has not been sent."
@@ -49,7 +49,7 @@ module Effective
         redirect_to deferred_url.gsub(':id', @order.to_param.to_s)
       end
 
-      def order_delayed(payment:, payment_intent:, provider:, card: 'none', email: false, deferred_url: nil)
+      def order_delayed(payment:, payment_intent:, provider:, card: 'none', email: true, deferred_url: nil)
         @order.delay!(payment: payment, payment_intent: payment_intent, provider: provider, card: card, email: email)
 
         Effective::Cart.where(user: @order.current_user).destroy_all if @order.current_user.present?

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

@@ -18,7 +18,7 @@ module Effective
           payment: 'mark as paid',
           provider: mark_as_paid_params[:payment_provider],
           card: mark_as_paid_params[:payment_card],
-          email: @order.send_mark_as_paid_email_to_buyer?,
+          email: EffectiveResources.truthy?(mark_as_paid_params[:send_mark_as_paid_email_to_buyer]),
           skip_buyer_validations: true,
           purchased_url: effective_orders.admin_order_path(@order)
         )

data/app/datatables/admin/effective_orders_datatable.rb

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

data/app/mailers/effective/orders_mailer.rb

@@ -3,74 +3,35 @@ module Effective
     include EffectiveMailer
 
     helper EffectiveOrdersHelper
+    helper EffectiveEventsHelper if defined?(EffectiveEventsHelper)
 
-    def order_receipt_to_admin(resource, opts = {})
+    # This is the new order email
+    # It's sent from like 15 different places in 15 different ways
+    # Has to be aware of events and registrations, applicants, renewals, etc
+    # Has to be aware of deferred payments, delayed payments, requests for payment, purchased, declined etc
+    def order_email(resource, opts = {})
       raise('expected an Effective::Order') unless resource.kind_of?(Effective::Order)
 
       @order = resource
-      subject = subject_for(__method__, "Order Receipt: ##{@order.to_param}", resource, opts)
-      headers = headers_for(resource, opts)
-
-      mail(to: mailer_admin, subject: subject, **headers)
-    end
-
-    def order_receipt_to_buyer(resource, opts = {})
-      raise('expected an Effective::Order') unless resource.kind_of?(Effective::Order)
-
-      @order = resource
-      subject = subject_for(__method__, "Order Receipt: ##{@order.to_param}", resource, opts)
-      headers = headers_for(resource, opts)
+      @order_email = Effective::OrderEmail.new(resource, opts)
 
-      # Just to the purchaser. Not everyone.
-      mail(to: @order.emails.first, cc: @order.cc.presence, subject: subject, **headers)
-    end
-
-    def order_declined_to_admin(resource, opts = {})
-      raise('expected an Effective::Order') unless resource.kind_of?(Effective::Order)
-
-      @order = resource
-      subject = subject_for(__method__, "Declined Order: ##{@order.to_param}", resource, opts)
-      headers = headers_for(resource, opts)
-
-      mail(to: mailer_admin, subject: subject, **headers)
-    end
-
-    def order_declined_to_buyer(resource, opts = {})
-      raise('expected an Effective::Order') unless resource.kind_of?(Effective::Order)
-
-      @order = resource
-      subject = subject_for(__method__, "Declined Order: ##{@order.to_param}", resource, opts)
-      headers = headers_for(resource, opts)
-
-      # Just to the purchaser. Not everyone.
-      mail(to: @order.emails.first, cc: @order.cc.presence, subject: subject, **headers)
-    end
-
-    # This is sent when an admin creates a new order or /admin/orders/new
-    # Or when Pay by Cheque or Pay by Phone (deferred payments)
-    # Or uses the order action Send Payment Request
-    def payment_request_to_buyer(resource, opts = {})
-      raise('expected an Effective::Order') unless resource.kind_of?(Effective::Order)
-
-      @order = resource
-      subject = subject_for(__method__, "Payment request - Order ##{@order.to_param}", resource, opts)
-      headers = headers_for(resource, opts)
+      subject = subject_for(__method__, @order_email.subject, @order, opts)
+      headers = headers_for(@order, opts)
 
-      mail(to: @order.emails, cc: @order.cc.presence, subject: subject, **headers)
+      mail(to: @order_email.to, cc: @order_email.cc, subject: subject, **headers)
     end
 
-    # 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 = {})
+    # Same as above but sent to admin
+    def order_email_to_admin(resource, opts = {})
       raise('expected an Effective::Order') unless resource.kind_of?(Effective::Order)
 
       @order = resource
-      subject = subject_for(__method__, "Pending Order: ##{@order.to_param}", resource, opts)
-      headers = headers_for(resource, opts)
+      @order_email = Effective::OrderEmail.new(resource)
 
-      cc = (@order.cc.to_s.split(',') + [mailer_admin] - [nil, '', ' ']).compact.presence
+      subject = subject_for(__method__, @order_email.subject, @order, opts)
+      headers = headers_for(@order, opts)
 
-      mail(to: @order.emails, cc: cc, subject: subject, **headers)
+      mail(to: mailer_admin, subject: subject, **headers)
     end
 
     # This is sent to admin when someone Accepts Refund
@@ -84,6 +45,8 @@ module Effective
       mail(to: mailer_admin, subject: subject, **headers)
     end
 
+    #### OLD EMAILS ####
+
     # Sent by the invoice.payment_succeeded webhook event
     def subscription_payment_succeeded(resource, opts = {})
       raise('expected an Effective::Customer') unless resource.kind_of?(Effective::Customer)

data/app/models/effective/order.rb

@@ -46,6 +46,7 @@ module Effective
     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_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
 
     # If we want to use orders in a has_many way
     belongs_to :parent, polymorphic: true, optional: true
@@ -251,7 +252,7 @@ module Effective
       validates :payment_provider, presence: true
 
       validate do
-        unless deferred_payment_provider? || delayed_payment_provider?
+        unless deferred_payment_provider? || delayed_payment_provider? || mailer_preview
           errors.add(:payment_provider, "unknown deferred payment provider") 
         end
       end
@@ -611,41 +612,6 @@ module Effective
       present_order_items.map { |oi| oi.quantity }.sum
     end
 
-    def send_order_receipt_to_admin?
-      return false if free? && !EffectiveOrders.send_order_receipts_when_free
-      EffectiveOrders.send_order_receipt_to_admin
-    end
-
-    def send_order_receipt_to_buyer?
-      return false if free? && !EffectiveOrders.send_order_receipts_when_free
-      EffectiveOrders.send_order_receipt_to_buyer
-    end
-
-    def send_order_declined_to_admin?
-      return false if free? && !EffectiveOrders.send_order_receipts_when_free
-      EffectiveOrders.send_order_declined_to_admin
-    end
-
-    def send_order_declined_to_buyer?
-      return false if free? && !EffectiveOrders.send_order_receipts_when_free
-      EffectiveOrders.send_order_declined_to_buyer
-    end
-
-    def send_payment_request_to_buyer?
-      return false if free? && !EffectiveOrders.send_order_receipts_when_free
-      return false if refund?
-
-      EffectiveResources.truthy?(send_payment_request_to_buyer)
-    end
-
-    def send_refund_notification_to_admin?
-      return false unless refund?
-      EffectiveOrders.send_refund_notification_to_admin
-    end
-
-    def send_mark_as_paid_email_to_buyer?
-      EffectiveResources.truthy?(send_mark_as_paid_email_to_buyer)
-    end
 
     def skip_buyer_validations?
       EffectiveResources.truthy?(skip_buyer_validations)
@@ -662,7 +628,7 @@ module Effective
       self.addresses.clear if addresses.any? { |address| address.valid? == false }
       save!
 
-      if send_payment_request_to_buyer?
+      if EffectiveResources.truthy?(send_payment_request_to_buyer)
         after_commit { send_payment_request_to_buyer! }
       end
 
@@ -752,7 +718,7 @@ module Effective
         raise(e)
       end
 
-      send_order_receipts! if email
+      send_order_emails! if email
       after_commit { sync_quickbooks!(skip: skip_quickbooks) }
 
       true
@@ -777,9 +743,9 @@ module Effective
 
     # This was submitted via the deluxe_delayed provider checkout
     # This is a special case of a deferred provider. We require the payment_intent and payment info
-    def delay!(payment:, payment_intent:, provider:, card:, email: false, validate: true)
+    def delay!(payment:, payment_intent:, provider:, card:, email: true, validate: true)
       raise('expected payment intent to be a String') unless payment_intent.kind_of?(String)
-      raise('expected a delayed payment provider') unless EffectiveOrders.delayed_providers.include?(provider)
+      raise('expected a delayed payment provider') unless EffectiveOrders.delayed_providers.include?(provider) || mailer_preview
       raise('expected a delayed payment order with a delayed_payment_date') unless delayed_payment? && delayed_payment_date.present?
 
       assign_attributes(
@@ -832,7 +798,7 @@ module Effective
 
       raise "Failed to defer order: #{error || errors.full_messages.to_sentence}" unless error.nil?
 
-      send_pending_order_invoice_to_buyer! if email
+      send_order_emails! if email
 
       true
     end
@@ -873,7 +839,7 @@ module Effective
 
       raise "Failed to decline order: #{error || errors.full_messages.to_sentence}" unless error.nil?
 
-      send_declined_notifications! if email
+      send_order_emails! if email
 
       true
     end
@@ -913,44 +879,30 @@ module Effective
       (emails + [cc.presence]).compact.uniq.to_sentence
     end
 
-    def send_order_receipts!
-      send_order_receipt_to_admin! if send_order_receipt_to_admin?
-      send_order_receipt_to_buyer! if send_order_receipt_to_buyer?
-      send_refund_notification! if send_refund_notification_to_admin?
-    end
-
-    def send_declined_notifications!
-      send_order_declined_to_admin! if send_order_declined_to_admin?
-      send_order_declined_to_buyer! if send_order_declined_to_buyer?
-    end
-
-    def send_order_declined_to_admin!
-      EffectiveOrders.send_email(:order_declined_to_admin, self) if declined?
-    end
-
-    def send_order_declined_to_buyer!
-      EffectiveOrders.send_email(:order_declined_to_buyer, self) if declined?
-    end
+    def send_order_emails!
+      if purchased_or_deferred? && (!free? || EffectiveOrders.send_order_receipts_when_free)
+        EffectiveOrders.send_email(:order_email, self) if EffectiveOrders.send_order_receipt_to_buyer
+        EffectiveOrders.send_email(:order_email_to_admin, self) if EffectiveOrders.send_order_receipt_to_admin
+      end
 
-    def send_order_receipt_to_admin!
-      EffectiveOrders.send_email(:order_receipt_to_admin, self) if purchased?
-    end
+      if declined?
+        EffectiveOrders.send_email(:order_email, self) if EffectiveOrders.send_order_declined_to_buyer
+        EffectiveOrders.send_email(:order_email_to_admin, self) if EffectiveOrders.send_order_declined_to_admin
+      end
 
-    def send_order_receipt_to_buyer!
-      EffectiveOrders.send_email(:order_receipt_to_buyer, self) if purchased?
+      if refund?
+        EffectiveOrders.send_email(:refund_notification_to_admin, self) if EffectiveOrders.send_refund_notification_to_admin
+      end
     end
-    alias_method :send_buyer_receipt!, :send_order_receipt_to_buyer!
 
+    # Admin datatable action
     def send_payment_request_to_buyer!
-      EffectiveOrders.send_email(:payment_request_to_buyer, self) unless purchased?
-    end
-
-    def send_pending_order_invoice_to_buyer!
-      EffectiveOrders.send_email(:pending_order_invoice_to_buyer, self) unless purchased?
+      EffectiveOrders.send_email(:order_email, self, payment_request: true) unless (purchased? || refund?)
     end
 
-    def send_refund_notification!
-      EffectiveOrders.send_email(:refund_notification_to_admin, self) if refund?
+    # Admin datatable action
+    def send_order_email_to_buyer!
+      EffectiveOrders.send_email(:order_email, self) if purchased_or_deferred?
     end
 
     protected

data/app/models/effective/order_email.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+# a PORO to handle all the email logic for an order
+
+module Effective
+  class OrderEmail
+    attr_accessor :order
+    attr_accessor :opts
+
+    def initialize(order, opts = {})
+      raise('expected an Effective::Order') unless order.kind_of?(Effective::Order)
+      raise('expected a Hash of options') unless opts.kind_of?(Hash)
+
+      @order = order
+      @opts = opts
+    end
+
+    # Just to the purchaser. Not everyone.
+    def to
+      return order.emails if payment_request?
+      order.emails.first
+    end
+
+    def cc
+      order.cc.presence
+    end
+
+    # The very first line of the email body
+    def header
+      if event.present? && order.purchased_or_deferred?
+        return "Your tickets have been confirmed" if event_none_waitlisted?
+        return "Some of your tickets have been confirmed, but some are on the waitlist" if event_some_waitlisted?
+        return "Your tickets are on the waitlist" if event_all_waitlisted?
+      end
+
+      return "Request for Payment" if payment_request?
+      return "Pending order created" if order.deferred?
+      return "Your order has been successfully purchased" if order.purchased?
+      return "Your order was declined by the payment processor" if order.declined?
+
+      # Fallback
+      "Order: ##{order.to_param}"
+    end
+
+    def subject
+      if event.present? && order.purchased_or_deferred?
+        return "Confirmation - #{event}" if event_none_waitlisted?
+        return "Confirmation + Waitlist - #{event}" if event_some_waitlisted?
+        return "Waitlist - #{event}" if event_all_waitlisted?
+      end
+
+      return "Payment Request - Order: ##{order.to_param}" if payment_request?
+      return "Pending Order: ##{order.to_param}" if order.deferred?
+      return "Declined Order: ##{order.to_param}" if order.declined?
+      return "Order Receipt: ##{order.to_param}" if order.purchased?
+
+      # Fallback
+      "Order: ##{order.to_param}"
+    end
+
+    def payment_request?
+      opts[:payment_request] == true
+    end
+
+    def event
+      order.purchasables.find { |purchasable| purchasable.class.name == "Effective::EventRegistrant" }.try(:event)
+    end
+
+    def event_registration
+      order.purchasables.find { |purchasable| purchasable.class.name == "Effective::EventRegistrant" }.try(:event_registration)
+    end
+
+    def event_registrants
+      order.purchasables.select { |purchasable| purchasable.class.name == "Effective::EventRegistrant" }
+    end
+
+    def event_addons
+      order.purchasables.select { |purchasable| purchasable.class.name == "Effective::EventAddon" }
+    end
+
+    def event_none_waitlisted?
+      return false unless event_registrants.present?
+      event_registrants.none? { |er| er.waitlisted_not_promoted? }
+    end
+
+    def event_some_waitlisted?
+      return false unless event_registrants.present?
+
+      event_registrants.find { |er| er.waitlisted_not_promoted? }.present? && 
+      event_registrants.find { |er| !er.waitlisted_not_promoted? }.present?
+    end
+
+    def event_all_waitlisted?
+      return false unless event_registrants.present?
+      event_registrants.all? { |er| er.waitlisted_not_promoted? }
+    end
+
+  end
+end

data/app/views/effective/order_emails/_header.html.haml

@@ -0,0 +1,16 @@
+%h1{style: "text-align: center"}= order_email.header
+
+- if order.purchased?
+  %p{style: "margin-bottom: 14px; font-weight: bold; text-align: center;"} Thank you!
+- elsif order.declined?
+  %p{style: "margin-bottom: 14px; font-weight: bold; text-align: center;"}= order.declined_reason
+
+- if (event = order_email.event).present?
+  %p{style: "text-align: center"}
+    %strong{style: "font-size: 18px"}= event.title
+    %br
+    #{effective_events_event_schedule(event)}
+
+  - if event.rich_text_confirmation_email.present?
+    %hr
+    = event.rich_text_confirmation_email.to_s.html_safe

data/app/views/effective/order_emails/_info.html.haml

@@ -0,0 +1,70 @@
+- if order.delayed? && order.deferred? && order.delayed_payment_date_upcoming? 
+  %hr
+  %p{style: "margin-bottom: 4px; font-weight: bold;"} Please note:
+
+  - if order.payment_provider == 'deluxe_delayed'
+    %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.
+  - elsif order.payment_provider == 'cheque'
+    %ul{style: "margin-top: 0;"}
+      %li Please submit a cheque at your earliest convience.
+      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>, whichever is first, to make changes and cancellations.
+      %li A receipt will be sent after payment has been received.
+  - elsif order.payment_provider == 'phone'
+    %ul{style: "margin-top: 0;"}
+      %li Please phone us at your earliest convience.
+      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>, whichever is first, to make changes and cancellations.
+      %li A receipt will be sent after payment has been received.
+  - elsif order.payment_provider == 'etransfer'
+    %ul{style: "margin-top: 0;"}
+      %li Please submit an etransfer at your earliest convience.
+      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>, whichever is first, to make changes and cancellations.
+      %li A receipt will be sent after payment has been received.
+  - else
+    - providers = EffectiveOrders.deferred_providers.to_sentence(last_word_connector: ', or', two_words_connector: ' or ')
+    %ul{style: "margin-top: 0;"}
+      - if providers.present?
+        %li When we receive your #{providers} we will mark your order paid.
+      %li You have until payment is received or until <strong>#{order.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>, whichever is first, to make changes and cancellations.
+      %li A receipt will be sent after payment has been received.
+
+- elsif order.deferred?
+  %hr
+  %p{style: "margin-bottom: 4px; font-weight: bold;"} Please remit payment at your earliest convenience.
+
+  - if order.payment_provider == 'deluxe_delayed'
+    %ul{style: "margin-top: 0;"}
+      %li Your credit card will be automatically charged.
+      %li A receipt will be sent after the transaction is completed.
+  - elsif order.payment_provider == 'cheque'
+    %ul{style: "margin-top: 0;"}
+      %li Please submit a cheque at your earliest convience.
+      %li A receipt will be sent after payment has been received.
+  - elsif order.payment_provider == 'phone'
+    %ul{style: "margin-top: 0;"}
+      %li Please phone us at your earliest convience.
+      %li A receipt will be sent after payment has been received.
+  - elsif order.payment_provider == 'etransfer'
+    %ul{style: "margin-top: 0;"}
+      %li Please submit an etransfer at your earliest convience.
+      %li A receipt will be sent after payment has been received.
+  - else
+    - providers = EffectiveOrders.deferred_providers.to_sentence(last_word_connector: ', or', two_words_connector: ' or ')
+    %ul{style: "margin-top: 0;"}
+      - if providers.present?
+        %li When we receive your #{providers} we will mark your order paid.
+      %li A receipt will be sent after payment has been received.
+
+- elsif order_email.payment_request?
+  %hr
+  %p{style: "margin-bottom: 4px; font-weight: bold;"} An order has been created on your behalf for the following items.
+  %p{style: "margin-bottom: 4px; font-weight: bold;"} Please remit payment at your earliest convenience.
+
+  - providers = EffectiveOrders.deferred_providers.to_sentence(last_word_connector: ', or', two_words_connector: ' or ')
+  %ul{style: "margin-top: 0;"}
+    %li #{link_to('Click here', effective_orders.order_url(@order))} to review your order and pay online with a credit card.
+    - if providers.present?
+      %li We also accept #{providers}.
+    %li A receipt will be sent after payment has been received.

data/app/views/effective/order_emails/_items.html.haml

@@ -0,0 +1 @@
+= render(order, no_order_actions: true)

data/app/views/effective/order_emails/_order_email.html.haml

@@ -0,0 +1,6 @@
+- # This is the order email
+= render('effective/order_emails/header', order_email: order_email, order: order)
+= render('effective/order_emails/info', order_email: order_email, order: order)
+= render('effective/order_emails/items', order_email: order_email, order: order)
+= render('effective/order_emails/signature', order_email: order_email, order: order)
+

data/app/views/effective/order_emails/_signature.html.haml

@@ -0,0 +1,12 @@
+%hr
+
+- event = order_email.event
+- event_registration = order_email.event_registration
+
+%p{style: "text-align: center;"}
+  - if event.present? && event_registration.present? && order.delayed_payment_date_upcoming? && order.deferred?
+    = link_to('View or modify your registration', effective_events.event_event_registration_url(event, event_registration))
+  - elsif event.present? && event_registration.present?
+    = link_to('View your registration', effective_events.event_event_registration_url(event, event_registration))
+  - else
+    = link_to('View your order', effective_orders.order_url(order))

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

@@ -8,7 +8,7 @@
         %tr
           %td
             - if order.delayed? && order.delayed_payment_provider?
-              %p Your #{order.delayed_payment_method} will be charged on #{order.delayed_payment_date.strftime('%F')}
+              %p Your #{order.delayed_payment_method} will be charged on #{order.delayed_payment_date.strftime("%A, %B %d, %Y")}
             - else
               %p Waiting for payment by #{order.payment_provider}.
 

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

@@ -1,5 +1,5 @@
 .effective-order-items
-  %table.table
+  %table.table{style: "margin-bottom: 20px;"}
     %thead
       %tr
         %th.quantity Qty
@@ -14,16 +14,20 @@
           %td.item
             = item.name.html_safe
 
+            - if item.purchasable.class.name == 'Effective::EventRegistrant'
+              = item.purchasable.try(:responses) || item.purchasable.try(:notes)
+
             - if order.purchased? && item.purchased_download_url.present?
               = link_to 'Download', item.purchased_download_url
 
           %td.price= price_to_currency(item.subtotal)
 
-  %table.table
     %tfoot
       %tr
-        %th
-        %td.subtotal Subtotal
+        %td{colspan: 3}= " ".html_safe
+
+      %tr
+        %th.subtotal{colspan: 2} Subtotal
         %td.price.subtotal-price= price_to_currency(order.subtotal)
 
       - if order.tax_rate.blank?
@@ -31,42 +35,30 @@
 
       - elsif order.tax_rate.present? && order.surcharge_percent.to_f > 0.0
         %tr
-          %th
-          %td.tax #{EffectiveOrders.tax_label} (#{rate_to_percentage(order.tax_rate)})
+          %th.tax{colspan: 2} #{EffectiveOrders.tax_label} (#{rate_to_percentage(order.tax_rate)})
           %td.price.tax-price= price_to_currency(order.tax)
 
         %tr.single-line
-          %th
-          %td.amount-owing Amount owing before Credit Card Processing Fee
+          %th.amount-owing{colspan: 2} Amount owing before Credit Card Processing Fee
           %td.price.amount-owing-price= price_to_currency(order.amount_owing)
 
         %tr
-          %th
-          %td
-          %td
-
-        %tr
-          %th
-          %td.surcharge Credit Card Processing Fee (#{rate_to_percentage(order.surcharge_percent)}) on #{price_to_currency(order.amount_owing)}
+          %th.surcharge{colspan: 2} Credit Card Processing Fee (#{rate_to_percentage(order.surcharge_percent)}) on #{price_to_currency(order.amount_owing)}
           %td.price.surcharge-price= price_to_currency(order.surcharge)
 
         %tr
-          %th
-          %td.surcharge-tax #{EffectiveOrders.tax_label} (#{rate_to_percentage(order.tax_rate)}) on Credit Card Processing Fee
+          %th.surcharge-tax{colspan: 2} #{EffectiveOrders.tax_label} (#{rate_to_percentage(order.tax_rate)}) on Credit Card Processing Fee
           %td.price.surcharge-tax-price= price_to_currency(order.surcharge_tax)
 
         %tr.double-line
-          %th
-          %td.total Total amount charged to credit card
+          %th.total{colspan: 2} Total amount charged to credit card
           %td.price.total-price= price_to_currency(order.total)
 
       - elsif order.tax_rate.present? && !(order.surcharge_percent.to_f > 0.0)
         %tr
-          %th
-          %td.tax #{EffectiveOrders.tax_label} (#{rate_to_percentage(order.tax_rate)})
+          %th.tax{colspan: 2} #{EffectiveOrders.tax_label} (#{rate_to_percentage(order.tax_rate)})
           %td.price.tax-price= price_to_currency(order.tax)
 
         %tr.single-line
-          %th
-          %td.total= order.total_label
+          %th.total{colspan: 2}= order.total_label
           %td.price.total-price= price_to_currency(order.total)

data/app/views/effective/orders/delayed/_form.html.haml

@@ -9,11 +9,11 @@
         The payment date for this order
 
         - if order.delayed_payment_date_upcoming?
-          is in #{distance} from now on #{order.delayed_payment_date.strftime('%F')}
+          is in #{distance} from now on #{order.delayed_payment_date.strftime("%A, %B %d, %Y")}
         - elsif order.delayed_payment_date_today?
           was today
         - else
-          was #{distance} ago on #{order.delayed_payment_date.strftime('%F')}
+          was #{distance} ago on #{order.delayed_payment_date.strftime("%A, %B %d, %Y")}
     
     - provider_locals = { order: order, deferred_url: deferred_url, declined_url: declined_url }
 

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

@@ -0,0 +1 @@
+= render('effective/order_emails/order_email', order_email: @order_email, order: @order)

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

@@ -0,0 +1 @@
+= render('effective/order_emails/order_email', order_email: @order_email, order: @order)

data/config/locales/effective_orders.en.yml

@@ -6,8 +6,8 @@ en:
   activerecord:
     actions:
       effective/order:
-        send_buyer_receipt: 'E-mail receipt to buyer'
-        send_buyer_receipt_confirm: 'Send receipt to @resource.emails_send_to?'
+        send_order_email_to_buyer: 'Send order email'
+        send_order_email_to_buyer_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_buyer_receipt
+        post :send_order_email_to_buyer
 
         post :cheque
         post :deluxe              # 1-off payment and purchase
@@ -25,7 +25,7 @@ EffectiveOrders::Engine.routes.draw do
       end
 
       collection do
-        post :bulk_send_buyer_receipt
+        post :bulk_send_order_email_to_buyer
 
         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_buyer_receipt
+        post :send_order_email_to_buyer
 
         delete :void
         post :unvoid

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.19.7'.freeze
+  VERSION = '6.20.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.19.7
+  version: 6.20.0
 platform: ruby
 authors:
 - Code and Effect
@@ -254,6 +254,7 @@ files:
 - app/models/effective/deluxe_api.rb
 - app/models/effective/item_name.rb
 - app/models/effective/order.rb
+- app/models/effective/order_email.rb
 - app/models/effective/order_item.rb
 - app/models/effective/product.rb
 - app/models/effective/sold_out_validator.rb
@@ -283,6 +284,11 @@ files:
 - app/views/effective/customers/_form.html.haml
 - app/views/effective/customers/edit.html.haml
 - app/views/effective/customers/update.js.erb
+- app/views/effective/order_emails/_header.html.haml
+- app/views/effective/order_emails/_info.html.haml
+- app/views/effective/order_emails/_items.html.haml
+- app/views/effective/order_emails/_order_email.html.haml
+- app/views/effective/order_emails/_signature.html.haml
 - app/views/effective/orders/_checkout_actions.html.haml
 - app/views/effective/orders/_checkout_step1.html.haml
 - app/views/effective/orders/_checkout_step2.html.haml
@@ -333,13 +339,9 @@ files:
 - app/views/effective/orders/show.html.haml
 - app/views/effective/orders/stripe/_element.html.haml
 - app/views/effective/orders/stripe/_form.html.haml
-- app/views/effective/orders_mailer/order_declined_to_admin.html.haml
-- app/views/effective/orders_mailer/order_declined_to_buyer.html.haml
+- app/views/effective/orders_mailer/order_email.html.haml
+- app/views/effective/orders_mailer/order_email_to_admin.html.haml
 - app/views/effective/orders_mailer/order_error.html.haml
-- app/views/effective/orders_mailer/order_receipt_to_admin.html.haml
-- app/views/effective/orders_mailer/order_receipt_to_buyer.html.haml
-- app/views/effective/orders_mailer/payment_request_to_buyer.html.haml
-- app/views/effective/orders_mailer/pending_order_invoice_to_buyer.html.haml
 - app/views/effective/orders_mailer/refund_notification_to_admin.html.haml
 - app/views/effective/orders_mailer/subscription_canceled.html.haml
 - app/views/effective/orders_mailer/subscription_created.html.haml

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

@@ -1,2 +0,0 @@
-%p.effective-orders-receipt-info An order has been declined by the payment processor: #{@order.declined_reason}
-= render(@order, no_order_actions: true)

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

@@ -1,2 +0,0 @@
-%p.effective-orders-receipt-info Your order was declined by the payment processor: #{@order.declined_reason}
-= render(@order, no_order_actions: true)

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

@@ -1,2 +0,0 @@
-%p.effective-orders-receipt-info An order has been successfully purchased:
-= render(@order, no_order_actions: true)

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

@@ -1,2 +0,0 @@
-%p.effective-orders-receipt-info Your order has been successfully purchased:
-= render(@order, no_order_actions: true)

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

@@ -1,13 +0,0 @@
-%p.effective-orders-receipt-info Request for Payment
-
-%p
-  An order has been created on your behalf for the following items.
-  Please remit payment at your earliest convenience.
-
-%p #{link_to('Click here', effective_orders.order_url(@order))} to review your order and pay online with a credit card.
-
-- if EffectiveOrders.deferred_providers.present?
-  - providers = EffectiveOrders.deferred_providers.to_sentence()
-  %p We also accept #{providers}. We will mark your order paid upon receiving it.
-
-= render(@order, no_order_actions: true)

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

@@ -1,23 +0,0 @@
-%p.effective-orders-receipt-info Pending order created
-
-%p We have received notice of your intention to purchase the following items.
-
-- 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.
-
-- 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.
-
-= render(@order, no_order_actions: true)
-
-%hr
-%p{style: "text-align: center;"}
-  = link_to('View your order', effective_orders.order_url(@order))