effective_orders 4.6.3 → 5.0.4

data/app/models/effective/order_item.rb

@@ -2,15 +2,21 @@ module Effective
   class OrderItem < ActiveRecord::Base
     self.table_name = EffectiveOrders.order_items_table_name.to_s
 
-    belongs_to :order, class_name: 'Effective::Order'
+    belongs_to :order
     belongs_to :purchasable, polymorphic: true
 
-    # Attributes
-    # name                  :string
-    # quantity              :integer
-    # price                 :integer, default: 0
-    # tax_exempt            :boolean
-    # timestamps
+    if defined?(EffectiveQbSync)
+      has_one :qb_order_item
+    end
+
+    effective_resource do
+      name                  :string
+      quantity              :integer
+      price                 :integer
+      tax_exempt            :boolean
+
+      timestamps
+    end
 
     validates :purchasable, associated: true, presence: true
     accepts_nested_attributes_for :purchasable
@@ -24,7 +30,7 @@ module Effective
     scope :purchased_by, lambda { |user| where(order_id: Effective::Order.purchased_by(user)) }
 
     def to_s
-      (quantity || 0) > 1 ? "#{quantity}x #{name}" : name
+      ((quantity || 0) > 1 ? "#{quantity}x #{name}" : name) || 'order item'
     end
 
     def purchased_download_url
@@ -59,5 +65,11 @@ module Effective
       end
     end
 
+    # first or build
+    def qb_item_name
+      raise('expected EffectiveQbSync gem') unless defined?(EffectiveQbSync)
+      (qb_order_item || build_qb_order_item(name: purchasable.qb_item_name)).name
+    end
+
   end
 end

data/app/models/effective/product.rb

@@ -4,12 +4,17 @@ module Effective
 
     acts_as_purchasable
 
-    # Attributes
-    # name          :string
-    # price         :integer, default: 0
-    # tax_exempt    :boolean, default: false
-    #
-    # timestamps
+    # belongs_to :purchased_order_id
+
+    effective_resource do
+      name          :string
+      qb_item_name  :string
+
+      price         :integer
+      tax_exempt    :boolean
+
+      timestamps
+    end
 
     validates :name, presence: true
     validates :price, presence: true

data/app/models/effective/subscription.rb

@@ -4,20 +4,21 @@ module Effective
 
     attr_accessor :stripe_subscription
 
-    belongs_to :customer, class_name: 'Effective::Customer', counter_cache: true
+    belongs_to :customer, counter_cache: true
     belongs_to :subscribable, polymorphic: true
 
-    # Attributes
-    # stripe_plan_id            :string
-    # stripe_subscription_id    :string
-    # name                      :string
-    # description               :string
-    # interval                  :string
-    # quantity                  :integer
-    #
-    # status                    :string
-    #
-    # timestamps
+    effective_resource do
+      stripe_plan_id            :string
+      stripe_subscription_id    :string
+      name                      :string
+      description               :string
+      interval                  :string
+      quantity                  :integer
+
+      status                    :string
+
+      timestamps
+    end
 
     before_validation(if: -> { plan && (stripe_plan_id_changed? || new_record?) }) do
       self.name = plan[:name]

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

@@ -1,19 +1,15 @@
 = effective_form_with(model: [:admin, order], url: (order.persisted? ? effective_orders.admin_order_path(order) : effective_orders.admin_orders_path)) do |f|
   - if f.object.new_record?
-    = f.select :user_id, @users || User.all.to_a.sort { |user1, user2| user1.to_s <=> user2.to_s },
+    - user_collection = current_user.class.respond_to?(:sorted) ? current_user.class.sorted : current_user.class.all
+
+    = f.select :user_id, (@users || user_collection),
       label: 'Buyer', required: true, hint: 'The user that should purchase this order.'
 
     = f.email_cc_field :cc, hint: "Cc the above on any emailed receipts or payment requests."
 
     %h2 Order Items
-    .order_items
-      - f.object.order_items.build unless f.object.order_items.present?
-
-      = f.fields_for :order_items, f.object.order_items do |order_item|
-        = render 'order_item_fields', f: order_item
-
-      .links
-        = link_to_add_association (icon('plus') + 'Add item'), f, :order_items, class: 'btn btn-secondary', partial: 'order_item_fields'
+    = f.has_many :order_items do |fc|
+      = render 'order_item_fields', f: fc
 
     %hr
 

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

@@ -1,14 +1,10 @@
-.nested-fields.order-item
-  .row.align-items-center
-    = f.fields_for :purchasable, (f.object.purchasable || Effective::Product.new) do |pf|
-      .col-md-2= f.number_field :quantity, input_html: { value: f.object.quantity || 1, min: 1 }
-      .col-md-4= pf.text_field :name, maxlength: 255
-      .col-md-2= pf.price_field :price
+.row.align-items-center
+  = f.fields_for :purchasable, (f.object.purchasable || Effective::Product.new) do |pf|
+    .col= f.number_field :quantity, input_html: { value: f.object.quantity || 1, min: 1 }
+    .col= pf.text_field :name
+    .col= pf.price_field :price
 
-      - if defined?(EffectiveQbSync)
-        .col-md-2= pf.text_field :qb_item_name, maxlength: 255, label: 'Quickbooks Item'
+    - if EffectiveOrders.use_effective_qb_sync
+      .col= pf.text_field :qb_item_name, label: 'Quickbooks Item'
 
-      .col-md-2.mt-4= pf.check_box :tax_exempt, label: "Tax Exempt", title: 'When checked, tax will not be applied to this item'
-      .col-md-1
-        = link_to_remove_association(f, 'data-confirm': 'Remove?') do
-          = icon('trash-2', class: 'text-danger')
+    .col= pf.check_box :tax_exempt, label: "Tax Exempt", title: 'When checked, tax will not be applied to this item'

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