diff --git a/client/src/components/Donation/MinimalDonateForm.js b/client/src/components/Donation/MinimalDonateForm.js index 293bb61551..6ddba75912 100644 --- a/client/src/components/Donation/MinimalDonateForm.js +++ b/client/src/components/Donation/MinimalDonateForm.js @@ -14,8 +14,11 @@ import { stripePublicKey } from '../../../../config/env.json'; import { stripeScriptLoader } from '../../utils/scriptLoaders'; import DonateFormChildViewForHOC from './DonateFormChildViewForHOC'; import DonateCompletion from './DonateCompletion'; +import PaypalButton from './PaypalButton'; import { userSelector } from '../../redux'; +import { Spacer } from '../../components/helpers'; + import './Donation.css'; const propTypes = { @@ -126,7 +129,18 @@ class MinimalDonateForm extends Component { return ( + + + + + Or donate with a credit card: + + + { - this.props.handleProcessing('month', 500, 'Paypal payment submission'); + this.props.handleProcessing('year', 6000, 'Paypal payment submission'); this.props.onDonationStateChange(false, true, ''); verifySubscriptionPaypal(data) .then(response => { diff --git a/client/src/pages/donate.js b/client/src/pages/donate.js index a60e98b3fc..0976046ae0 100644 --- a/client/src/pages/donate.js +++ b/client/src/pages/donate.js @@ -12,6 +12,7 @@ import DonateForm from '../components/Donation/DonateForm'; import DonateText from '../components/Donation/DonateText'; import { signInLoadingSelector, userSelector, executeGA } from '../redux'; import { stripeScriptLoader } from '../utils/scriptLoaders'; +import { PaypalButton } from '../components/Donation/PaypalButton'; const propTypes = { executeGA: PropTypes.func, @@ -131,6 +132,14 @@ export class DonatePage extends Component { handleProcessing={this.handleProcessing} stripe={stripe} /> + + + + Or donate with: + + + + diff --git a/config/donation-settings.js b/config/donation-settings.js index ee7b5386d2..1a4c8b9467 100644 --- a/config/donation-settings.js +++ b/config/donation-settings.js @@ -1,4 +1,5 @@ -require('dotenv').config(); +const path = require('path'); +require('dotenv').config({ path: path.resolve(__dirname, '../.env') }); // Configuration for client side const durationsConfig = { @@ -56,16 +57,22 @@ const paypalConfigTypes = { durationPlans: { month: { '500': { - planId: 'P-146249205C631091BLZKRHGA' + planId: 'P-37N14480BW163382FLZYPVMA' + } + }, + year: { + '6000': { + planId: 'P-0UY77185EM3077131LZYP6VY' } } } } }; -const paypalConfig = process.env.DEPLOYMENT_ENV - ? paypalConfigTypes['live'] - : paypalConfigTypes['staging']; +const paypalConfig = + process.env.DEPLOYMENT_ENV && process.env.DEPLOYMENT_ENV === 'live' + ? paypalConfigTypes['live'] + : paypalConfigTypes['staging']; module.exports = { durationsConfig,