effective_orders 1.4.3 → 1.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f9fa7393376be54a691baf0c759f4facf0ad65f8
4
- data.tar.gz: 23ecc5ef071404acf15b5825f4d0d52c11d40e98
3
+ metadata.gz: b88217750a36de0eaf2838e46e7d3bbaf357b6a7
4
+ data.tar.gz: 9082197cd8a521a095060ba43336b0e044b05e68
5
5
  SHA512:
6
- metadata.gz: 08e2d17111c520e4f222eebce38f9c24d7954da10270c8017531d83f21c756f1189b4f963ace2f61d93894105e203a79401483a93bea32e787742cf03986e142
7
- data.tar.gz: 81aed4009f266646b8e60824c431f1beff5ada601550d83e66af90998c878434ab1a5d8a878c93192bda8f59574e5013c14efd6f030ba374bf984a90d4df2669
6
+ metadata.gz: 4f6fe7214c6e67d6c15e6342e7469599cbfe8d808cde2bdd527c1ebf2aa35be99b1f28f54d10b1e12a5735f1ccd1f0a376df099b9f0895797e14ed93f20e4bd6
7
+ data.tar.gz: 12aa80cf0fd5789bfcd9a327c0a121f73947a4569d3bc4ae52f3b1ab9f7dc22e251569ebe2391c360f26b7b32492d15abc0d56febc4096c5aae86a2572098178
@@ -1,10 +1,10 @@
1
- module ActsAsActiveAdmin
1
+ module ActsAsActiveAdminController
2
2
  extend ActiveSupport::Concern
3
3
 
4
4
  module ActionController
5
5
  def acts_as_active_admin_controller(key)
6
6
  @active_admin_resource_element_lookup_key = key
7
- include ::ActsAsActiveAdmin
7
+ include ::ActsAsActiveAdminController
8
8
  end
9
9
  end
10
10
 
@@ -1,8 +1,8 @@
1
1
  require 'effective_addresses'
2
2
  require 'effective_obfuscation'
3
- require "effective_orders/engine"
4
3
  require 'migrant' # Required for rspec to run properly
5
4
  require 'simple_form'
5
+ require 'effective_orders/engine'
6
6
 
7
7
  module EffectiveOrders
8
8
  PURCHASED = 'purchased'
@@ -44,8 +44,8 @@ module EffectiveOrders
44
44
  # This prepends the load path so someone can override the assets.rb if they want.
45
45
  initializer 'effective_orders.active_admin' do
46
46
  if defined?(ActiveAdmin) && EffectiveOrders.use_active_admin == true
47
+ ActionController::Base.extend(::ActsAsActiveAdminController::ActionController)
47
48
  ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
48
- ActionController::Base.extend(ActsAsActiveAdmin::ActionController)
49
49
  end
50
50
  end
51
51
 
@@ -1,3 +1,3 @@
1
1
  module EffectiveOrders
2
- VERSION = '1.4.3'.freeze
2
+ VERSION = '1.4.4'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_orders
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.3
4
+ version: 1.4.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
@@ -325,6 +325,7 @@ files:
325
325
  - app/controllers/admin/customers_controller.rb
326
326
  - app/controllers/admin/order_items_controller.rb
327
327
  - app/controllers/admin/orders_controller.rb
328
+ - app/controllers/concerns/acts_as_active_admin_controller.rb
328
329
  - app/controllers/effective/carts_controller.rb
329
330
  - app/controllers/effective/orders_controller.rb
330
331
  - app/controllers/effective/providers/moneris.rb
@@ -338,7 +339,6 @@ files:
338
339
  - app/helpers/effective_paypal_helper.rb
339
340
  - app/helpers/effective_stripe_helper.rb
340
341
  - app/mailers/effective/orders_mailer.rb
341
- - app/models/concerns/acts_as_active_admin.rb
342
342
  - app/models/concerns/acts_as_purchasable.rb
343
343
  - app/models/effective/access_denied.rb
344
344
  - app/models/effective/cart.rb