effective_orders 4.4.1 → 4.4.2

data/app/helpers/effective_orders_helper.rb

@@ -33,8 +33,6 @@ module EffectiveOrdersHelper
   end
 
   def order_checkout_label(processor = nil)
-    return 'Checkout' if (EffectiveOrders.single_payment_processor? && ![:pretend, :mark_as_paid, :free, :refund].include?(processor))
-
     case processor
     when :cheque
       'Pay by Cheque'
@@ -46,12 +44,14 @@ module EffectiveOrdersHelper
       'Checkout with Credit Card'
     when :paypal
       'Checkout with PayPal'
+    when :phone
+      'Pay by Phone'
     when :pretend
       'Purchase Order (skip payment processor)'
     when :refund
       'Accept Refund'
     when :stripe
-      'Checkout with Credit Card'
+      'Pay Now'
     else
       'Checkout'
     end
@@ -72,14 +72,14 @@ module EffectiveOrdersHelper
     render(partial: 'effective/orders/order', locals: { order: order })
   end
 
-  def render_checkout(order, namespace: nil, purchased_url: nil, declined_url: nil)
+  def render_checkout(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
     raise 'unable to checkout an order without a user' unless order && order.user
 
-    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, namespace: namespace }
+    locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url, namespace: namespace }
 
     if order.purchased?
       render(partial: 'effective/orders/order', locals: locals)
-    elsif order.confirmed? && order.errors.blank?
+    elsif (order.confirmed? || order.deferred?) && order.errors.blank?
       render(partial: 'effective/orders/checkout_step2', locals: locals)
     else
       render(partial: 'effective/orders/checkout_step1', locals: locals)

data/app/helpers/effective_subscriptions_helper.rb

@@ -31,6 +31,4 @@ module EffectiveSubscriptionsHelper
     render('effective/customers/form', subscripter: subscripter)
   end
 
-
-
 end

data/app/mailers/effective/orders_mailer.rb

@@ -28,6 +28,7 @@ module Effective
     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(order_param)
       return true unless EffectiveOrders.mailer[:send_payment_request_to_buyer]

data/app/models/effective/order.rb

@@ -112,6 +112,10 @@ module Effective
       validates :payment_card, presence: true
     end
 
+    with_options if: -> { deferred? } do
+      validates :payment_provider, presence: true, inclusion: { in: EffectiveOrders.deferred_providers }
+    end
+
     scope :deep, -> { includes(:user, order_items: :purchasable) }
     scope :sorted, -> { order(:id) }
 
@@ -121,7 +125,9 @@ module Effective
 
     scope :pending, -> { where(state: EffectiveOrders::PENDING) }
     scope :confirmed, -> { where(state: EffectiveOrders::CONFIRMED) }
+    scope :deferred, -> { where(state: EffectiveOrders::DEFERRED) }
     scope :declined, -> { where(state: EffectiveOrders::DECLINED) }
+    scope :refunds, -> { purchased.where('total < ?', 0) }
 
     # Effective::Order.new()
     # Effective::Order.new(Product.first)
@@ -224,6 +230,10 @@ module Effective
       state == EffectiveOrders::CONFIRMED
     end
 
+    def deferred?
+      state == EffectiveOrders::DEFERRED
+    end
+
     def purchased?(provider = nil)
       return false if (state != EffectiveOrders::PURCHASED)
       return true if provider.nil? || payment_provider == provider.to_s
@@ -291,9 +301,9 @@ module Effective
       true
     end
 
+    # Used by admin checkout only
     def confirm!
-      self.state = EffectiveOrders::CONFIRMED
-      save!
+      update!(state: EffectiveOrders::CONFIRMED)
     end
 
     # This lets us skip to the confirmed workflow for an admin...
@@ -346,6 +356,21 @@ module Effective
       true
     end
 
