This repository has been archived by the owner on Mar 27, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Default to one click if stored payment method is present.
- Loading branch information
Showing
15 changed files
with
400 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
app/javascript/components/CurrencySelector/CurrencySelector.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| import React, { Component } from 'react'; | ||
| import { connect } from 'react-redux'; | ||
| import { FormattedMessage } from 'react-intl'; | ||
| import { changeCurrency } from '../../state/fundraiser/actions'; | ||
|
|
||
| import type { AppState } from '../../state/reducers'; | ||
|
|
||
| type Props = {}; | ||
|
|
||
| type State = { | ||
| currencyDropdVisible: boolean, | ||
| }; | ||
|
|
||
| class CurrencySelector extends Component<Props> { | ||
| constructor(props: Props) { | ||
| super(props); | ||
| this.state = { | ||
| currencyDropdVisible: false, | ||
| }; | ||
| } | ||
|
|
||
| toggleCurrencyDropd() { | ||
| this.setState({ | ||
| currencyDropdVisible: !this.state.currencyDropdVisible, | ||
| }); | ||
| } | ||
|
|
||
| onSelectCurrency(currency: string): void { | ||
| this.props.changeCurrency(currency); | ||
| } | ||
|
|
||
| selectElement() { | ||
| return ( | ||
| this.state.currencyDropdVisible && ( | ||
| <select | ||
| value={this.props.currency} | ||
| className="AmountSelection__currency-selector" | ||
| onChange={(e: SyntheticEvent<HTMLSelectElement>) => | ||
| this.onSelectCurrency(e.currentTarget.value) | ||
| } | ||
| > | ||
| {Object.keys(this.props.donationBands).map(currency => { | ||
| return ( | ||
| <option key={currency} value={currency}> | ||
| {currency} | ||
| </option> | ||
| ); | ||
| })} | ||
| </select> | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <p> | ||
| <FormattedMessage | ||
| id="fundraiser.currency_in" | ||
| defaultMessage="Values shown in {currency}." | ||
| values={{ currency: this.props.currency }} | ||
| /> | ||
| . | ||
| <a | ||
| onClick={this.toggleCurrencyDropd.bind(this)} | ||
| className="AmountSelection__currency-toggle" | ||
| > | ||
| <FormattedMessage | ||
| id="fundraiser.switch_currency" | ||
| defaultMessage="Switch currency" | ||
| /> | ||
| </a> | ||
| {this.selectElement()} | ||
| </p> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| const mapState = (state: AppState) => ({ | ||
| currency: state.fundraiser.currency, | ||
| donationBands: state.fundraiser.donationBands, | ||
| }); | ||
|
|
||
| const mapDispatch = (dispatch: Dispatch<*>) => ({ | ||
| changeCurrency: (currency: string) => dispatch(changeCurrency(currency)), | ||
| }); | ||
|
|
||
| export default connect( | ||
| mapState, | ||
| mapDispatch | ||
| )(CurrencySelector); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| // @flow | ||
|
|
||
| import React, { Component } from 'react'; | ||
| import { connect } from 'react-redux'; | ||
| import { FormattedMessage } from 'react-intl'; | ||
| import DonationBands from '../DonationBands/DonationBands'; | ||
| import DonateButton from '../DonateButton'; | ||
| import CurrencySelector from '../CurrencySelector/CurrencySelector'; | ||
|
|
||
| import Button from '../Button/Button'; | ||
| import { | ||
| changeAmount, | ||
| setSubmitting, | ||
| oneClickFailed, | ||
| } from '../../state/fundraiser/actions'; | ||
|
|
||
| import type { AppState } from '../../state/reducers'; | ||
|
|
||
| type Props = { | ||
| donationBands: any, | ||
| currency: string, | ||
| donationAmount: number, | ||
| selectAmount: (amount: number) => void, | ||
| }; | ||
|
|
||
| type State = { | ||
| amountConfirmationRequired: boolean, | ||
| }; | ||
|
|
||
| class OneClick extends Component<Props> { | ||
| constructor(props: Props) { | ||
| super(props); | ||
| this.state = { | ||
| amountConfirmationRequired: false, | ||
| }; | ||
| } | ||
|
|
||
| onSelectCustomAmount = async (amount: number) => { | ||
| this.props.selectAmount(amount); | ||
| this.setState({ amountConfirmationRequired: true }); | ||
| }; | ||
|
|
||
| selectAmount = async (amount: number) => { | ||
| await this.props.selectAmount(amount); | ||
| this.submit(); | ||
| }; | ||
|
|
||
| oneClickData() { | ||
| return { | ||
| payment: { | ||
| currency: this.props.currency, | ||
| amount: this.props.donationAmount, | ||
| recurring: this.props.recurring, | ||
| payment_method_id: this.props.paymentMethods[0].id, | ||
| // payment_method_id: 900, | ||
| }, | ||
| user: { | ||
| form_id: this.props.formId, | ||
| // formValues will have the prefillValues | ||
| ...this.props.formValues, | ||
| // form will have the user's submitted values | ||
| ...this.props.form, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| submit = () => { | ||
| const data = this.oneClickData(); | ||
| if (data) { | ||
| ee.emit( | ||
| 'fundraiser:transaction_submitted', | ||
| data.payment, | ||
| this.props.formData | ||
| ); | ||
|
|
||
| this.props.setSubmitting(true); | ||
|
|
||
| $.post( | ||
| `/api/payment/braintree/pages/${this.props.page.id}/one_click`, | ||
| data | ||
| ).then(this.onSuccess.bind(this), this.onFailure.bind(this)); | ||
| } | ||
| }; | ||
|
|
||
| async onFailure(reason: any): any { | ||
| this.setState({ submitting: false }); | ||
| this.props.setSubmitting(false); | ||
| this.props.oneClickFailed(); | ||
|
|
||
| ee.emit('fundraiser:transaction_error', reason, this.props.formData); | ||
| return reason; | ||
| } | ||
|
|
||
| async onSuccess(data: any): any { | ||
| ee.emit('fundraiser:transaction_success', data, this.props.formData); | ||
| return data; | ||
| } | ||
|
|
||
| donateButton() { | ||
| if (!this.state.amountConfirmationRequired) return null; | ||
| if (!this.props.donationAmount) return null; | ||
|
|
||
| return ( | ||
| <DonateButton | ||
| currency={this.props.currency} | ||
| amount={this.props.donationAmount || 0} | ||
| recurring={this.props.recurring} | ||
| submitting={this.props.submitting} | ||
| disabled={this.props.submitting} | ||
| onClick={() => this.submit()} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| procssingView() { | ||
| return ( | ||
| <div className="submission-interstitial"> | ||
| <h1 className="submission-interstitial__title"> | ||
| <i className="fa fa-spin fa-cog" /> | ||
| Processing | ||
| </h1> | ||
| <h4> | ||
| Please do not close this tab | ||
| <br /> | ||
| or use the back button. | ||
| </h4> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| paymentOptionsView() { | ||
| return ( | ||
| <div className="OneClick"> | ||
| <div className="StepWrapper-root"> | ||
| <div className="overlay-toggle__mobile-ui"> | ||
| <a className="overlay-toggle__close-button">✕</a> | ||
| </div> | ||
| <div className="Stepper fundraiser-bar__top"> | ||
| <h2 className="Stepper__header">{this.props.title}</h2> | ||
| </div> | ||
| <div className="fundraiser-bar__main"> | ||
| <p> | ||
| <FormattedMessage | ||
| id="fundraiser.one_click_warning" | ||
| defaultMessage="Your donation will be processed immediately." | ||
| /> | ||
| </p> | ||
|
|
||
| <DonationBands | ||
| amounts={this.props.donationBands[this.props.currency]} | ||
| currency={this.props.currency} | ||
| featuredAmount={this.props.donationFeaturedAmount} | ||
| proceed={() => {}} | ||
| selectAmount={this.selectAmount} | ||
| selectCustomAmount={this.onSelectCustomAmount} | ||
| /> | ||
|
|
||
| {this.donateButton()} | ||
| <CurrencySelector /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| render() { | ||
| return this.props.submitting | ||
| ? this.procssingView() | ||
| : this.paymentOptionsView(); | ||
| } | ||
| } | ||
|
|
||
| const mapState = (state: AppState) => ({ | ||
| currency: state.fundraiser.currency, | ||
| donationAmount: state.fundraiser.donationAmount, | ||
| donationBands: state.fundraiser.donationBands, | ||
| recurring: state.fundraiser.recurring, | ||
| paymentMethods: state.paymentMethods, | ||
| formId: state.fundraiser.formId, | ||
| formValues: state.fundraiser.formValues, | ||
| form: state.fundraiser.form, | ||
| page: state.page, | ||
| submitting: state.fundraiser.submitting, | ||
| title: state.fundraiser.title, | ||
| }); | ||
|
|
||
| const mapDispatch = (dispatch: Dispatch<*>) => ({ | ||
| selectAmount: (amount: number) => dispatch(changeAmount(amount)), | ||
| setSubmitting: (submitting: boolean) => dispatch(setSubmitting(submitting)), | ||
| oneClickFailed: () => dispatch(oneClickFailed()), | ||
| }); | ||
|
|
||
| export default connect( | ||
| mapState, | ||
| mapDispatch | ||
| )(OneClick); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.