effective_orders 4.6.3 → 5.0.4

data/app/controllers/effective/customers_controller.rb

@@ -1,10 +1,12 @@
 module Effective
   class CustomersController < ApplicationController
-    layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:customers] : EffectiveOrders.layout)
+    before_action(:authenticate_user!) if defined?(Devise)
 
     include Effective::CrudController
 
-    before_action :authenticate_user!
+    if (config = EffectiveOrders.layout)
+      layout(config.kind_of?(Hash) ? (config[:customers] || config[:application]) : config)
+    end
 
     submit :save, 'Save', success: -> { 'Successfully updated card.' }
     page_title 'Customer Settings'

data/app/controllers/effective/orders_controller.rb

@@ -1,18 +1,21 @@
 module Effective
   class OrdersController < ApplicationController
+    include Effective::CrudController
     include Concerns::Purchase
 
-    include Providers::Cheque if EffectiveOrders.cheque?
-    include Providers::Free if EffectiveOrders.free?
-    include Providers::MarkAsPaid if EffectiveOrders.mark_as_paid?
-    include Providers::Moneris if EffectiveOrders.moneris?
-    include Providers::Paypal if EffectiveOrders.paypal?
-    include Providers::Phone if EffectiveOrders.phone?
-    include Providers::Pretend if EffectiveOrders.pretend?
-    include Providers::Refund if EffectiveOrders.refund?
-    include Providers::Stripe if EffectiveOrders.stripe?
-
-    layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:orders] : EffectiveOrders.layout)
+    include Providers::Cheque
+    include Providers::Free
+    include Providers::MarkAsPaid
+    include Providers::Moneris
+    include Providers::Paypal
+    include Providers::Phone
+    include Providers::Pretend
+    include Providers::Refund
+    include Providers::Stripe
+
+    if (config = EffectiveOrders.layout)
+      layout(config.kind_of?(Hash) ? (config[:orders] || config[:application]) : config)
+    end
 
     before_action :authenticate_user!, except: [:ccbill_postback, :free, :paypal_postback, :moneris_postback, :pretend]
     before_action :set_page_title, except: [:show]
@@ -26,7 +29,7 @@ module Effective
     def new
       @order ||= Effective::Order.new(view_context.current_cart)
 
-      EffectiveOrders.authorize!(self, :new, @order)
+      EffectiveResources.authorize!(self, :new, @order)
 
       unless @order.valid?
         flash[:danger] = "Unable to proceed: #{flash_errors(@order)}. Please try again."
@@ -38,7 +41,7 @@ module Effective
     # Confirms an order from the cart.
     def create
       @order ||= Effective::Order.new(view_context.current_cart)
-      EffectiveOrders.authorize!(self, :create, @order)
+      EffectiveResources.authorize!(self, :create, @order)
 
       @order.assign_attributes(checkout_params)
 
@@ -57,7 +60,7 @@ module Effective
     # Might render step1 or step2
     def show
       @order = Effective::Order.find(params[:id])
-      EffectiveOrders.authorize!(self, :show, @order)
+      EffectiveResources.authorize!(self, :show, @order)
 
       @page_title ||= ((@order.user == current_user && !@order.purchased?) ? 'Checkout' : @order.to_s)
     end
@@ -65,13 +68,13 @@ module Effective
     # Always step1
     def edit
       @order ||= Effective::Order.not_purchased.find(params[:id])
-      EffectiveOrders.authorize!(self, :edit, @order)
+      EffectiveResources.authorize!(self, :edit, @order)
     end
 
     # Confirms the order from existing order
     def update
       @order ||= Effective::Order.not_purchased.find(params[:id])
-      EffectiveOrders.authorize!(self, :update, @order)
+      EffectiveResources.authorize!(self, :update, @order)
 
       @order.assign_attributes(checkout_params)
 
@@ -86,28 +89,28 @@ module Effective
     # My Orders History
     def index
       @datatable = EffectiveOrdersDatatable.new(user_id: current_user.id)
