effective_orders 4.6.2 → 5.0.3

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

@@ -30,8 +30,7 @@
       %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 EffectiveResources.authorized?(controller, :admin, :effective_orders) && order.user != current_user
     - if EffectiveOrders.mark_as_paid?
       .effective-order-admin-purchase-actions
         = render partial: '/effective/orders/mark_as_paid/form', locals: provider_locals
-

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

@@ -3,11 +3,11 @@
     = link_to 'Print', '#', class: 'btn btn-primary print-button', data: { role: 'print-button' }, onClick: 'window.print(); false;'
 
   - if order.purchased?
-    = link_to 'Email receipt to buyer', effective_orders.send_buyer_receipt_order_path(order),
+    = link_to 'E-mail Receipt', effective_orders.send_buyer_receipt_order_path(order),
       class: 'btn btn-secondary',
       data: { confirm: "Send receipt to #{order.emails_send_to}?" }
 
-  - if order.persisted? && EffectiveOrders.authorized?(controller, :admin, :effective_orders)
+  - if order.persisted? && EffectiveResources.authorized?(controller, :admin, :effective_orders)
     - 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/app/views/effective/orders/show.html.haml

@@ -4,3 +4,7 @@
   = render_checkout(@order)
 - else
   = render @order
+
+%hr
+
+= link_to 'Continue', effective_orders.orders_path, class: 'btn btn-primary'

data/config/effective_orders.rb

@@ -10,38 +10,8 @@ EffectiveOrders.setup do |config|
   config.subscriptions_table_name = :subscriptions
   config.products_table_name = :products
 
-  # Authorization Method
-  #
-  # This method is called by all controller actions with the appropriate action and resource
-  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
-  #
-  # Use via Proc (and with CanCan):
-  # config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) }
-  #
-  # Use via custom method:
-  # config.authorization_method = :my_authorization_method
-  #
-  # And then in your application_controller.rb:
-  #
-  # def my_authorization_method(action, resource)
-  #   current_user.is?(:admin)
-  # end
-  #
-  # Or disable the check completely:
-  # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
-
   # Layout Settings
-  # Configure the Layout per controller, or all at once
-
-  # config.layout = 'application'   # All EffectiveOrders controllers will use this layout
-  config.layout = {
-    carts: 'application',
-    orders: 'application',
-    subscriptions: 'application',
-    admin_customers: 'admin',
-    admin_orders: 'admin'
-  }
+  # config.layout = { application: 'application', admin: 'admin' }
 
   # Filter the @orders on admin/orders#index screen
   # config.orders_collection_scope = Proc.new { |scope| scope.where(...) }
@@ -54,6 +24,9 @@ EffectiveOrders.setup do |config|
   # Use effective_obfuscation gem to change order.id into a seemingly random 10-digit number
   config.obfuscate_order_ids = false
 
+  # Synchronize with Quickbooks
+  config.use_effective_qb_sync = false
+
   # If set, the orders#new screen will render effective/orders/_order_note_fields to capture any Note info
   config.collect_note = false
   config.collect_note_required = false
@@ -113,6 +86,9 @@ EffectiveOrders.setup do |config|
 
   # subject_for_subscription_trialing: Proc.new { |subscribable| "Pending Order #{order.to_param}"}
 
+  # Use this mailer class. You can extend.
+  config.mailer_class_name = 'Effective::OrdersMailer'
+
   config.mailer = {
     send_order_receipt_to_admin: true,
     send_order_receipt_to_buyer: true,
@@ -155,7 +131,7 @@ EffectiveOrders.setup do |config|
     default_from: 'info@example.com',
     admin_email: 'admin@example.com',   # Refund notifications will also be sent here
 
-    deliver_method: nil  # When nil, will use deliver_later if active_job is configured, otherwise deliver_now
+    deliver_method: nil  # When nil, will try deliver_later and fallback to deliver_now
   }
 
   #######################################

data/config/routes.rb

@@ -1,5 +1,5 @@
 EffectiveOrders::Engine.routes.draw do
-  scope :module => 'effective' do
+  scope module: 'effective' do
     resources :orders, except: [:destroy] do
       member do
         get :purchased
