effective_orders 3.2.3 → 4.0.0beta1

data/config/routes.rb

@@ -1,46 +1,30 @@
-Rails.application.routes.draw do
-  unless EffectiveOrders.skip_mount_engine
-    mount EffectiveOrders::Engine => '/', as: 'effective_orders'
-  end
-end
-
 EffectiveOrders::Engine.routes.draw do
-  scope module: 'effective' do
-
+  scope :module => 'effective' do
     resources :orders, except: [:destroy] do
       member do
         get :purchased
         get :declined
         get :send_buyer_receipt
 
-        post :app_checkout if EffectiveOrders.app_checkout_enabled
-        post :free if EffectiveOrders.allow_free_orders
-        post :mark_as_paid if EffectiveOrders.mark_as_paid_enabled
-        post :pay_by_cheque if EffectiveOrders.cheque_enabled
-        post :pretend if EffectiveOrders.allow_pretend_purchase_in_production && Rails.env.production?
-        post :pretend if EffectiveOrders.allow_pretend_purchase_in_development && !Rails.env.production?
-        post :refund if EffectiveOrders.allow_refunds
+        post :free if EffectiveOrders.free?
+        post :mark_as_paid if EffectiveOrders.mark_as_paid?
+        post :pay_by_cheque if EffectiveOrders.cheque?
+        post :pretend if EffectiveOrders.pretend?
+        post :refund if EffectiveOrders.refunds?
       end
 
       collection do
-        get :my_purchases
         post :bulk_send_buyer_receipt
 
-        if EffectiveOrders.stripe_connect_enabled
-          get :stripe_connect_redirect_uri # oAuth2
-          get :my_sales
-        end
-
-        post :ccbill_postback if EffectiveOrders.ccbill_enabled
-        post :moneris_postback if EffectiveOrders.moneris_enabled
-        post :paypal_postback if EffectiveOrders.paypal_enabled
-        post :stripe_charge if EffectiveOrders.stripe_enabled
+        post :moneris_postback if EffectiveOrders.moneris?
+        post :paypal_postback if EffectiveOrders.paypal?
+        post :stripe_charge if EffectiveOrders.stripe?
       end
     end
 
     post 'orders/:id', to: 'orders#update'
 
-    if EffectiveOrders.subscriptions_enabled
+    if EffectiveOrders.subscriptions?
       match 'customer/settings', to: 'customers#edit', as: :customer_settings, via: [:get]
       match 'customer/settings', to: 'customers#update', via: [:patch, :put]
       match 'webhooks/stripe', to: 'webhooks#stripe', via: [:post, :put]
@@ -56,9 +40,12 @@ EffectiveOrders::Engine.routes.draw do
 
   namespace :admin do
     resources :customers, only: [:index, :show]
+
     resources :orders do
       member do
         post :send_payment_request
+
+        get :checkout
         post :checkout
         patch :checkout
       end
@@ -66,12 +53,14 @@ EffectiveOrders::Engine.routes.draw do
       collection do
         post :bulk_send_payment_request
       end
-
     end
 
     post 'orders/:id', to: 'orders#update'
 
     resources :order_items, only: [:index]
   end
+end
 
+Rails.application.routes.draw do
+  mount EffectiveOrders::Engine => '/', as: 'effective_orders'
 end

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

@@ -2,13 +2,14 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
   def self.up
     create_table <%= @orders_table_name %> do |t|
       t.integer   :user_id
-      t.string    :purchase_state
+      t.string    :state
       t.datetime  :purchased_at
 
       t.text      :note
       t.text      :note_to_buyer
       t.text      :note_internal
 
+      t.string    :billing_name
       t.text      :payment
 
       t.string    :payment_provider
@@ -28,7 +29,6 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
 
     create_table <%= @order_items_table_name %> do |t|
       t.integer   :order_id
-      t.integer   :seller_id
       t.string    :purchasable_type
       t.integer   :purchasable_id
 
@@ -77,8 +77,6 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.string    :stripe_subscription_id
       t.string    :status
 
-      t.string    :stripe_connect_access_token
-
       t.integer   :subscriptions_count, :default => 0
 
       t.timestamps
@@ -106,12 +104,15 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
     add_index <%= @subscriptions_table_name %>, [:subscribable_type, :subscribable_id]
 
     create_table <%= @products_table_name %> do |t|