+    def defer!(provider: 'none', email: true)
+      return false if purchased?
+
+      assign_attributes(
+        state: EffectiveOrders::DEFERRED,
+        payment_provider: provider
+      )
+
+      save!
+
+      send_payment_request_to_buyer! if email
+
+      true
+    end
+
     def decline!(payment: 'none', provider: 'none', card: 'none', validate: true)
       return false if declined?
 

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

@@ -0,0 +1,18 @@
+= dropdown(variation: :dropleft) do
+  = dropdown_link_to 'View', effective_orders.admin_order_path(order)
+
+  - if order.purchased? == false
+    = dropdown_link_to 'Edit', effective_orders.edit_admin_order_path(order)
+
+  - if order.purchased?
+    = dropdown_link_to 'Email receipt to buyer', effective_orders.send_buyer_receipt_order_path(order),
+      data: { confirm: "Send receipt to #{order.user.email}?" }
+
+  - if order.pending? || order.confirmed? || order.deferred?
+    = dropdown_link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
+      data: { method: :post, confirm: "Send request for payment to #{order.user.email}?" }
+
+    = dropdown_link_to 'Admin: Checkout', effective_orders.checkout_admin_order_path(order)
+
+    = dropdown_link_to "Delete #{order}", effective_orders.admin_order_path(order),
+      data: { method: :delete, confirm: "Really delete #{order}?" }

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

@@ -5,7 +5,7 @@
     = link_to 'Change Addresses', effective_orders.edit_order_path(order), rel: :nofollow, class: 'btn btn-secondary'
 
 .effective-order-purchase-actions
-  - provider_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url }
+  - provider_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url }
 
   - if EffectiveOrders.free? && order.free?
     = render partial: '/effective/orders/free/form', locals: provider_locals
@@ -14,9 +14,6 @@
     = render partial: '/effective/orders/refund/form', locals: provider_locals
 
   - else
-    - if EffectiveOrders.pretend? && EffectiveOrders.pretend_message.present?
-      %p.text-right= EffectiveOrders.pretend_message
-
     - if EffectiveOrders.pretend?
       = render partial: '/effective/orders/pretend/form', locals: provider_locals
 
@@ -29,8 +26,9 @@
     - if EffectiveOrders.stripe?
       = render partial: '/effective/orders/stripe/form', locals: provider_locals
 
-    - if EffectiveOrders.cheque? && order.user == current_user
-      = render partial: '/effective/orders/cheque/form', locals: provider_locals
+    - if EffectiveOrders.deferred? && order.user == current_user
+      %p.my-4.text-center - or -
+      = render partial: '/effective/orders/deferred/form', locals: provider_locals
 
   - if EffectiveOrders.authorized?(controller, :admin, :effective_orders) && order.user != current_user
     - if EffectiveOrders.mark_as_paid?

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

@@ -0,0 +1,2 @@
+= dropdown(variation: :dropleft) do
+  = dropdown_link_to (order.purchased? ? 'View' : 'Checkout'), effective_orders.order_path(order)

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

@@ -25,7 +25,7 @@
           = effective_address_fields(form, :shipping_address)
 
 - if EffectiveOrders.collect_note
-  = render 'effective/orders/order_note_fields', form: form
+  = render 'effective/orders/fields_note', form: form
 
 - if EffectiveOrders.terms_and_conditions
-  = render 'effective/orders/order_terms_and_conditions_fields', form: form
+  = render 'effective/orders/fields_terms', form: form

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

@@ -4,7 +4,8 @@
 
   = render partial: 'effective/orders/order_header', locals: { order: order }
   = render partial: 'effective/orders/order_shipping', locals: { order: order }
+  = render partial: 'effective/orders/order_deferred', locals: { order: order }
   = render partial: 'effective/orders/order_notes', locals: { order: order }
   = render partial: 'effective/orders/order_items', locals: { order: order }
-  = render partial: 'effective/orders/order_payment_details', locals: { order: order }
+  = render partial: 'effective/orders/order_payment', locals: { order: order }
   = render partial: 'effective/orders/order_footer', locals: { order: order }

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