-      EffectiveOrders.authorize!(self, :index, Effective::Order.new(user: current_user))
+      EffectiveResources.authorize!(self, :index, Effective::Order.new(user: current_user))
     end
 
     # Thank you for Purchasing this Order. This is where a successfully purchased order ends up
     def purchased # Thank You!
       @order = Effective::Order.purchased.find(params[:id])
-      EffectiveOrders.authorize!(self, :show, @order)
+      EffectiveResources.authorize!(self, :show, @order)
     end
 
     def deferred
       @order = Effective::Order.deferred.find(params[:id])
-      EffectiveOrders.authorize!(self, :show, @order)
+      EffectiveResources.authorize!(self, :show, @order)
     end
 
     def declined
       @order = Effective::Order.declined.find(params[:id])
-      EffectiveOrders.authorize!(self, :show, @order)
+      EffectiveResources.authorize!(self, :show, @order)
     end
 
     def send_buyer_receipt
       @order = Effective::Order.purchased.find(params[:id])
-      EffectiveOrders.authorize!(self, :show, @order)
+      EffectiveResources.authorize!(self, :show, @order)
 
       if @order.send_order_receipt_to_buyer!
         flash[:success] = "A receipt has been sent to #{@order.emails_send_to}"
@@ -128,10 +131,10 @@ module Effective
       @orders = Effective::Order.purchased.where(id: params[:ids])
 
       begin
-        EffectiveOrders.authorize!(self, :index, Effective::Order.new(user: current_user))
+        EffectiveResources.authorize!(self, :index, Effective::Order.new(user: current_user))
 
         @orders.each do |order|
-          next unless EffectiveOrders.authorized?(self, :show, order)
+          next unless EffectiveResources.authorized?(self, :show, order)
           order.send_order_receipt_to_buyer!
         end
 

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

@@ -4,9 +4,11 @@ module Effective
       extend ActiveSupport::Concern
 
       def cheque
+        raise('cheque provider is not available') unless EffectiveOrders.cheque?
+
         @order ||= Order.find(params[:id])
 
-        EffectiveOrders.authorize!(self, :update, @order)
+        EffectiveResources.authorize!(self, :update, @order)
 
         flash[:success] = EffectiveOrders.cheque[:success]
 

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

@@ -4,9 +4,11 @@ module Effective
       extend ActiveSupport::Concern
 
       def free
+        raise('free provider is not available') unless EffectiveOrders.free?
+
         @order ||= Order.find(params[:id])
 
-        EffectiveOrders.authorize!(self, :update, @order)
+        EffectiveResources.authorize!(self, :update, @order)
 
         unless @order.free?
           flash[:danger] = 'Unable to process free order with a non-zero total'
@@ -19,7 +21,6 @@ module Effective
           provider: 'free',
           card: 'none',
           purchased_url: free_params[:purchased_url],
-          declined_url: free_params[:declined_url],
           email: false
         )
       end

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

@@ -4,10 +4,12 @@ module Effective
       extend ActiveSupport::Concern
 
       def mark_as_paid
+        raise('mark_as_paid provider is not available') unless EffectiveOrders.mark_as_paid?
+
         @order ||= Order.find(params[:id])
 
-        EffectiveOrders.authorize!(self, :update, @order)
-        EffectiveOrders.authorize!(self, :admin, :effective_orders)
+        EffectiveResources.authorize!(self, :update, @order)
+        EffectiveResources.authorize!(self, :admin, :effective_orders)
 
         @order.assign_attributes(mark_as_paid_params.except(:payment, :payment_provider, :payment_card))
 
@@ -17,8 +19,7 @@ module Effective
           card: mark_as_paid_params[:payment_card],
           email: @order.send_mark_as_paid_email_to_buyer?,
           skip_buyer_validations: true,
-          purchased_url: effective_orders.admin_order_path(@order),
-          declined_url: effective_orders.admin_order_path(@order)
+          purchased_url: effective_orders.admin_order_path(@order)
         )
       end
 

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

