effective_orders 2.2.4 → 3.0.0

data/lib/effective_orders/engine.rb

@@ -4,27 +4,12 @@ module EffectiveOrders
 
     config.autoload_paths += Dir["#{config.root}/app/models/**/"]
 
-    # Include Helpers to base application
-    initializer 'effective_orders.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
-        helper EffectiveOrdersHelper
-        helper EffectiveCartsHelper
-        helper EffectivePaypalHelper if EffectiveOrders.paypal_enabled
-        helper EffectiveStripeHelper if EffectiveOrders.stripe_enabled
-        helper EffectiveCcbillHelper if EffectiveOrders.ccbill_enabled
-      end
-    end
-
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_orders.active_record' do |app|
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.extend(ActsAsPurchasable::ActiveRecord)
-      end
-    end
-
-    initializer 'effective_orders.action_view' do |app|
-      ActiveSupport.on_load :action_view do
-        ActionView::Helpers::FormBuilder.send(:include, Inputs::PriceFormInput)
+        ActiveRecord::Base.extend(ActsAsSubscribable::ActiveRecord)
+        ActiveRecord::Base.extend(ActsAsSubscribableBuyer::ActiveRecord)
       end
     end
 
@@ -34,97 +19,88 @@ module EffectiveOrders
     end
 
     # Set up mail delivering config option
-    initializer "effective_orders.mailer", after: :load_config_initializers do |app|
+    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
 
-    # Set up our Stripe API Key
-    initializer "effective_orders.stripe_api_key", after: :load_config_initializers do |app|
-      if EffectiveOrders.stripe_enabled
-        begin
-          require 'stripe'
-        rescue Exception
-          raise "unable to load stripe.  Plese add gem 'stripe' to your Gemfile and then 'bundle install'"
-        end
-      end
-    end
-
     initializer 'effective_orders.moneris_config_validation', after: :load_config_initializers do
       if EffectiveOrders.moneris_enabled
-        unless EffectiveOrders.moneris.is_a?(Hash)
-          raise ArgumentError, "expected EffectiveOrders.moneris to be a Hash but it is a #{EffectiveOrders.moneris.class}"
-        end
-        missing = EffectiveOrders.moneris.select {|_config, value| value.blank? }
+        raise 'expected EffectiveOrders.moneris to be a Hash' unless EffectiveOrders.moneris.is_a?(Hash)
 
-        raise "Missing effective_orders Moneris configuration values: #{missing.keys.join(', ')}" if missing.present?
+        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
-        unless EffectiveOrders.paypal.is_a?(Hash)
-          raise ArgumentError, "expected EffectiveOrders.paypal to be a Hash but it is a #{EffectiveOrders.paypal.class}"
-        end
-        missing = EffectiveOrders.paypal.select {|_config, value| value.blank? }
+        raise 'expected EffectiveOrders.paypal to be a Hash' unless EffectiveOrders.paypal.is_a?(Hash)
 
-        raise "Missing effective_orders PayPal configuration values: #{missing.keys.join(', ')}" if missing.present?
+        missing = EffectiveOrders.paypal.select { |_, value| value.blank? }
+        raise "Missing EffectiveOrders.paypal config values: #{missing.keys.join(', ')}" if missing.present?
       end
     end
 
     initializer 'effective_orders.stripe_config_validation', after: :load_config_initializers do
       if EffectiveOrders.stripe_enabled
-        unless EffectiveOrders.stripe.is_a?(Hash)
-          raise ArgumentError, "expected EffectiveOrders.stripe to be a Hash but it is a #{EffectiveOrders.stripe.class}"
+        begin
+          require 'stripe'
+        rescue Exception
+          raise "unable to load stripe. Plese add gem 'stripe' to your Gemfile and then 'bundle install'"
         end
-        missing = EffectiveOrders.stripe.select {|_config, value| value.blank? }
+
+        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]
-        stripe_connect_required = [:connect_client_id]
-        required += stripe_connect_required if EffectiveOrders.stripe_connect_enabled
+        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 effective_orders Stripe configuration values: #{missing_required.join(', ')}" if missing_required.present?
+        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
-        unless EffectiveOrders.ccbill.is_a?(Hash)
-          raise ArgumentError, "expected EffectiveOrders.ccbill to be a Hash but it is a #{EffectiveOrders.ccbill.class}"
-        end
+        raise 'expected EffectiveOrders.ccbill to be a Hash' unless EffectiveOrders.ccbill.is_a?(Hash)
+
         EffectiveOrders.ccbill[:form_period] ||= 365
 