@@ -8,7 +8,7 @@
       data: { confirm: "Send receipt to #{order.user.email}?" }
 
   - if order.persisted? && EffectiveOrders.authorized?(controller, :admin, :effective_orders)
-    - if order.pending? || order.confirmed?
+    - if order.pending? || order.confirmed? || order.deferred?
       = link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
         class: 'btn btn-secondary',
         data: { method: :post, confirm: "Send request for payment to #{order.user.email}?" }

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

@@ -0,0 +1,9 @@
+- if order.deferred?
+  .effective-order-deferred
+    %table.table
+      %thead
+        %tr
+          %th Payment
+      %tbody
+        %tr
+          %td Waiting for payment by #{order.payment_provider}

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

@@ -14,7 +14,10 @@
     .col-sm-6
       - if order.purchased?
         %p Receipt: ##{order.to_param}
-        %p Purchased at: #{order.purchased_at.strftime("%F %H:%M")}
       - elsif order.persisted?
         %p Order: ##{order.to_param}
+
+      - if order.purchased?
+        %p Purchased at: #{order.purchased_at.strftime("%F %H:%M")}
+      - else
         %p Date: #{Time.zone.now.strftime("%F %H:%M")}

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

@@ -1,5 +1,5 @@
-- include_download_column = order.purchased? && order.order_items.any? { |order_item| order_item.purchased_download_url.present? }
 - include_quantity_column = order.order_items.any? { |order_item| order_item.quantity > 1 }
+- include_download_column = order.purchased? && order.order_items.any? { |order_item| order_item.purchased_download_url.present? }
 
 .effective-order-items
   %table.table
@@ -7,8 +7,10 @@
       %tr
         - if include_quantity_column
           %th.quantity Qty
+
         - if include_download_column
           %th.download Download
+
         %th.item= order.order_items.length > 1 ? 'Items' : 'Item'
         %th.price Price
 
@@ -17,15 +19,15 @@
         %tr
           - if include_quantity_column
             %td.quantity= item.quantity
+
           - if include_download_column
             %td.download
               - if item.purchased_download_url.present?
                 = link_to 'download', item.purchased_download_url
               - else
                 = '-'
-          %td.item
-            = item.name.html_safe
 
+          %td.item= item.name.html_safe
           %td.price= price_to_currency(item.subtotal)
 
     %tfoot
@@ -33,22 +35,29 @@
         %tr
           - if include_quantity_column
             %th.quantity
+
           - if include_download_column
             %th.download
+
           %th.subtotal Subtotal
           %td.price.subtotal-price= price_to_currency(order.subtotal)
+
       - if order.tax.to_i != 0
         %tr
           - if include_quantity_column
             %th.quantity
+
           - if include_download_column
             %th.download
