effective_orders 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a47576086e85e24dc44de2c8c6e2c6bc78e074
-  data.tar.gz: 2eda2b07e901a0a0af711768a2d0e6210fac5791
+  metadata.gz: c1cf9baa9d485752d3758cd486c22451656851a9
+  data.tar.gz: c4e7fae35b93f72319b7b525382c085272c8f016
 SHA512:
-  metadata.gz: 4597fbb04b3808a5de5cd7e6f3e6034c5b1405491b1705dfd96cedf9d3dbedd8909d3ce8ba2f11b6fd6f3ffa262dc8e70a6a71f6284622bd85e3a7db4f815e43
-  data.tar.gz: f8e2772c836c2becb559ba5a4659a23311dc156d48f0d7730e94687c26488f94b99c8f28626323073b465d6d115a073f317584e507fe728634613122b080b679
+  metadata.gz: 406fb85de09e76af4dcbd5c3ef92d911f587a8bbdce2cefeb5f095ccf2f1e1341e2e7b716a21b4106c06baff89a5285281fcd407b4e381512acaa9c3ff2add5c
+  data.tar.gz: dbff00b400518808d5071d166c8246a673fda871a71304e5ad16726e7402c355e77389a4965bc363b4cbc81715261c1efd9dc1cb6ea1887a1dbe50071f9e6d8b

data/app/controllers/concerns/acts_as_active_admin_controller.rb

@@ -2,17 +2,17 @@ module ActsAsActiveAdminController
   extend ActiveSupport::Concern
 
   module ActionController
-    def acts_as_active_admin_controller(key)
-      @active_admin_resource_element_lookup_key = key
+    def acts_as_active_admin_controller(element_lookup_key)
+      @active_admin_resource_element_lookup_key = element_lookup_key
       include ::ActsAsActiveAdminController
     end
   end
 
   included do
-    include ::ActiveAdmin::BaseController::Menu
-    include ::ActiveAdmin::BaseController::Authorization
+    include ActiveAdmin::BaseController::Menu
+    include ActiveAdmin::BaseController::Authorization
 
-    helper ::ActiveAdmin::ViewHelpers
+    helper ActiveAdmin::ViewHelpers
     helper_method :active_admin_config, :active_admin_namespace, :current_active_admin_user
 
     resource_key = @active_admin_resource_element_lookup_key.to_s
@@ -36,7 +36,7 @@ module ActsAsActiveAdminController
   end
 
   def active_admin_namespace
-    ::ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
+    ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
   end
 
   def active_admin_config
@@ -45,7 +45,7 @@ module ActsAsActiveAdminController
 
   def active_admin_resource_key
     @active_admin_resource_key ||= begin
-      namespace = ::ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
+      namespace = ActiveAdmin.application.namespaces[EffectiveOrders.active_admin_namespace || :root]
       namespace.resources.keys.find { |resource| resource.element == active_admin_resource_element_key }
     end
   end

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

@@ -8,7 +8,7 @@ module Effective
       end
 
       def paypal_postback
-        @order ||= Effective::Order.where(:id => params[:invoice].to_i).first
+        @order ||= Effective::Order.where(id: (params[:invoice].to_i rescue 0)).first
 
         EffectiveOrders.authorized?(self, :update, @order)
 

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

@@ -9,7 +9,7 @@ module Effective
       end
 
       def stripe_charge
-        @order = Effective::Order.find(stripe_charge_params[:effective_order_id])
+        @order ||= Effective::Order.find(stripe_charge_params[:effective_order_id])
         @stripe_charge = Effective::StripeCharge.new(stripe_charge_params)
         @stripe_charge.order = @order
 

data/lib/effective_orders/engine.rb

@@ -7,10 +7,6 @@ module EffectiveOrders
     # Include Helpers to base application
     initializer 'effective_orders.action_controller' do |app|
       ActiveSupport.on_load :action_controller do
-        if EffectiveOrders.use_active_admin
-          ActionController::Base.extend(ActsAsActiveAdminController::ActionController)
-        end
-
         helper EffectiveOrdersHelper
         helper EffectiveCartsHelper
         helper EffectivePaypalHelper if EffectiveOrders.paypal_enabled
@@ -44,12 +40,16 @@ module EffectiveOrders
       end
     end
 
-    # ActiveAdmin (optional)
-    # This prepends the load path so someone can override the assets.rb if they want.
+    # Use ActiveAdmin (optional)
     initializer 'effective_orders.active_admin' do
       if EffectiveOrders.use_active_admin
         require 'activeadmin'
-        ::ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
+
+        ActiveSupport.on_load :action_controller do
+          ApplicationController.extend(ActsAsActiveAdminController::ActionController)
+        end
+
+        ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
       end
     end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails