diff --git a/config.json.example b/config.json.example index 4916a1a78a..a7ba44372c 100644 --- a/config.json.example +++ b/config.json.example @@ -44,7 +44,8 @@ "SELLER_ID": "SELLER_ID", "CLIENT_ID": "CLIENT_ID", "MWS_KEY": "", - "MWS_SECRET": "" + "MWS_SECRET": "", + "MODE": "sandbox" }, "FLAG_REPORT_EMAIL": "email@mod.com,email2@mod.com", "EMAIL_SERVER": { diff --git a/webpack/config/prod.env.js b/webpack/config/prod.env.js index ca5c502e1d..fd784d87ef 100644 --- a/webpack/config/prod.env.js +++ b/webpack/config/prod.env.js @@ -19,6 +19,7 @@ setupNconf(configFile); const AMAZON_SELLER_ID = nconf.get('AMAZON_PAYMENTS:SELLER_ID') || nconf.get('AMAZON_PAYMENTS_SELLER_ID'); const AMAZON_CLIENT_ID = nconf.get('AMAZON_PAYMENTS:CLIENT_ID') || nconf.get('AMAZON_PAYMENTS_CLIENT_ID'); +const AMAZON_MODE = nconf.get('AMAZON_PAYMENTS:MODE') || nconf.get('AMAZON_PAYMENTS_MODE'); let env = { NODE_ENV: '"production"', @@ -26,6 +27,7 @@ let env = { AMAZON_PAYMENTS: { SELLER_ID: `"${AMAZON_SELLER_ID}"`, CLIENT_ID: `"${AMAZON_CLIENT_ID}"`, + MODE: `"${AMAZON_MODE}"`, }, EMAILS: { COMMUNITY_MANAGER_EMAIL: `"${nconf.get('EMAILS:COMMUNITY_MANAGER_EMAIL')}"`, diff --git a/website/client/libs/payments.js b/website/client/libs/payments.js index dade293045..4622478e0a 100644 --- a/website/client/libs/payments.js +++ b/website/client/libs/payments.js @@ -20,7 +20,7 @@ export function setup () { let firstScript = document.getElementsByTagName('script')[0]; amazonScript.type = 'text/javascript'; amazonScript.async = true; - amazonScript.src = `https://static-na.payments-amazon.com/OffAmazonPayments/us/${(NODE_ENV === 'production' ? '' : 'sandbox/')}js/Widgets.js`; + amazonScript.src = `https://static-na.payments-amazon.com/OffAmazonPayments/us/${(AMAZON_PAYMENTS.MODE === 'sandbox' ? 'sandbox/' : '')}js/Widgets.js`; firstScript.parentNode.insertBefore(amazonScript, firstScript); // Stripe diff --git a/website/server/libs/payments/amazon.js b/website/server/libs/payments/amazon.js index 644f3cc494..a257bca221 100644 --- a/website/server/libs/payments/amazon.js +++ b/website/server/libs/payments/amazon.js @@ -22,10 +22,10 @@ import { model as Coupon } from '../../models/coupon'; // TODO better handling of errors const i18n = common.i18n; -const IS_PROD = nconf.get('NODE_ENV') === 'production'; +const IS_SANDBOX = nconf.get('AMAZON_PAYMENTS:MODE') === 'sandbox'; let amzPayment = amazonPayments.connect({ - environment: amazonPayments.Environment[IS_PROD ? 'Production' : 'Sandbox'], + environment: amazonPayments.Environment[IS_SANDBOX ? 'Sandbox' : 'Production'], sellerId: nconf.get('AMAZON_PAYMENTS:SELLER_ID'), mwsAccessKey: nconf.get('AMAZON_PAYMENTS:MWS_KEY'), mwsSecretKey: nconf.get('AMAZON_PAYMENTS:MWS_SECRET'),