lib/artfully_ose/engine.rb in artfully_ose-1.2.0.pre.24 vs lib/artfully_ose/engine.rb in artfully_ose-1.2.0.pre.26

@@ -8,14 +8,15 @@
       end
     end
 
     initializer "artfully_ose.braintree_config" do |app|
       puts "ArtfullyOse: Initializing Braintree config"
-      BraintreeConfig = Struct.new(:merchant_id, :public_key, :private_key)
+      BraintreeConfig      = Struct.new(:merchant_account_id, :merchant_id, :public_key, :private_key)
       app.config.braintree = BraintreeConfig.new
-      app.config.braintree.merchant_id   = ENV['BRAINTREE_MERCHANT_ID']
-      app.config.braintree.public_key    = ENV['BRAINTREE_PUBLIC_KEY']
-      app.config.braintree.private_key   = ENV['BRAINTREE_PRIVATE_KEY']
+      app.config.braintree.merchant_account_id = ENV['BRAINTREE_MERCHANT_ACCOUNT_ID']
+      app.config.braintree.merchant_id         = ENV['BRAINTREE_MERCHANT_ID']
+      app.config.braintree.public_key          = ENV['BRAINTREE_PUBLIC_KEY']
+      app.config.braintree.private_key         = ENV['BRAINTREE_PRIVATE_KEY']
     end
     
     initializer "artfully_ose.s3_config" do |app|
       puts "ArtfullyOse: Initializing S3 config"
       S3Config = Struct.new(:bucket, :access_key_id, :secret_access_key)
\ No newline at end of file