effective_orders 4.4.1 → 4.4.2

data/config/effective_orders.rb

@@ -163,11 +163,12 @@ EffectiveOrders.setup do |config|
   #######################################
 
   # Cheque
+  # This is an deferred payment
   config.cheque = false
 
   # config.cheque = {
-  #   confirm: 'Your order will not be considered purchased until we receive your cheque. Proceed with pay by cheque?',
-  #   success_message: 'Thank you! You have indicated that this order will be purchased by cheque. Please send us a cheque and a copy of this invoice at your earliest convenience. We will mark this order purchased upon receiving payment.'
+  #   confirm: 'Proceed with pay by cheque?',
+  #   success: 'Thank you! You have indicated that this order will be purchased by cheque. Please send us a cheque and a copy of this invoice at your earliest convenience.'
   # }
 
   # Moneris
@@ -216,11 +217,20 @@ EffectiveOrders.setup do |config|
   #   }
   # end
 
+  # Phone
+  # This is an deferred payment
+  config.phone = false
+
+  # config.phone = {
+  #   confirm: 'Proceed with pay by phone?',
+  #   success: 'Thank you! You have indicated that this order will be purchased by phone. Please give us a call at your earliest convenience.'
+  # }
+
 
   # Refunds
   # This does not issue a refund with the payment processor at all.
   # Instead, we mark the order as purchased, create a refund object to track it, and
-  # send an email to notify_email with instructions to issue a refund
+  # send an email to mailer[:admin_email] with instructions to issue a refund
   config.refund = false
 
   # config.refund = {

data/config/routes.rb

@@ -3,12 +3,14 @@ EffectiveOrders::Engine.routes.draw do
     resources :orders, except: [:destroy] do
       member do
         get :purchased
+        get :deferred
         get :declined
         get :send_buyer_receipt
 
         post :free if EffectiveOrders.free?
         post :mark_as_paid if EffectiveOrders.mark_as_paid?
-        post :pay_by_cheque if EffectiveOrders.cheque?
+        post :cheque if EffectiveOrders.cheque?
+        post :phone if EffectiveOrders.phone?
         post :pretend if EffectiveOrders.pretend?
         post :refund if EffectiveOrders.refund?
         post :stripe if EffectiveOrders.stripe?

data/lib/effective_orders.rb

@@ -3,12 +3,13 @@ require 'effective_orders/engine'
 require 'effective_orders/version'
 
 module EffectiveOrders
-  PENDING = 'pending'.freeze
-  CONFIRMED = 'confirmed'.freeze
-  PURCHASED = 'purchased'.freeze
-  DECLINED = 'declined'.freeze
+  PENDING = 'pending'.freeze        # New orders are created in a pending state
+  CONFIRMED = 'confirmed'.freeze    # Once the order has passed checkout step 1
+  DEFERRED = 'deferred'.freeze      # Deferred providers. Cheque or Phone was selected.
+  PURCHASED = 'purchased'.freeze    # Purchased by provider
+  DECLINED = 'declined'.freeze      # Declined by provider
 
-  STATES = { PENDING => PENDING, CONFIRMED => CONFIRMED, PURCHASED => PURCHASED, DECLINED => DECLINED }
+  STATES = { PENDING => PENDING, CONFIRMED => CONFIRMED, DEFERRED => DEFERRED, PURCHASED => PURCHASED, DECLINED => DECLINED }
 
   # Subscription statuses (as per stripe)
   ACTIVE = 'active'.freeze
@@ -58,6 +59,7 @@ module EffectiveOrders
   mattr_accessor :cheque
   mattr_accessor :moneris
   mattr_accessor :paypal
+  mattr_accessor :phone
   mattr_accessor :refund
   mattr_accessor :stripe
   mattr_accessor :subscriptions  # Stripe subscriptions
@@ -101,6 +103,10 @@ module EffectiveOrders
     free_enabled == true
   end
 
+  def self.deferred?
+    deferred_providers.present?
+  end
+
   def self.mark_as_paid?
     mark_as_paid_enabled == true
   end
@@ -113,6 +119,10 @@ module EffectiveOrders
     paypal.kind_of?(Hash)
   end
 
+  def self.phone?
+    phone.kind_of?(Hash)
+  end
+
   def self.pretend?
     pretend_enabled == true
   end
@@ -140,11 +150,12 @@ module EffectiveOrders
   # The Effective::Order.payment_provider value must be in this collection
   def self.payment_providers
     [
-      ('cheque' if cheque? || mark_as_paid?),
+      ('cheque' if cheque?),
       ('credit card' if mark_as_paid?),
       ('free' if free?),
       ('moneris' if moneris?),
       ('paypal' if paypal?),
+      ('phone' if phone?),
       ('pretend' if pretend?),
       ('refund' if refund?),
       ('stripe' if stripe?),
@@ -153,6 +164,10 @@ module EffectiveOrders
     ].compact
   end
 
