2 files changed, 40 insertions, 24 deletions
diff --git a/billing/config/initializers/braintree.rb b/billing/config/initializers/braintree.rb
index d6ae565..c0c89e2 100644
--- a/billing/config/initializers/braintree.rb
+++ b/billing/config/initializers/braintree.rb
@@ -1,16 +1,31 @@
-require 'braintree_test_app'
-
-Braintree::Configuration.logger = Logger.new('log/braintree.log')
+#
+# set logger
+#
+if APP_CONFIG[:logfile].blank?
+  require 'syslog/logger'
+  Braintree::Configuration.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new('webapp'))
+else
+  Braintree::Configuration.logger = Logger.new('log/braintree.log')
+end
 
+#
 # we use fake braintree in tests
+#
 if Rails.env.test?
+  require 'braintree_test_app'
   Rails.application.config.middleware.use BraintreeTestApp
 end
 
+#
 # You can set these per environment in config/config.yml:
-if braintree_conf = APP_CONFIG[:braintree]
-  Braintree::Configuration.environment = braintree_conf[:environment]
-  Braintree::Configuration.merchant_id = braintree_conf[:merchant_id]
-  Braintree::Configuration.public_key  = braintree_conf[:public_key]
-  Braintree::Configuration.private_key = braintree_conf[:private_key]
+#
+# Environment must be one of: :development, :qa, :sandbox, :production
+#
+if billing = APP_CONFIG[:billing]
+  if braintree = billing[:braintree]
+    Braintree::Configuration.environment = braintree[:environment].downcase.to_sym
+    Braintree::Configuration.merchant_id = braintree[:merchant_id]
+    Braintree::Configuration.public_key  = braintree[:public_key]
+    Braintree::Configuration.private_key = braintree[:private_key]
+  end
 end
diff --git a/billing/config/routes.rb b/billing/config/routes.rb
index dbdc24b..7263dff 100644
--- a/billing/config/routes.rb
+++ b/billing/config/routes.rb
@@ -1,24 +1,25 @@
 Rails.application.routes.draw do
 
-  match 'payments/new' => 'payments#new', :as => :new_payment
-  match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
-  resources :users do
-    resources :payments, :only => [:index]
-    resources :subscriptions, :only => [:index, :show, :destroy]
-  end
-
-  resources :customer, :only => [:new, :edit]
-  resources :credit_card_info, :only => [:edit]
+  scope "(:locale)", :locale => MATCH_LOCALE do
+    match 'payments/new' => 'payments#new', :as => :new_payment
+    match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
+    resources :users do
+      resources :payments, :only => [:index]
+      resources :subscriptions, :only => [:index, :show, :destroy]
+    end
 
-  match 'customer/confirm/' => 'customer#confirm', :as => :confirm_customer
-  match 'customer/show/:id' => 'customer#show', :as => :show_customer
-  match 'credit_card_info/confirm' => 'credit_card_info#confirm', :as => :confirm_credit_card_info
+    resources :customer, :only => [:new, :edit]
+    resources :credit_card_info, :only => [:edit]
 
-  resources :subscriptions, :only => [:new, :create, :update] # index, show & destroy are within users path
-  match 'billing_admin' => 'billing_admin#show', :as => :billing_admin
+    match 'customer/confirm/' => 'customer#confirm', :as => :confirm_customer
+    match 'customer/show/:id' => 'customer#show', :as => :show_customer
+    match 'credit_card_info/confirm' => 'credit_card_info#confirm', :as => :confirm_credit_card_info
 
-  #match 'transactions/:product_id/new' => 'transactions#new', :as => :new_transaction
-  #match 'transactions/confirm/:product_id' => 'transactions#confirm', :as => :confirm_transaction
+    resources :subscriptions, :only => [:new, :create, :update] # index, show & destroy are within users path
+    match 'billing_admin' => 'billing_admin#show', :as => :billing_admin
 
+    #match 'transactions/:product_id/new' => 'transactions#new', :as => :new_transaction
+    #match 'transactions/confirm/:product_id' => 'transactions#confirm', :as => :confirm_transaction
+  end
 
 end