+      t.integer   :purchased_order_id
+
       t.string    :title
-      t.integer   :price, :default => 0
+      t.integer   :price
       t.boolean   :tax_exempt, :default => false
 
       t.timestamps
     end
+
   end
 
   def self.down

data/lib/effective_orders.rb

@@ -1,15 +1,14 @@
 require 'effective_addresses'
 require 'effective_orders/engine'
 require 'effective_orders/version'
-require 'effective_orders/app_checkout_service'
 
 module EffectiveOrders
-  ABANDONED = 'abandoned'
-  PURCHASED = 'purchased'
-  DECLINED = 'declined'
-  PENDING = 'pending'
+  PENDING = 'pending'.freeze
+  CONFIRMED = 'confirmed'.freeze
+  PURCHASED = 'purchased'.freeze
+  DECLINED = 'declined'.freeze
 
-  PURCHASE_STATES = { nil => ABANDONED, PURCHASED => PURCHASED, DECLINED => DECLINED, PENDING => PENDING }
+  STATES = { PENDING => PENDING, CONFIRMED => CONFIRMED, PURCHASED => PURCHASED, DECLINED => DECLINED }
 
   # The following are all valid config keys
   mattr_accessor :orders_table_name
@@ -22,24 +21,19 @@ module EffectiveOrders
 
   mattr_accessor :authorization_method
 
-  mattr_accessor :skip_mount_engine
-  mattr_accessor :orders_collection_scope
-
-  mattr_accessor :order_tax_rate_method
+  mattr_accessor :pretend_purchase_in_development_enabled
+  mattr_accessor :pretend_purchase_in_production_enabled
+  mattr_accessor :pretend_purchase_in_production_message
 
   mattr_accessor :layout
-  mattr_accessor :simple_form_options
-  mattr_accessor :admin_simple_form_options
-  mattr_accessor :show_order_history_button
-
-  mattr_accessor :obfuscate_order_ids
+  mattr_accessor :mailer
 
-  mattr_accessor :allow_pretend_purchase_in_development
-  mattr_accessor :allow_pretend_purchase_in_production
-  mattr_accessor :allow_pretend_purchase_in_production_message
+  mattr_accessor :orders_collection_scope
+  mattr_accessor :order_tax_rate_method
 
-  mattr_accessor :require_billing_address
-  mattr_accessor :require_shipping_address
+  mattr_accessor :obfuscate_order_ids
+  mattr_accessor :billing_address
+  mattr_accessor :shipping_address
   mattr_accessor :use_address_full_name
 
   mattr_accessor :collect_user_fields
@@ -53,35 +47,16 @@ module EffectiveOrders
   mattr_accessor :terms_and_conditions_label
 
   mattr_accessor :minimum_charge
-  mattr_accessor :allow_free_orders
-  mattr_accessor :allow_refunds
-
-  mattr_accessor :app_checkout_enabled
-  mattr_accessor :ccbill_enabled
-  mattr_accessor :cheque_enabled
+  mattr_accessor :free_enabled
   mattr_accessor :mark_as_paid_enabled
-  mattr_accessor :moneris_enabled
-  mattr_accessor :paypal_enabled
+  mattr_accessor :refunds_enabled
 
-  mattr_accessor :stripe_enabled
-  mattr_accessor :stripe_connect_enabled
-
-  mattr_accessor :subscriptions_enabled
-
-  # application fee is required if stripe_connect_enabled is true
-  mattr_accessor :stripe_connect_application_fee_method
-
-  # These are hashes of configs
-  mattr_accessor :app_checkout
-  mattr_accessor :ccbill
+  # Payment processors. false or Hash
   mattr_accessor :cheque
-  mattr_accessor :mailer
   mattr_accessor :moneris
   mattr_accessor :paypal
   mattr_accessor :stripe
-  mattr_accessor :subscription
-
-  mattr_accessor :deliver_method
+  mattr_accessor :subscriptions  # Stripe subscriptions
 
   def self.setup
     yield self
@@ -114,49 +89,72 @@ module EffectiveOrders
     ]
   end
 
