feat(expenses): Allow to donate in kind with expenses

opencollective · May 9, 2018 · 90eb94c · 90eb94c
1 parent c14144c
commit 90eb94c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/CreateExpenseForm.js b/src/components/CreateExpenseForm.js
@@ -28,6 +28,7 @@ class CreateExpenseForm extends React.Component {
       'paypal': { id: 'expense.payoutMethod.paypal', defaultMessage: 'PayPal ({paypalEmail, select, missing {missing} other {{paypalEmail}}})' },
       'newExpense.paypal.label': { id: 'newExpense.paypal.label', defaultMessage: 'Please provide address' },
       'other': { id: 'expense.payoutMethod.manual', defaultMessage: 'Other (see instructions)' },
+      'donation': { id: 'expense.payoutMethod.donation', defaultMessage: 'Donation' },
       'error.descriptionMissing': { id: 'expense.error.descriptionMissing', defaultMessage: 'Missing description' },
       'error.amountMissing': { id: 'expense.error.amountMissing', defaultMessage: 'Amount must be greater than 0' },
       'error.privateMessageMissing': { id: 'expense.error.privateMessageMissing', defaultMessage: `Please provide instructions on how you'd like to be reimbursed as a private note` },
@@ -119,7 +120,9 @@ class CreateExpenseForm extends React.Component {
     const { LoggedInUser, intl, collective } = this.props;
     const { expense } = this.state;
 
-    const payoutMethods = this.getOptions(['paypal', 'other'], { paypalEmail: get(expense, 'user.paypalEmail') || intl.formatMessage(this.messages['newExpense.paypal.label']) });
+    const payoutMethods = this.getOptions(['paypal', 'other', 'donation'], {
+      paypalEmail: get(expense, 'user.paypalEmail') || intl.formatMessage(this.messages['newExpense.paypal.label'])
+    });
 
     return (
       <div className={`CreateExpenseForm ${this.props.mode}`}>

diff --git a/src/components/ExpenseDetails.js b/src/components/ExpenseDetails.js
@@ -28,7 +28,8 @@ class ExpenseDetails extends React.Component {
     this.messages = defineMessages({
       'paypal': { id: 'expense.payoutMethod.paypal', defaultMessage: 'PayPal ({paypalEmail, select, missing {missing} hidden {hidden} other {{paypalEmail}}})' },
       // 'manual': { id: 'expense.payoutMethod.donation', defaultMessage: 'Consider as donation' },
-      'other': { id: 'expense.payoutMethod.manual', defaultMessage: 'Other (see instructions)' }
+      'other': { id: 'expense.payoutMethod.manual', defaultMessage: 'Other (see instructions)' },
+      'donation': { id: 'expense.payoutMethod.donation', defaultMessage: 'Donation' },
     });
 
     this.state = { modified: false, expense: {} };
@@ -62,7 +63,7 @@ class ExpenseDetails extends React.Component {
     const previewAttachmentImage = expense.attachment ? imagePreview(expense.attachment) : '/static/images/receipt.svg';
     const payoutMethod = this.state.expense.payoutMethod || expense.payoutMethod;
     const paypalEmail = get(expense, 'user.paypalEmail') || get(expense, 'user.email');
-    const payoutMethods = this.getOptions(['paypal', 'other'], { paypalEmail: paypalEmail || (canEditExpense ? "missing" : "hidden") });
+    const payoutMethods = this.getOptions(['paypal', 'other', 'donation'], { paypalEmail: paypalEmail || (canEditExpense ? "missing" : "hidden") });
     const categoriesOptions = categories(expense.collective.slug).map(category => {
       return { [category]: category }
     });