+
           %th.tax Tax (#{tax_rate_to_percentage(order.tax_rate)})
           %td.price.tax-price= price_to_currency(order.tax)
+
       - if order.tax_rate.present?
         %tr
           - if include_quantity_column
             %th.quantity
+
           - if include_download_column
             %th.download
 

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

@@ -5,11 +5,13 @@
         %tr
           - if order.note.present?
             %th Note
+
           - if order.note_to_buyer.present?
             %th Receipt note
       %tbody
         %tr
           - if order.note.present?
             %td= order.note
+
           - if order.note_to_buyer.present?
             %td= order.note_to_buyer

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

@@ -0,0 +1,24 @@
+- if order.purchased?
+  .effective-order-payment-details
+    %table.table
+      %thead
+        %tr
+          %th Payment
+          %th
+      %tbody
+        %tr
+          %td Provider
+          %td= order.payment_provider
+
+        - if order.payment_card.present?
+          %tr
+            %td Card
+            %td
+              = payment_card_label(order.payment_card)
+              - if order.payment.kind_of?(Hash)
+                = order.payment[:active_card] || order.payment['f4l4']
+
+        %tr
+          %td Purchased at
+          %td= order.purchased_at&.strftime('%F %H:%M')
+

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

@@ -1,5 +1,4 @@
-= effective_form_with(scope: :cheque, url: effective_orders.pay_by_cheque_order_path(order), method: :post) do |f|
-  = hidden_field_tag(:purchased_url, purchased_url)
-  = hidden_field_tag(:declined_url, declined_url)
+= effective_form_with(scope: :cheque, url: effective_orders.cheque_order_path(order), method: :post) do |f|
+  = f.hidden_field :deferred_url, value: deferred_url
 
-  = f.submit order_checkout_label(:cheque), border: false
+  = f.submit order_checkout_label(:cheque), center: true, border: false, 'data-confirm': EffectiveOrders.cheque[:confirm]

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

@@ -1,7 +1,5 @@
 %h1.effective-heading= @page_title
 
-%p= flash[:danger]
-
 %p.effective-orders-page-content
   = link_to 'Home', root_path
 

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

@@ -0,0 +1,13 @@
+%h1.effective-heading= @page_title
+
+%p.effective-orders-page-content
+  = link_to 'Home', root_path
+
+%p.effective-orders-page-content
+  You have indicated that this order will be paid by #{@order.payment_provider}.
+  Your order will not be considered purchased until we receive your payment.
+  Please contact us at your earliest convenience.
+
+= render @order
+
+= link_to 'Continue', root_path, class: 'btn btn-primary'

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

@@ -0,0 +1,16 @@
+.card
+  .card-body
+    %h2 Checkout Offline
+
+    %p
+      = succeed('.') do
+        Please indicate that you would like to pay by
+        = EffectiveOrders.deferred_providers.to_sentence(last_word_connector: ', or', two_words_connector: ' or ')
+
+    %p Your order will not be considered purchased until we receive your payment.
+
+    - provider_locals = { order: order, deferred_url: deferred_url, declined_url: declined_url }
+
+    .d-flex.justify-content-around
+      - EffectiveOrders.deferred_providers.each do |provider|
+        = render partial: "/effective/orders/#{provider}/form", locals: provider_locals

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

@@ -1,12 +1,3 @@
 %h1.effective-heading= @page_title
 
-- if @pending_orders.present?
-  %h2 Pending Orders
-  = render_orders(@pending_orders)
-
-- if @orders.present?
-  %h2 Purchased Orders
-  = render_orders(@orders)
-
-- unless (@pending_orders.present? || @orders.present?)
-  %p You have no purchased orders.
+= render_datatable(@datatable)

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

@@ -1,10 +1,8 @@
 .card
   .card-body
-    %h2 Admin: Offline Payment
+    %h2 Admin: Mark as Paid
 
     = effective_form_with(model: order, url: effective_orders.mark_as_paid_order_path(order), method: :post) do |f|
-      = hidden_field_tag(:purchased_url, purchased_url)
-      = hidden_field_tag(:declined_url, declined_url)
       = f.select :payment_provider, EffectiveOrders.payment_providers, required: true
 
       = f.text_field :payment_card,

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

@@ -0,0 +1,4 @@
+= effective_form_with(scope: :phone, url: effective_orders.phone_order_path(order), method: :post) do |f|
+  = f.hidden_field :deferred_url, value: deferred_url
+
+  = f.submit order_checkout_label(:phone), center: true, border: false, 'data-confirm': EffectiveOrders.phone[:confirm]

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

@@ -2,4 +2,7 @@
   = f.hidden_field :purchased_url, value: purchased_url
   = f.hidden_field :declined_url, value: declined_url
 
+  - if EffectiveOrders.pretend_message.present?
+    %p.text-right= EffectiveOrders.pretend_message
+
   = f.submit order_checkout_label(:pretend), border: false

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

@@ -4,7 +4,7 @@
 
 .card
   .card-body
-    %h3= order_checkout_label(:stripe)
+    %h2 Checkout
     %p
       %em This checkout is powered by stripe.
 
@@ -28,4 +28,4 @@
           = render('effective/orders/stripe/element')
 
       .mt-4
-        = f.submit 'Pay Now', center: true, border: false
+        = f.submit order_checkout_label(:stripe), center: true, border: false