@@ -7,33 +7,32 @@ EffectiveOrders::Engine.routes.draw do
         get :declined
         get :send_buyer_receipt
 
-        post :free if EffectiveOrders.free?
-        post :mark_as_paid if EffectiveOrders.mark_as_paid?
-        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?
+        post :free
+        post :mark_as_paid
+        post :cheque
+        post :phone
+        post :pretend
+        post :refund
+        post :stripe
       end
 
       collection do
         post :bulk_send_buyer_receipt
 
-        post :moneris_postback if EffectiveOrders.moneris?
-        post :paypal_postback if EffectiveOrders.paypal?
+        post :moneris_postback
+        post :paypal_postback
       end
     end
 
     post 'orders/:id', to: 'orders#update'
 
-    if EffectiveOrders.subscriptions?
-      match 'subscribe', to: 'subscripter#update', via: :post, as: :subscripter
-
-      match 'customer/settings', to: 'customers#edit', as: :customer_settings, via: [:get]
-      match 'customer/settings', to: 'customers#update', via: [:patch, :put, :post]
-      match 'webhooks/stripe', to: 'webhooks#stripe', via: [:get, :post, :put]
-    end
+    # Subscriptions
+    match 'subscribe', to: 'subscripter#update', via: :post, as: :subscripter
+    match 'customer/settings', to: 'customers#edit', as: :customer_settings, via: [:get]
+    match 'customer/settings', to: 'customers#update', via: [:patch, :put, :post]
+    match 'webhooks/stripe', to: 'webhooks#stripe', via: [:get, :post, :put]
 
+    # Carts
     match 'cart', to: 'carts#show', as: 'cart', via: :get
     match 'cart', to: 'carts#destroy', via: :delete
 

data/db/migrate/01_create_effective_orders.rb.erb

@@ -2,6 +2,7 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
   def self.up
     create_table <%= @orders_table_name %> do |t|
       t.integer   :user_id
+      t.string    :user_type
 
       t.integer   :parent_id
       t.string    :parent_type
@@ -53,6 +54,8 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
 
     create_table <%= @carts_table_name %> do |t|
       t.integer   :user_id
+      t.string    :user_type
+
       t.integer   :cart_items_count, :default => 0
       t.timestamps
     end
@@ -76,6 +79,7 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
 
     create_table <%= @customers_table_name %> do |t|
       t.integer   :user_id
+      t.string    :user_type
 
       t.string    :stripe_customer_id
       t.string    :payment_method_id

data/lib/effective_orders.rb

@@ -1,94 +1,47 @@
 require 'effective_addresses'
+require 'effective_resources'
 require 'effective_orders/engine'
 require 'effective_orders/version'
 
 module EffectiveOrders
-  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
-
+  # Order states
+  PENDING = 'pending'        # New orders are created in a pending state
+  CONFIRMED = 'confirmed'    # Once the order has passed checkout step 1
+  DEFERRED = 'deferred'      # Deferred providers. Cheque or Phone was selected.
+  PURCHASED = 'purchased'    # Purchased by provider
+  DECLINED = 'declined'      # Declined by provider
   STATES = { PENDING => PENDING, CONFIRMED => CONFIRMED, DEFERRED => DEFERRED, PURCHASED => PURCHASED, DECLINED => DECLINED }
 
   # Subscription statuses (as per stripe)
-  ACTIVE = 'active'.freeze
-  PAST_DUE = 'past_due'.freeze
-  TRIALING = 'trialing'.freeze
-  CANCELED = 'canceled'.freeze
+  ACTIVE = 'active'
+  PAST_DUE = 'past_due'
+  TRIALING = 'trialing'
+  CANCELED = 'canceled'
 
   STATUSES = { ACTIVE => ACTIVE, PAST_DUE => PAST_DUE, CANCELED => CANCELED, TRIALING => TRIALING }
 