@@ -10,9 +10,11 @@ module Effective
       end
 
       def moneris_postback
+        raise('moneris provider is not available') unless EffectiveOrders.moneris?
+
         @order ||= Effective::Order.find(params[:response_order_id])
 
-        (EffectiveOrders.authorize!(self, :update, @order) rescue false)
+        (EffectiveResources.authorize!(self, :update, @order) rescue false)
 
         # Delete the Purchased and Declined Redirect URLs
         purchased_url = params.delete(:rvar_purchased_url)

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

@@ -10,9 +10,11 @@ module Effective
       # TODO: Make paypal postback work with admin checkout workflow
 
       def paypal_postback
+        raise('paypal provider is not available') unless EffectiveOrders.paypal?
+
         @order ||= Effective::Order.where(id: (params[:invoice].to_i rescue 0)).first
 
-        (EffectiveOrders.authorize!(self, :update, @order) rescue false)
+        (EffectiveResources.authorize!(self, :update, @order) rescue false)
 
         if @order.present?
           if @order.purchased?
@@ -27,7 +29,6 @@ module Effective
         head(:ok)
       end
 
-
     end
   end
 end

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

@@ -4,9 +4,11 @@ module Effective
       extend ActiveSupport::Concern
 
       def phone
+        raise('phone provider is not available') unless EffectiveOrders.phone?
+
         @order ||= Order.find(params[:id])
 
-        EffectiveOrders.authorize!(self, :update, @order)
+        EffectiveResources.authorize!(self, :update, @order)
 
         flash[:success] = EffectiveOrders.phone[:success]
 

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

@@ -4,16 +4,17 @@ module Effective
       extend ActiveSupport::Concern
 
       def pretend
+        raise('pretend provider is not available') unless EffectiveOrders.pretend?
+
         @order ||= Order.find(params[:id])
 
-        EffectiveOrders.authorize!(self, :update, @order)
+        EffectiveResources.authorize!(self, :update, @order)
 
         order_purchased(
           payment: 'for pretend',
           provider: 'pretend',
           card: 'none',
-          purchased_url: pretend_params[:purchased_url],
-          declined_url: pretend_params[:declined_url]
+          purchased_url: pretend_params[:purchased_url]
         )
       end
 

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

@@ -4,9 +4,11 @@ module Effective
       extend ActiveSupport::Concern
 
       def refund
+        raise('refund provider is not available') unless EffectiveOrders.refund?
+
         @order ||= Order.find(params[:id])
 
-        EffectiveOrders.authorize!(self, :update, @order)
+        EffectiveResources.authorize!(self, :update, @order)
 
         unless @order.refund?
           flash[:danger] = 'Unable to process refund order with a positive total'
@@ -19,8 +21,7 @@ module Effective
         order_purchased(
           payment: 'refund. no payment required.',
           provider: 'refund',
-          purchased_url: refund_params[:purchased_url],
-          declined_url: refund_params[:declined_url]
+          purchased_url: refund_params[:purchased_url]
         )
       end
 

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

@@ -4,10 +4,12 @@ module Effective
       extend ActiveSupport::Concern
 
       def stripe
+        raise('stripe provider is not available') unless EffectiveOrders.stripe?
+
         @order = Order.find(params[:id])
         @customer = Effective::Customer.for_user(@order.user)
 
-        EffectiveOrders.authorize!(self, :update, @order)
+        EffectiveResources.authorize!(self, :update, @order)
 
         payment = validate_stripe_payment(stripe_params[:payment_intent_id])
 
@@ -24,8 +26,7 @@ module Effective
           payment: payment,
           provider: 'stripe',
           card: payment[:card],
-          purchased_url: stripe_params[:purchased_url],
-          declined_url: stripe_params[:declined_url]
+          purchased_url: stripe_params[:purchased_url]
         )
       end
 

data/app/controllers/effective/subscripter_controller.rb

@@ -1,9 +1,11 @@
 module Effective
   class SubscripterController < ApplicationController