+  def self.deferred_providers
+    [('cheque' if cheque?), ('phone' if phone?)].compact
+  end
+
   def self.can_skip_checkout_step1?
     return false if require_billing_address
     return false if require_shipping_address

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.4.1'.freeze
+  VERSION = '4.4.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Code and Effect
@@ -138,13 +138,14 @@ files:
 - app/controllers/effective/providers/mark_as_paid.rb
 - app/controllers/effective/providers/moneris.rb
 - app/controllers/effective/providers/paypal.rb
+- app/controllers/effective/providers/phone.rb
 - app/controllers/effective/providers/pretend.rb
 - app/controllers/effective/providers/refund.rb
 - app/controllers/effective/providers/stripe.rb
 - app/controllers/effective/subscripter_controller.rb
 - app/controllers/effective/webhooks_controller.rb
-- app/datatables/effective_customers_datatable.rb
-- app/datatables/effective_order_items_datatable.rb
+- app/datatables/admin/effective_customers_datatable.rb
+- app/datatables/admin/effective_orders_datatable.rb
 - app/datatables/effective_orders_datatable.rb
 - app/helpers/effective_carts_helper.rb
 - app/helpers/effective_orders_helper.rb
@@ -170,7 +171,7 @@ files:
 - app/views/admin/customers/index.html.haml
 - app/views/admin/customers/show.html.haml
 - app/views/admin/order_items/index.html.haml
-- app/views/admin/orders/_actions.html.haml
+- app/views/admin/orders/_datatable_actions.html.haml
 - app/views/admin/orders/_form.html.haml
 - app/views/admin/orders/_form_note_internal.html.haml
 - app/views/admin/orders/_order_actions.html.haml
@@ -190,21 +191,24 @@ files:
 - app/views/effective/orders/_checkout_actions.html.haml
 - app/views/effective/orders/_checkout_step1.html.haml
 - app/views/effective/orders/_checkout_step2.html.haml
+- app/views/effective/orders/_datatable_actions.html.haml
 - app/views/effective/orders/_fields.html.haml
+- app/views/effective/orders/_fields_note.html.haml
+- app/views/effective/orders/_fields_terms.html.haml
 - app/views/effective/orders/_order.html.haml
 - app/views/effective/orders/_order_actions.html.haml
+- app/views/effective/orders/_order_deferred.html.haml
 - app/views/effective/orders/_order_footer.html.haml
 - app/views/effective/orders/_order_header.html.haml
 - app/views/effective/orders/_order_items.html.haml
-- app/views/effective/orders/_order_note_fields.html.haml
 - app/views/effective/orders/_order_notes.html.haml
-- app/views/effective/orders/_order_payment_details.html.haml
+- app/views/effective/orders/_order_payment.html.haml
 - app/views/effective/orders/_order_shipping.html.haml
-- app/views/effective/orders/_order_terms_and_conditions_fields.html.haml
 - app/views/effective/orders/_orders_table.html.haml
 - app/views/effective/orders/cheque/_form.html.haml
-- app/views/effective/orders/cheque/pay_by_cheque.html.haml
 - app/views/effective/orders/declined.html.haml
+- app/views/effective/orders/deferred.html.haml
+- app/views/effective/orders/deferred/_form.html.haml
 - app/views/effective/orders/edit.html.haml
 - app/views/effective/orders/free/_form.html.haml
 - app/views/effective/orders/index.html.haml
@@ -212,6 +216,7 @@ files:
 - app/views/effective/orders/moneris/_form.html.haml
 - app/views/effective/orders/new.html.haml
 - app/views/effective/orders/paypal/_form.html.haml
+- app/views/effective/orders/phone/_form.html.haml
 - app/views/effective/orders/pretend/_form.html.haml
 - app/views/effective/orders/purchased.html.haml
 - app/views/effective/orders/refund/_form.html.haml

data/app/datatables/effective_order_items_datatable.rb

