effective_orders 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9fa7393376be54a691baf0c759f4facf0ad65f8
-  data.tar.gz: 23ecc5ef071404acf15b5825f4d0d52c11d40e98
+  metadata.gz: b88217750a36de0eaf2838e46e7d3bbaf357b6a7
+  data.tar.gz: 9082197cd8a521a095060ba43336b0e044b05e68
 SHA512:
-  metadata.gz: 08e2d17111c520e4f222eebce38f9c24d7954da10270c8017531d83f21c756f1189b4f963ace2f61d93894105e203a79401483a93bea32e787742cf03986e142
-  data.tar.gz: 81aed4009f266646b8e60824c431f1beff5ada601550d83e66af90998c878434ab1a5d8a878c93192bda8f59574e5013c14efd6f030ba374bf984a90d4df2669
+  metadata.gz: 4f6fe7214c6e67d6c15e6342e7469599cbfe8d808cde2bdd527c1ebf2aa35be99b1f28f54d10b1e12a5735f1ccd1f0a376df099b9f0895797e14ed93f20e4bd6
+  data.tar.gz: 12aa80cf0fd5789bfcd9a327c0a121f73947a4569d3bc4ae52f3b1ab9f7dc22e251569ebe2391c360f26b7b32492d15abc0d56febc4096c5aae86a2572098178

data/app/{models/concerns/acts_as_active_admin.rb → controllers/concerns/acts_as_active_admin_controller.rb}

@@ -1,10 +1,10 @@
-module ActsAsActiveAdmin
+module ActsAsActiveAdminController
   extend ActiveSupport::Concern
 
   module ActionController
     def acts_as_active_admin_controller(key)
       @active_admin_resource_element_lookup_key = key
-      include ::ActsAsActiveAdmin
+      include ::ActsAsActiveAdminController
     end
   end
 

data/lib/effective_orders.rb

@@ -1,8 +1,8 @@
 require 'effective_addresses'
 require 'effective_obfuscation'
-require "effective_orders/engine"
 require 'migrant'     # Required for rspec to run properly
 require 'simple_form'
+require 'effective_orders/engine'
 
 module EffectiveOrders
   PURCHASED = 'purchased'

data/lib/effective_orders/engine.rb

@@ -44,8 +44,8 @@ module EffectiveOrders
     # This prepends the load path so someone can override the assets.rb if they want.
     initializer 'effective_orders.active_admin' do
       if defined?(ActiveAdmin) && EffectiveOrders.use_active_admin == true
+        ActionController::Base.extend(::ActsAsActiveAdminController::ActionController)
         ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
-        ActionController::Base.extend(ActsAsActiveAdmin::ActionController)
       end
     end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.4.3'.freeze
+  VERSION = '1.4.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Code and Effect
@@ -325,6 +325,7 @@ files:
 - app/controllers/admin/customers_controller.rb
 - app/controllers/admin/order_items_controller.rb
 - app/controllers/admin/orders_controller.rb
+- app/controllers/concerns/acts_as_active_admin_controller.rb
 - app/controllers/effective/carts_controller.rb
 - app/controllers/effective/orders_controller.rb
 - app/controllers/effective/providers/moneris.rb
@@ -338,7 +339,6 @@ files:
 - app/helpers/effective_paypal_helper.rb
 - app/helpers/effective_stripe_helper.rb
 - app/mailers/effective/orders_mailer.rb
-- app/models/concerns/acts_as_active_admin.rb
 - app/models/concerns/acts_as_purchasable.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/cart.rb