-        missing = EffectiveOrders.stripe.select {|_config, value| value.blank? }
+        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 effective_orders Stripe configuration values: #{missing_required.join(', ')}" if missing_required.present?
+        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
-        unless EffectiveOrders.app_checkout.is_a?(Hash)
-          raise ArgumentError, "expected EffectiveOrders.app_checkout to be a Hash but it is a #{EffectiveOrders.app_checkout.class}"
-        end
-        missing = EffectiveOrders.app_checkout.select {|_config, value| value.blank? }
+        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)
-          msg = "EffectiveOrders.app_checkout[:service] is not a compatible service object. Inherit from EffectiveOrders::AppCheckoutService or implement a similar API"
-          raise ArgumentError, msg
+          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
-        unless EffectiveOrders.cheque.is_a?(Hash)
-          raise ArgumentError, "expected EffectiveOrders.cheque to be a Hash but it is a #{EffectiveOrders.cheque.class}"
-        end
+        raise 'expected EffectiveOrders.cheque to be a Hash' unless EffectiveOrders.cheque.is_a?(Hash)
       end
     end
 
@@ -133,32 +109,10 @@ module EffectiveOrders
         begin
           require 'effective_obfuscation'
         rescue Exception
-          raise "unable to load effective_obfuscation.  Plese add gem 'effective_obfuscation' to your Gemfile and then 'bundle install'"
+          raise "unable to load effective_obfuscation. Please add gem 'effective_obfuscation' to your Gemfile and then 'bundle install'"
         end
       end
     end
 
-    # Use ActiveAdmin (optional)
-    initializer 'effective_orders.active_admin' do
-      if EffectiveOrders.use_active_admin?
-        begin
-          require 'activeadmin'
-        rescue Exception
-          raise "unable to load activeadmin.  Plese add gem 'activeadmin' to your Gemfile and then 'bundle install'"
-        end
-
-        ActiveAdmin.application.load_paths.unshift *Dir["#{config.root}/active_admin"]
-
-        Rails.application.config.to_prepare do
-          ActiveSupport.on_load :action_controller do
-            ApplicationController.extend(ActsAsActiveAdminController::ActionController)
-            Effective::OrdersController.send(:acts_as_active_admin_controller, 'orders')
-            Effective::CartsController.send(:acts_as_active_admin_controller, 'carts')
-          end
-        end
-
-      end
-    end
-
   end
 end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '2.2.4'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/lib/generators/effective_orders/install_generator.rb

@@ -8,7 +8,7 @@ module EffectiveOrders
       source_root File.expand_path('../../templates', __FILE__)
 
       def self.next_migration_number(dirname)
-        if not ActiveRecord::Base.timestamped_migrations
+        unless ActiveRecord::Base.timestamped_migrations
           Time.new.utc.strftime("%Y%m%d%H%M%S")
         else
           "%.3d" % (current_migration_number(dirname) + 1)
@@ -29,7 +29,7 @@ module EffectiveOrders
         if mailer_preview_path.present?
           template 'effective_orders_mailer_preview.rb', File.join(mailer_preview_path, 'effective_orders_mailer_preview.rb')
         else
-          puts "couldn't find action_mailer.preview_path.  Skipping effective_orders_mailer_preview."
+          puts "couldn't find action_mailer.preview_path. Skipping effective_orders_mailer_preview."
         end
       end
 

data/lib/generators/templates/effective_orders_mailer_preview.rb

@@ -11,7 +11,6 @@ class EffectiveOrdersMailerPreview < ActionMailer::Preview
     Effective::OrdersMailer.order_receipt_to_buyer(build_preview_order)
   end
 
-  # This email is only sent to sellers having sold items via StripeConnect
   def order_receipt_to_seller
     order = build_preview_order
     Effective::OrdersMailer.order_receipt_to_seller(order, preview_customer, order.order_items)
@@ -25,8 +24,28 @@ class EffectiveOrdersMailerPreview < ActionMailer::Preview
     Effective::OrdersMailer.pending_order_invoice_to_buyer(build_preview_order)
   end
 
+  def subscription_payment_succeeded
+    Effective::OrdersMailer.subscription_payment_succeeded(preview_customer)
+  end
+
+  def subscription_payment_failed
+    Effective::OrdersMailer.subscription_payment_failed(preview_customer)
+  end
+
+  def subscription_canceled
+    Effective::OrdersMailer.subscription_canceled(preview_customer)
+  end
+
+  def subscription_trial_expiring
+    Effective::OrdersMailer.subscription_trial_expiring(preview_subscribable)
+  end
+
+  def subscription_trial_expired
+    Effective::OrdersMailer.subscription_trial_expired(preview_subscribable)
+  end
+
   def order_error
-    Effective::OrdersMailer.order_error(order: build_preview_order, error: "Something didn't work out")
+    Effective::OrdersMailer.order_error(order: build_preview_order, error: 'Something did not work out')
   end
 
   protected
@@ -57,7 +76,7 @@ class EffectiveOrdersMailerPreview < ActionMailer::Preview
   end
 
   def preview_user
-    User.new(email: 'buyer@example.com').tap do |user|
+    User.new(email: 'buyer@website.com').tap do |user|
       user.name = 'Valued Customer' if user.respond_to?(:name=)
       user.full_name = 'Valued Customer' if user.respond_to?(:full_name=)
 
@@ -71,6 +90,22 @@ class EffectiveOrdersMailerPreview < ActionMailer::Preview
   end
 
   def preview_customer
-    Effective::Customer.new(user: preview_user)
+    Effective::Customer.new(user: preview_user, active_card: '**** **** **** 1234 Visa 04/20')
+  end
+
+  def preview_subscribable
+    Class.new do
+      include ActiveModel::Model
+      attr_accessor :buyer
+
+      def to_s
+        'My cool service'
+      end
+
+      def trial_expires_at
+        Time.zone.now + 1.day
+      end
+    end.new(buyer: preview_user)
   end
+
 end

data/lib/tasks/effective_orders_tasks.rake

@@ -1,3 +1,5 @@
+# rake effective_orders:overwrite_order_item_titles
+
 namespace :effective_orders do
   desc 'Overwrite all order item titles with current acts_as_purchasable object title'
   task overwrite_order_item_titles: :environment do
@@ -25,4 +27,44 @@ namespace :effective_orders do
       end
     end
   end
+
+  desc 'Sends trial expiring and expired emails to each subscribable. Schedule me to run once per day.'
+  task send_trial_expiring_emails: :environment do
+    trial_remind_at = Array(EffectiveOrders.subscription[:trial_remind_at]).compact
+    exit unless trial_remind_at.present? && trial_remind_at.all? { |x| x.present? }
+
+    Rails.application.eager_load!
+
+    today = Time.zone.now.beginning_of_day
+    reminders = trial_remind_at.select { |remind_at| remind_at.kind_of?(ActiveSupport::Duration) }
+
+    begin
+      ActsAsSubscribable.descendants.each do |klass|
+        klass.trialing.find_each do |subscribable|
+          if subscribable.trial_expires_at == today
+            puts "sending trial expired to #{subscribable}"
+            Effective::OrdersMailer.subscription_trial_expired(subscribable).deliver_now
+          end
+
+          next if subscribable.trial_expired? # We already notified them
+
+          reminders.each do |remind_at|
+            next unless subscribable.trial_expires_at == (today + remind_at)
+
+            puts "sending trial expiring to #{subscribable}. expires in #{(subscribable.trial_expires_at - today) / 1.day.to_i} days."
+            Effective::OrdersMailer.subscription_trial_expiring(subscribable).deliver_now
+          end
+        end
+      end
+
+      puts 'send_trial_expiring_emails completed'
+      EffectiveLogger.success('scheduled task send_trial_expiring_emails completed') if defined?(EffectiveLogger)
+    rescue => e
+      ExceptionNotifier.notify_exception(e) if defined?(ExceptionNotifier)
+      raise e
+    end
+
+    true
+  end
+
 end

data/spec/controllers/carts_controller_spec.rb

@@ -105,7 +105,7 @@ describe Effective::CartsController, type: :controller do
 
         get :show
         assigns(:cart).user.should eq cart.user
-        assigns(:cart).size.should eq 4 # the 3 from my factory, and 1 more we just created
+        assigns(:cart).cart_items.length.should eq 4 # the 3 from my factory, and 1 more we just created
         assigns(:cart).find(product).present?.should eq true
 
         Effective::Cart.where(:id => session_cart).should eq []

data/spec/controllers/moneris_orders_controller_spec.rb

@@ -116,15 +116,15 @@ describe Effective::OrdersController, type: :controller do
     end
 
     describe 'redirect urls' do
-      it 'redirects to the purchased_redirect_url on purchase' do
+      it 'redirects to the purchased_url on purchase' do
         allow(subject).to receive(:parse_moneris_response).and_return({response_code: 1}) # success
-        post :moneris_postback, moneris_params.tap { |x| x[:rvar_purchased_redirect_url] = '/something' }
+        post :moneris_postback, moneris_params.tap { |x| x[:rvar_purchased_url] = '/something' }
         response.should redirect_to '/something'
       end
 