@@ -1,99 +0,0 @@
-class EffectiveOrderItemsDatatable < Effective::Datatable
-  datatable do
-    order :purchased_at, :desc
-
-    col(:purchased_at, sql_column: 'orders.purchased_at') do |order_item|
-      Time.at(order_item[:purchased_at]).in_time_zone if order_item[:purchased_at].present?
-    end
-
-    col :id, visible: false
-
-    col :order
-
-    # if effectiveorders.obfuscate_order_ids
-    #   col(:order, type: :obfuscated_id) do |order_item|
-    #     obfuscated_id = effective::order.obfuscate(order_item[:order_id])
-    #     link_to(obfuscated_id, (datatables_admin_path? ? effective_orders.admin_order_path(obfuscated_id) : effective_orders.order_path(obfuscated_id)))
-    #   end
-    # else
-    #   col(:order) do |order_item|
-    #     link_to(order_item.to_param, (datatables_admin_path? ? effective_orders.admin_order_path(order_item.to_param) : effective_orders.order_path(order_item.to_param)))
-    #   end
-    # end
-
-    unless attributes[:user_id]
-      col :email, sql_column: 'users.email', label: 'Buyer Email' do |order_item|
-        link_to order_item[:email], (edit_admin_user_path(order_item[:user_id]) rescue admin_user_path(order_item[:user_id]) rescue '#')
-      end
-    end
-
-    # if EffectiveOrders.billing_address && attributes[:user_id].blank?
-    #   col :buyer_name, sort: false, label: 'Buyer Name' do |order_item|
-    #     (order_item[:buyer_name] || '').split('!!SEP!!').find(&:present?)
-    #   end
-    # end
-
-    col :state, sql_column: 'orders.state', search: { collection: [%w(abandoned abandoned), [EffectiveOrders::PURCHASED, EffectiveOrders::PURCHASED], [EffectiveOrders::DECLINED, EffectiveOrders::DECLINED]], selected: EffectiveOrders::PURCHASED } do |order_item|
-      order_item[:state] || 'abandoned'
-    end
-
-    col :name do |order_item|
-      order_item.quantity == 1 ? order_item.name : "#{order_item.name} (#{order_item.quantity} purchased)"
-    end
-
-    # col :subtotal, as: :price
-    # col :tax, as: :price
-    # col :total, as: :price
-
-    col :created_at, visible: false
-    col :updated_at, visible: false
-  end
-
-  collection do
-    collection = Effective::OrderItem.unscoped
-      .joins(order: :user)
-      .select('order_items.*, orders.*, users.email AS email')
-      .select("#{query_subtotal} AS subtotal, #{query_tax} AS tax, #{query_total} AS total")
-      .group('order_items.id, orders.id, users.email')
-
-    if EffectiveOrders.billing_address && defined?(EffectiveAddresses)
-      addresses_tbl = EffectiveAddresses.addresses_table_name
-
-      collection = collection
-        .joins("LEFT JOIN (SELECT addressable_id, string_agg(#{addresses_tbl}.full_name, '!!SEP!!') AS buyer_name FROM #{addresses_tbl} WHERE #{addresses_tbl}.category = 'billing' AND #{addresses_tbl}.addressable_type = 'Effective::Order' GROUP BY #{addresses_tbl}.addressable_id) #{addresses_tbl} ON orders.id = #{addresses_tbl}.addressable_id")
-        .group("#{addresses_tbl}.buyer_name")
-        .select("#{addresses_tbl}.buyer_name AS buyer_name")
-    end
-
-    attributes[:user_id].present? ? collection.where("#{EffectiveOrders.orders_table_name.to_s}.user_id = ?", attributes[:user_id]) : collection
-  end
-
-  def query_subtotal
-    'SUM(price * quantity)'
-  end
-
-  def query_total
-    'SUM((price * quantity) + (CASE tax_exempt WHEN true THEN 0 ELSE ((price * quantity) * tax_rate) END))'
-  end
-
-  def query_tax
-    '(CASE tax_exempt WHEN true THEN 0 ELSE ((price * quantity) * tax_rate) END)'
-  end
-
-  # def search_column(collection, table_column, search_term)
-  #   if table_column[:name] == 'order'
-  #     collection.where("#{EffectiveOrders.order_items_table_name.to_s}.order_id = ?", Effective::Order.deobfuscate(search_term))
-  #   elsif table_column[:name] == 'state' && search_term == 'abandoned'
-  #     collection.where("#{EffectiveOrders.orders_table_name.to_s}.state IS NULL")
-  #   elsif table_column[:name] == 'subtotal'
-  #     collection.having("#{query_subtotal} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
-  #   elsif table_column[:name] == 'tax'
-  #     collection.having("#{query_tax} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
-  #   elsif table_column[:name] == 'total'
-  #     collection.having("#{query_total} = ?", (search_term.gsub(/[^0-9.]/, '').to_f * 100.0).to_i)
-  #   else
-  #     super
-  #   end
-  # end
-
-end

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

@@ -1,22 +0,0 @@
-= dropdown(variation: :dropleft) do
-  - if datatable.admin_namespace?
-    = 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?
-      = 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}?" }
-
-  - else
-    = dropdown_link_to 'View', effective_orders.order_path(order)

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

@@ -1,18 +0,0 @@
-- if order.purchased? && EffectiveOrders.authorized?(controller, :show, :payment_details)
-  .effective-order-payment-details
-    %h2 Payment Details
-    %table.table
-      %tbody
-        %tr
-          %td Provider
-          %td= order.payment_provider
-        %tr
-          %td Card
-          %td
-            = payment_card_label(order.payment_card)
-            = (order.payment['f4l4'] rescue nil)
-
-        %tr
-          %td Purchased at
-          %td= order.purchased_at.strftime('%F %H:%M')
-

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

@@ -1,7 +0,0 @@
-%h1.effective-heading= @page_title
-
-- if EffectiveOrders.cheque[:success_message].present?
-  %p.effective-orders-page-content
-    = EffectiveOrders.cheque[:success_message]
-
-= render @order