+  def self.cheque?
+    cheque.kind_of?(Hash)
+  end
+
+  def self.free?
+    free_enabled == true
+  end
+
+  def self.mark_as_paid?
+    mark_as_paid_enabled == true
+  end
+
+  def self.moneris?
+    moneris.kind_of?(Hash)
+  end
+
+  def self.paypal?
+    paypal.kind_of?(Hash)
+  end
+
+  def self.pretend?
+    (pretend_purchase_in_production_enabled && Rails.env.production?) || (pretend_purchase_in_development_enabled && !Rails.env.production?)
+  end
+
+  def self.refunds?
+    refunds_enabled == true
+  end
+
+  def self.stripe?
+    stripe.kind_of?(Hash)
+  end
+
+  def self.subscriptions?
+    subscriptions.kind_of?(Hash)
+  end
+
   def self.single_payment_processor?
-    [
-      moneris_enabled,
-      paypal_enabled,
-      stripe_enabled,
-      cheque_enabled,
-      ccbill_enabled,
-      app_checkout_enabled
-    ].select { |enabled| enabled }.length == 1
+    [cheque?, moneris?, paypal?, stripe?].select { |enabled| enabled }.length == 1
   end
 
   # The Effective::Order.payment_provider value must be in this collection
   def self.payment_providers
-    @payment_providers ||= [
-      ('app_checkout' if app_checkout_enabled),
-      ('ccbill' if ccbill_enabled),
-      ('cheque' if cheque_enabled),
-      ('free' if allow_free_orders),
-      ('moneris' if moneris_enabled),
-      ('paypal' if paypal_enabled),
-      ('pretend' if (allow_pretend_purchase_in_production && Rails.env.production?) || (allow_pretend_purchase_in_development && !Rails.env.production?)),
-      ('stripe' if stripe_enabled),
-      ('stripe_connect' if stripe_connect_enabled)
+    [
+      ('cheque' if cheque?),
+      ('free' if free?),
+      ('moneris' if moneris?),
+      ('paypal' if paypal?),
+      ('pretend' if pretend?),
+      ('stripe' if stripe?),
+      ('credit card' if mark_as_paid?),
+      ('none' if mark_as_paid?),
+      ('other' if mark_as_paid?),
     ].compact
   end
 
-  # One of these is used when Admin marks as paid
-  def self.other_payment_providers
-    ['credit card', 'none', 'other']
-  end
-
   def self.can_skip_checkout_step1?
     return false if require_billing_address
     return false if require_shipping_address
     return false if collect_note
     return false if terms_and_conditions
     return false if collect_user_fields.present?
-
     true
   end
 
   def self.stripe_plans
-    return {} unless (stripe_enabled && subscriptions_enabled)
+    return {} unless (stripe? && subscriptions?)
 
     @stripe_plans ||= (
       plans = Stripe::Plan.all.inject({}) do |h, plan|
@@ -184,14 +182,12 @@ module EffectiveOrders
         }; h
       end
 
-      if subscription.kind_of?(Hash)
-        plans['trial'] = {
-          id: 'trial',
-          amount: 0,
-          name: (subscription[:trial_name] || 'Free Trial'),
-          description: (subscription[:trial_description] || 'Free Trial')
-        }
-      end
+      plans['trial'] = {
+        id: 'trial',
+        amount: 0,
+        name: (subscriptions[:trial_name] || 'Free Trial'),
+        description: (subscriptions[:trial_description] || 'Free Trial')
+      }
 
       plans
     )

data/lib/effective_orders/engine.rb

@@ -2,7 +2,7 @@ module EffectiveOrders
   class Engine < ::Rails::Engine
     engine_name 'effective_orders'
 
-    #config.autoload_paths += Dir["#{config.root}/app/models/**/"]
+    config.autoload_paths += Dir["#{config.root}/app/models/**/"]
 
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_orders.active_record' do |app|
@@ -18,97 +18,25 @@ module EffectiveOrders
       eval File.read("#{config.root}/config/effective_orders.rb")
     end
 
-    initializer 'effective_orders.assets' do |app|
-      app.config.assets.precompile += ['effective_orders_manifest.js', 'effective_orders/*']
-    end
-
     # Set up mail delivering config option
     initializer 'effective_orders.mailer', after: :load_config_initializers do |app|
