From f8328d3eeb29991639c87eb9923d773a0d5dc9b5 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 12 Oct 2013 17:05:21 -0700
Subject: [PATCH] paypal: add configurable merchant and sandbox/production
 environment

---
 config.json.example               | 1 +
 public/js/controllers/rootCtrl.js | 2 +-
 src/middleware.js                 | 1 +
 views/shared/modals/buy-gems.jade | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config.json.example b/config.json.example
index c1cc52ad11..3bbcde4cc0 100644
--- a/config.json.example
+++ b/config.json.example
@@ -13,4 +13,5 @@
     "SMTP_SERVICE":"Gmail",
     "STRIPE_API_KEY":"aaaabbbbccccddddeeeeffff00001111",
     "STRIPE_PUB_KEY":"22223333444455556666777788889999"
+    "PAYPAL_MERCHANT":"paypal-merchant@gmail.com"
 }
\ No newline at end of file
diff --git a/public/js/controllers/rootCtrl.js b/public/js/controllers/rootCtrl.js
index 052a52b778..a298188db3 100644
--- a/public/js/controllers/rootCtrl.js
+++ b/public/js/controllers/rootCtrl.js
@@ -47,7 +47,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
         address: false,
         amount: 500,
         name: "Checkout",
-        //description: "Buy 20 Gems, Disable Ads, Support the Developers",
+        description: "Buy 20 Gems, Disable Ads, Support the Developers",
         panelLabel: "Checkout",
         token: function(data) {
           $scope.$apply(function(){
diff --git a/src/middleware.js b/src/middleware.js
index 1b4cadd396..45209e6375 100644
--- a/src/middleware.js
+++ b/src/middleware.js
@@ -64,6 +64,7 @@ module.exports.locals = function(req, res, next) {
   _.defaults(res.locals.habitrpg, {
     NODE_ENV: nconf.get('NODE_ENV'),
     BASE_URL: nconf.get('BASE_URL'),
+    PAYPAL_MERCHANT: nconf.get('PAYPAL_MERCHANT'),
     IS_MOBILE: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')),
     STRIPE_PUB_KEY: nconf.get('STRIPE_PUB_KEY'),
     getBuildUrl: getBuildUrl
diff --git a/views/shared/modals/buy-gems.jade b/views/shared/modals/buy-gems.jade
index 8562d0e754..b727065599 100644
--- a/views/shared/modals/buy-gems.jade
+++ b/views/shared/modals/buy-gems.jade
@@ -15,7 +15,7 @@ div(modal='modals.buyGems')
         .btn.btn-primary(ng-click='showStripe()') Pay with Card
       .span6.well
         h3 Pay with PayPal
-        script(src='/bower_components/JavaScriptButtons/dist/paypal-button.min.js?merchant=tylerrenelle-facilitator@gmail.com', data-button='buynow', data-name='20 Gems, Disable Ads, Donation to the Developers', data-quantity='1', data-amount='.1', data-currency='USD', data-shipping='0', data-tax='0', data-callback='#{env.BASE_URL}/api/v1/user/buy-gems/paypal-ipn', data-env='sandbox', data-custom='?uid={{user._id}}&apiToken={{user.apiToken}}')
+        script(src='/bower_components/JavaScriptButtons/dist/paypal-button.min.js?merchant=#{env.PAYPAL_MERCHANT}', data-button='buynow', data-name='20 Gems, Disable Ads, Donation to the Developers', data-quantity='1', data-amount='5', data-currency='USD', data-shipping='0', data-tax='0', data-callback='#{env.BASE_URL}/api/v1/user/buy-gems/paypal-ipn', data-env="#{env.NODE_ENV == 'production' ? '' : 'sandbox'}", data-custom='?uid={{user._id}}&apiToken={{user.apiToken}}', data-return='#{env.BASE_URL}', data-no_shipping='1')
 
   .modal-footer
     button.btn.btn-default.cancel(ng-click='modals.buyGems = false') Cancel
\ No newline at end of file