From 6472e04bd0c3788138ea18461e13b344060d5f13 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 25 Jan 2015 15:22:04 -0600 Subject: [PATCH] Changed shared to common for payments --- src/controllers/payments/index.js | 4 ++-- src/controllers/payments/paypal.js | 2 +- src/controllers/payments/paypalBillingSetup.js | 4 ++-- src/controllers/payments/stripe.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/controllers/payments/index.js b/src/controllers/payments/index.js index c2f83959de..c900e94ada 100644 --- a/src/controllers/payments/index.js +++ b/src/controllers/payments/index.js @@ -1,6 +1,6 @@ /* @see ./routes.coffee for routing*/ var _ = require('lodash'); -var shared = require('habitrpg-shared'); +var shared = require('../../../common'); var nconf = require('nconf'); var utils = require('./../../utils'); var moment = require('moment'); @@ -137,4 +137,4 @@ exports.paypalCheckoutSuccess = paypal.executePayment; exports.paypalIPN = paypal.ipn; exports.iapAndroidVerify = iap.androidVerify; -exports.iapIosVerify = iap.iosVerify; \ No newline at end of file +exports.iapIosVerify = iap.iosVerify; diff --git a/src/controllers/payments/paypal.js b/src/controllers/payments/paypal.js index f69ab306da..9b71e279bd 100644 --- a/src/controllers/payments/paypal.js +++ b/src/controllers/payments/paypal.js @@ -8,7 +8,7 @@ var payments = require('./index'); var logger = require('../../logging'); var ipn = require('paypal-ipn'); var paypal = require('paypal-rest-sdk'); -var shared = require('habitrpg-shared'); +var shared = require('../../../common'); var mongoose = require('mongoose'); var cc = require('coupon-code'); diff --git a/src/controllers/payments/paypalBillingSetup.js b/src/controllers/payments/paypalBillingSetup.js index 14721e22d1..94668ab2b8 100644 --- a/src/controllers/payments/paypalBillingSetup.js +++ b/src/controllers/payments/paypalBillingSetup.js @@ -8,7 +8,7 @@ var nconf = require('nconf'); _ = require('lodash'); nconf.argv().env().file('user', path.join(path.resolve(__dirname, '../../../config.json'))); var paypal = require('paypal-rest-sdk'); -var blocks = require('habitrpg-shared').content.subscriptionBlocks; +var blocks = require('../../../common').content.subscriptionBlocks; var live = nconf.get('PAYPAL:mode')=='live'; var OP = 'create'; // list create update remove @@ -90,4 +90,4 @@ switch(OP) { }); break; case "remove": break; -} \ No newline at end of file +} diff --git a/src/controllers/payments/stripe.js b/src/controllers/payments/stripe.js index 74172cc8ab..3c4f2f2631 100644 --- a/src/controllers/payments/stripe.js +++ b/src/controllers/payments/stripe.js @@ -3,7 +3,7 @@ var stripe = require("stripe")(nconf.get('STRIPE_API_KEY')); var async = require('async'); var payments = require('./index'); var User = require('mongoose').model('User'); -var shared = require('habitrpg-shared'); +var shared = require('../../../common'); var mongoose = require('mongoose'); var cc = require('coupon-code'); @@ -120,4 +120,4 @@ exports.subscribeEdit = function(req, res, next) { res.send(200); token = user = user_id = sub_id; }); -}; \ No newline at end of file +};