-      deliver_method = Rails.gem_version >= Gem::Version.new('4.2') ? :deliver_now : :deliver
-      EffectiveOrders.mailer[:deliver_method] ||= deliver_method
-    end
-
-    initializer 'effective_orders.moneris_config_validation', after: :load_config_initializers do
-      if EffectiveOrders.moneris_enabled
-        raise 'expected EffectiveOrders.moneris to be a Hash' unless EffectiveOrders.moneris.is_a?(Hash)
-
-        missing = EffectiveOrders.moneris.select { |_, value| value.blank? }
-        raise "Missing EffectiveOrders.moneris config values: #{missing.keys.join(', ')}" if missing.present?
-      end
-    end
-
-    initializer 'effective_orders.paypal_config_validation', after: :load_config_initializers do
-      if EffectiveOrders.paypal_enabled
-        raise 'expected EffectiveOrders.paypal to be a Hash' unless EffectiveOrders.paypal.is_a?(Hash)
-
-        missing = EffectiveOrders.paypal.select { |_, value| value.blank? }
-        raise "Missing EffectiveOrders.paypal config values: #{missing.keys.join(', ')}" if missing.present?
-      end
+      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.stripe_config_validation', after: :load_config_initializers do
-      if EffectiveOrders.stripe_enabled
+    initializer 'effective_orders.stripe', after: :load_config_initializers do
+      if EffectiveOrders.stripe?
         begin
           require 'stripe'
+          ::Stripe.api_key = EffectiveOrders.stripe[:secret_key]
         rescue Exception
           raise "unable to load stripe. Plese add gem 'stripe' to your Gemfile and then 'bundle install'"
         end
-
-        raise 'expected EffectiveOrders.stripe to be a Hash' unless EffectiveOrders.stripe.is_a?(Hash)
-
-        missing = EffectiveOrders.stripe.select { |_, value| value.blank? }
-        required = [:secret_key, :publishable_key, :currency, :site_title]
-        required += [:connect_client_id] if EffectiveOrders.stripe_connect_enabled
-
-        # perform an intersection operation between missing and required configs
-        missing_required = missing.keys & required
-        raise "Missing EffectiveOrders.stripe config values: #{missing_required.join(', ')}" if missing_required.present?
-      end
-    end
-
-    initializer 'effective_orders.stripe_api_key', after: :load_config_initializers do |app|
-      if EffectiveOrders.stripe_enabled
-        ::Stripe.api_key = EffectiveOrders.stripe[:secret_key]
-      end
-    end
-
-    initializer 'effective_orders.ccbill_config_validation', after: :load_config_initializers do
-      if EffectiveOrders.ccbill_enabled
-        raise 'expected EffectiveOrders.ccbill to be a Hash' unless EffectiveOrders.ccbill.is_a?(Hash)
-
-        EffectiveOrders.ccbill[:form_period] ||= 365
-
-        missing = EffectiveOrders.stripe.select { |_, value| value.blank? }
-        required = [:client_accnum, :client_subacc, :form_name, :currency_code, :dynamic_pricing_salt]
-
-        # perform an intersection operation between missing and required configs
-        missing_required = missing.keys & required
-        raise "Missing EffectiveOrders.ccbill config values: #{missing_required.join(', ')}" if missing_required.present?
-      end
-    end
-
-    initializer 'effective_orders.app_checkout_config_validation', after: :load_config_initializers do
-      if EffectiveOrders.app_checkout_enabled
-        raise 'expected EffectiveOrders.app_checkout to be a Hash' unless EffectiveOrders.app_checkout.is_a?(Hash)
-
-        missing = EffectiveOrders.app_checkout.select { |_, value| value.blank? }
-        missing = missing | [:service] unless EffectiveOrders.app_checkout.has_key?(:service)
-
-        raise "Missing effective_orders App Checkout configuration values: #{missing.keys.join(', ')}" if missing.present?
-
-        unless EffectiveOrders.app_checkout[:service].respond_to?(:call)
-          raise 'EffectiveOrders.app_checkout[:service] is not a compatible service object. Inherit from EffectiveOrders::AppCheckoutService or implement a similar API'
-        end
-      end
-    end
-
-    initializer 'effective_orders.cheque_config_validation', after: :load_config_initializers do
-      if EffectiveOrders.cheque_enabled
-        raise 'expected EffectiveOrders.cheque to be a Hash' unless EffectiveOrders.cheque.is_a?(Hash)
       end
     end
 
-    initializer 'effective_orders.obfuscate_order_ids_validation' do
+    initializer 'effective_orders.obfuscate_order_ids' do
       if EffectiveOrders.obfuscate_order_ids
         begin
           require 'effective_obfuscation'