-  # The following are all valid config keys
-  mattr_accessor :orders_table_name
-  mattr_accessor :order_items_table_name
-  mattr_accessor :carts_table_name
-  mattr_accessor :cart_items_table_name
-  mattr_accessor :customers_table_name
-  mattr_accessor :subscriptions_table_name
-  mattr_accessor :products_table_name
-
-  mattr_accessor :authorization_method
-
-  mattr_accessor :layout
-  mattr_accessor :mailer
-
-  mattr_accessor :orders_collection_scope
-  mattr_accessor :order_tax_rate_method
-
-  mattr_accessor :obfuscate_order_ids
-  mattr_accessor :billing_address
-  mattr_accessor :shipping_address
-  mattr_accessor :use_address_full_name
-
-  mattr_accessor :collect_note
-  mattr_accessor :collect_note_required
-  mattr_accessor :collect_note_message
-
-  mattr_accessor :terms_and_conditions
-  mattr_accessor :terms_and_conditions_label
-
-  mattr_accessor :minimum_charge
-
-  # Features
-  mattr_accessor :free_enabled
-  mattr_accessor :mark_as_paid_enabled
-  mattr_accessor :pretend_enabled
-  mattr_accessor :pretend_message
-
-  # Payment processors. false or Hash
-  mattr_accessor :cheque
-  mattr_accessor :moneris
-  mattr_accessor :paypal
-  mattr_accessor :phone
-  mattr_accessor :refund
-  mattr_accessor :stripe
-  mattr_accessor :subscriptions  # Stripe subscriptions
-  mattr_accessor :trial          # Trial mode
-
-  def self.setup
-    yield self
-  end
-
-  def self.authorized?(controller, action, resource)
-    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
-
-    return !!authorization_method unless authorization_method.respond_to?(:call)
-    controller = controller.controller if controller.respond_to?(:controller)
-
-    begin
-      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
-    rescue *@_exceptions
-      false
-    end
+  def self.config_keys
+    [
+      :orders_table_name, :order_items_table_name, :carts_table_name, :cart_items_table_name,
+      :customers_table_name, :subscriptions_table_name, :products_table_name,
+      :layout, :mailer_class_name, :mailer,
+      :orders_collection_scope, :order_tax_rate_method,
+      :obfuscate_order_ids, :use_effective_qb_sync,
+      :billing_address, :shipping_address, :use_address_full_name,
+      :collect_note, :collect_note_required, :collect_note_message,
+      :terms_and_conditions, :terms_and_conditions_label, :minimum_charge,
+
+      # Features
+      :free_enabled, :mark_as_paid_enabled, :pretend_enabled, :pretend_message,
+      # Payment processors. false or Hash
+      :cheque, :moneris, :paypal, :phone, :refund, :stripe, :subscriptions, :trial
+    ]
   end
 
-  def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
-  end
+  include EffectiveGem
 
   def self.permitted_params