-      it 'redirects to the declined_redirect_url on decline' do
+      it 'redirects to the declined_url on decline' do
         allow(subject).to receive(:parse_moneris_response).and_return({response_code: 'null'}) # failure
-        post :moneris_postback, moneris_params.tap { |x| x[:rvar_declined_redirect_url] = '/something' }
+        post :moneris_postback, moneris_params.tap { |x| x[:rvar_declined_url] = '/something' }
         response.should redirect_to '/something'
       end
     end

data/spec/controllers/orders_controller_spec.rb

@@ -37,7 +37,7 @@ describe Effective::OrdersController, type: :controller do
       assigns(:order).user.should eq cart.user
 
       assigns(:order).order_items.size.should eq cart.cart_items.size
-      assigns(:order).total.should eq cart.total
+      assigns(:order).total.should eq cart.subtotal
     end
 
     it 'redirects if there is an empty order' do
@@ -81,11 +81,11 @@ describe Effective::OrdersController, type: :controller do
     end
 
     it 'should assign an @order based off the user cart' do
-      post :create
+      post :create, effective_order: {}
 
       assigns(:order).user.should eq cart.user
       assigns(:order).order_items.size.should eq cart.cart_items.size
-      assigns(:order).total.should eq cart.total
+      assigns(:order).total.should eq cart.subtotal
       assigns(:order).purchased?.should eq false
     end
 
@@ -330,7 +330,7 @@ describe Effective::OrdersController, type: :controller do
   describe '#order_purchased (with a free order)' do
     before(:each) do
       sign_in cart.user
-      cart.cart_items.each { |cart_item| cart_item.purchasable.update_attributes(price: 0.0) }
+      cart.cart_items.each { |cart_item| cart_item.purchasable.update_attributes(price: 0) }
     end
 
     it 'creates a purchased order' do

data/spec/controllers/stripe_orders_controller_spec.rb

@@ -10,7 +10,7 @@ describe Effective::OrdersController, type: :controller do
 
   let(:stripe_helper) { StripeMock.create_test_helper }
   let(:order) { FactoryGirl.create(:order) }
-  let(:buyer) { Effective::Customer.for_user(order.user) }
+  let(:buyer) { Effective::Customer.for_buyer(order.user) }
   let(:token) { stripe_helper.generate_card_token }
   let(:stripe_charge_params) do
     {:effective_providers_stripe_charge => {'effective_order_id' => order.to_param, 'token' => token}}
@@ -91,7 +91,7 @@ describe Effective::OrdersController, type: :controller do
 
   describe '#stripe_charge with a subscription' do
     let(:order) { FactoryGirl.create(:order_with_subscription) }
-    let(:buyer) { Effective::Customer.for_user(order.user) }
+    let(:buyer) { Effective::Customer.for_buyer(order.user) }
     let(:subscription) { order.order_items[1].purchasable }
     let(:token) { stripe_helper.generate_card_token }
     let(:stripe_charge_params) do

data/spec/controllers/webhooks_controller_spec.rb

@@ -7,7 +7,7 @@ describe Effective::WebhooksController, type: :controller do
   after { StripeMock.stop }
 
   let(:order) { FactoryGirl.create(:order) }
-  let(:buyer) { Effective::Customer.for_user(order.user) }
+  let(:buyer) { Effective::Customer.for_buyer(order.user) }
 
   let(:event_hash) { event.to_hash }
 

data/spec/dummy/config/initializers/effective_orders.rb

@@ -31,15 +31,9 @@ EffectiveOrders.setup do |config|
   # config.authorization_method = false
   config.authorization_method = Proc.new { |controller, action, resource| true }
 
-  # Register Effective::Order with ActiveAdmin if ActiveAdmin is present
-  config.use_active_admin = true
-
   # Use effective_obfuscation gem to change order.id into a seemingly random 10-digit number
   config.obfuscate_order_ids = true
 
-  # Silence the price deprecation warnings
-  config.silence_deprecation_warnings = true
-
   # Require these addresses when creating a new Order.  Works with effective_addresses gem
   config.require_billing_address = true
   config.require_shipping_address = true
@@ -211,7 +205,7 @@ EffectiveOrders.setup do |config|
 
   # Stripe configuration
   config.stripe_enabled = true
-  config.stripe_subscriptions_enabled = true # https://stripe.com/docs/subscriptions
+  config.subscriptions_enabled = true # https://stripe.com/docs/subscriptions
   config.stripe_connect_enabled = false # https://stripe.com/docs/connect
   config.stripe_connect_application_fee_method = Proc.new { |order_item| order_item.total * 0.10 } # 10 percent