From fa57f22a71f11560335b2830b6f3e4372ef907cb Mon Sep 17 00:00:00 2001 From: John Dyer Date: Tue, 21 Feb 2012 10:06:22 -0500 Subject: [PATCH] [Refs #31] define paypal_express_local_confirm preference --- app/controllers/spree/checkout_controller_decorator.rb | 4 ++-- lib/spree/paypal_express_configuration.rb | 5 +++++ lib/spree_paypal_express/engine.rb | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 lib/spree/paypal_express_configuration.rb diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb index 5e98383..ba62bcd 100644 --- a/app/controllers/spree/checkout_controller_decorator.rb +++ b/app/controllers/spree/checkout_controller_decorator.rb @@ -192,10 +192,10 @@ module Spree end def fixed_opts - if Spree::Config[:paypal_express_local_confirm].nil? + if Spree::PaypalExpress::Config[:paypal_express_local_confirm].nil? user_action = "continue" else - user_action = Spree::Config[:paypal_express_local_confirm] == "t" ? "continue" : "commit" + user_action = Spree::PaypalExpress::Config[:paypal_express_local_confirm] == "t" ? "continue" : "commit" end { :description => "Goods from #{Spree::Config[:site_name]}", # site details... diff --git a/lib/spree/paypal_express_configuration.rb b/lib/spree/paypal_express_configuration.rb new file mode 100644 index 0000000..6a04920 --- /dev/null +++ b/lib/spree/paypal_express_configuration.rb @@ -0,0 +1,5 @@ +module Spree + class PaypalExpressConfiguration < Preferences::Configuration + preference :paypal_express_local_confirm, :boolean, :default => true + end +end diff --git a/lib/spree_paypal_express/engine.rb b/lib/spree_paypal_express/engine.rb index c37f8c0..7cea4d5 100644 --- a/lib/spree_paypal_express/engine.rb +++ b/lib/spree_paypal_express/engine.rb @@ -1,3 +1,4 @@ +module Spree::PaypalExpress; end module SpreePaypalExpress class Engine < Rails::Engine engine_name 'spree_paypal_express' @@ -9,6 +10,10 @@ module SpreePaypalExpress g.test_framework :rspec end + initializer "spree.paypal_express.preferences", :before => :load_config_initializers do |app| + Spree::PaypalExpress::Config = Spree::PaypalExpressConfiguration.new + end + def self.activate Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c| Rails.env.production? ? require(c) : load(c)