-    layout (EffectiveOrders.layout.kind_of?(Hash) ? EffectiveOrders.layout[:subscriptions] : EffectiveOrders.layout)
-
     include Effective::CrudController
 
+    if (config = EffectiveOrders.layout)
+      layout(config.kind_of?(Hash) ? (config[:subscriptions] || config[:application]) : config)
+    end
+
     submit :save, 'Save', redirect: :back, success: -> { 'Successfully updated plan.' }
 
     def resource

data/app/controllers/effective/webhooks_controller.rb

@@ -89,9 +89,18 @@ module Effective
       end
     end
 
-    def send_email(email, *mailer_args)
-      Effective::OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
-      Effective::OrdersMailer.public_send(:subscription_event_to_admin, email.to_s, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method])
+    def send_email(email, *args)
+      raise('expected args to be an Array') unless args.kind_of?(Array)
+
+      if defined?(Tenant)
+        tenant = Tenant.current || raise('expected a current tenant')
+        args << { tenant: tenant }
+      end
+
+      deliver_method = EffectiveOrders.mailer[:deliver_method] || EffectiveResources.deliver_method
+
+      EffectiveOrders.mailer_klass.send(email, *args).send(deliver_method)
+      EffectiveOrders.mailer_klass.send(:subscription_event_to_admin, email.to_s, *args).send(deliver_method)
     end
 
     def run_subscribable_buyer_callbacks!

data/app/datatables/admin/effective_customers_datatable.rb

@@ -2,8 +2,12 @@ class Admin::EffectiveCustomersDatatable < Effective::Datatable
    datatable do
 
     col :id, visible: false
-    col :user
-    col 'user.email'
+
+    col :user, search: :string
+
+    col :email do |customer|
+      customer.user.email
+    end
 
     if EffectiveOrders.stripe?
       col :stripe_customer_id
@@ -17,6 +21,6 @@ class Admin::EffectiveCustomersDatatable < Effective::Datatable
   end
 
   collection do
-    Effective::Customer.joins(:user).all
+    Effective::Customer.includes(:user).all
   end
 end

data/app/datatables/admin/effective_orders_datatable.rb

@@ -14,7 +14,7 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
   end
 
   filters do
-    if attributes[:user_id].blank? && attributes[:parent_id].blank?
+    unless attributes[:skip_filters]
       scope :purchased, default: true
       scope :deferred
       scope :refunds
@@ -40,7 +40,7 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
     end
 
     if attributes[:user_id].blank?
-      col :user
+      col :user, search: :string
       col :billing_name, visible: false
       col :email, visible: false
     end
@@ -84,13 +84,14 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Order.all.includes(:addresses, :order_items, :user)
+    scope = Effective::Order.all.deep
 
     if EffectiveOrders.orders_collection_scope.respond_to?(:call)
       scope = EffectiveOrders.orders_collection_scope.call(scope)
     end
 
     if attributes[:user_id].present?
+      user = current_user.class.find(attributes[:user_id])
       scope = scope.where(user: user)
     end
 
@@ -101,8 +102,4 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
     scope
   end
 
-  def user
-    @user ||= User.find(attributes[:user_id])
-  end
-
 end

data/app/datatables/effective_orders_datatable.rb

@@ -6,8 +6,6 @@ class EffectiveOrdersDatatable < Effective::Datatable
       scope :purchased, default: true
       scope :deferred
       scope :refunds
-      scope :not_purchased
-      scope :all
     end
   end
 
@@ -61,7 +59,9 @@ class EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Order.all.where(user: user).includes(:addresses, :order_items, :user)
+    user = current_user.class.find(attributes[:user_id])
+
+    scope = Effective::Order.all.deep.where(user: user)
 
     if EffectiveOrders.orders_collection_scope.respond_to?(:call)
       scope = EffectiveOrders.orders_collection_scope.call(scope)
@@ -78,8 +78,4 @@ class EffectiveOrdersDatatable < Effective::Datatable
     scope
   end
 
-  def user
-    @user ||= User.find(attributes[:user_id])
-  end
-
 end