-    [
+    @permitted_params ||= [
       :cc, :note, :terms_and_conditions, :confirmed_checkout,
       billing_address: EffectiveAddresses.permitted_params,
       shipping_address: EffectiveAddresses.permitted_params,
@@ -169,6 +122,11 @@ module EffectiveOrders
     [('cheque' if cheque?), ('phone' if phone?)].compact
   end
 
+  def self.mailer_klass
+    name = mailer_class_name.presence || 'Effective::OrdersMailer'
+    name.safe_constantize || raise("unable to constantize mailer class. check config.mailer_class_name")
+  end
+
   def self.can_skip_checkout_step1?
     return false if require_billing_address
     return false if require_shipping_address

data/lib/effective_orders/engine.rb

@@ -16,13 +16,6 @@ module EffectiveOrders
       eval File.read("#{config.root}/config/effective_orders.rb")
     end
 
-    # Set up mail delivering config option
-    initializer 'effective_orders.mailer', after: :load_config_initializers do |app|
-      EffectiveOrders.mailer[:deliver_method] ||= (
-        (Rails.application.config.respond_to?(:active_job) && Rails.application.config.active_job.queue_adapter) ? :deliver_later : :deliver_now
-      )
-    end
-
     initializer "effective_orders.append_precompiled_assets" do |app|
       Rails.application.config.assets.precompile += ['effective_orders/*']
     end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.6.2'.freeze
+  VERSION = '5.0.3'.freeze
 end

data/lib/generators/templates/effective_orders_mailer_preview.rb

@@ -4,55 +4,55 @@
 
 class EffectiveOrdersMailerPreview < ActionMailer::Preview
   def order_receipt_to_admin
-    Effective::OrdersMailer.order_receipt_to_admin(build_preview_order)
+    EffectiveOrders.mailer_klass.order_receipt_to_admin(build_preview_order)
   end
 
   def order_receipt_to_buyer
-    Effective::OrdersMailer.order_receipt_to_buyer(build_preview_order)
+    EffectiveOrders.mailer_klass.order_receipt_to_buyer(build_preview_order)
   end
 
   def payment_request_to_buyer
-    Effective::OrdersMailer.payment_request_to_buyer(build_preview_order)
+    EffectiveOrders.mailer_klass.payment_request_to_buyer(build_preview_order)
   end
 
   def pending_order_invoice_to_buyer
-    Effective::OrdersMailer.pending_order_invoice_to_buyer(build_preview_order)
+    EffectiveOrders.mailer_klass.pending_order_invoice_to_buyer(build_preview_order)
   end
 
   def subscription_payment_succeeded
-    Effective::OrdersMailer.subscription_payment_succeeded(preview_customer)
+    EffectiveOrders.mailer_klass.subscription_payment_succeeded(preview_customer)
   end
 
   def subscription_payment_failed
-    Effective::OrdersMailer.subscription_payment_failed(preview_customer)
+    EffectiveOrders.mailer_klass.subscription_payment_failed(preview_customer)
   end
 
   def subscription_created
-    Effective::OrdersMailer.subscription_created(preview_customer)
+    EffectiveOrders.mailer_klass.subscription_created(preview_customer)
   end
 
   def subscription_updated
-    Effective::OrdersMailer.subscription_updated(preview_customer)
+    EffectiveOrders.mailer_klass.subscription_updated(preview_customer)
   end
 
   def subscription_canceled
-    Effective::OrdersMailer.subscription_canceled(preview_customer)
+    EffectiveOrders.mailer_klass.subscription_canceled(preview_customer)
   end
 
   def subscription_trialing
-    Effective::OrdersMailer.subscription_trialing(preview_subscribable)
+    EffectiveOrders.mailer_klass.subscription_trialing(preview_subscribable)
   end
 
   def subscription_trial_expired
-    Effective::OrdersMailer.subscription_trial_expired(preview_subscribable)
+    EffectiveOrders.mailer_klass.subscription_trial_expired(preview_subscribable)
   end
 
   def subscription_event_to_admin
-    Effective::OrdersMailer.subscription_event_to_admin(:subscription_updated, preview_customer)
+    EffectiveOrders.mailer_klass.subscription_event_to_admin(:subscription_updated, preview_customer)
   end
 
   def order_error
-    Effective::OrdersMailer.order_error(order: build_preview_order, error: 'Something did not work out')
+    EffectiveOrders.mailer_klass.order_error(order: build_preview_order, error: 'Something did not work out')
   end
 
   protected

data/lib/tasks/effective_orders_tasks.rake

@@ -44,7 +44,7 @@ namespace :effective_orders do
         klass.trialing.find_each do |subscribable|
           if subscribable.trialing_until == today
             puts "sending trial expired to #{subscribable}"
-            Effective::OrdersMailer.subscription_trial_expired(subscribable).deliver_now
+            EffectiveOrders.mailer_klass.subscription_trial_expired(subscribable).deliver_now
           end
 
           next if subscribable.trial_past_due? # We already notified them
@@ -53,7 +53,7 @@ namespace :effective_orders do
 
           reminders.each do |remind_at|
             next unless today == (date + remind_at)
-            Effective::OrdersMailer.subscription_trialing(subscribable).deliver_now
+            EffectiveOrders.mailer_klass.subscription_trialing(subscribable).deliver_now
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,7 +156,6 @@ files:
 - app/models/concerns/acts_as_purchasable.rb
 - app/models/concerns/acts_as_subscribable.rb
 - app/models/concerns/acts_as_subscribable_buyer.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/cart.rb
 - app/models/effective/cart_item.rb
 - app/models/effective/customer.rb