-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #344 from setlife-network/hotfix/1.0.3
Hotfix/1.0.3
- Loading branch information
Showing
31 changed files
with
1,416 additions
and
227 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| module.exports = { | ||
| up: async (queryInterface, Sequelize) => { | ||
| return queryInterface.sequelize.transaction(t => { | ||
| return Promise.all([ | ||
| queryInterface.addColumn('Rates', 'currency', { | ||
| type: Sequelize.DataTypes.STRING | ||
| }, { transaction: t }) | ||
| ]) | ||
| }) | ||
| }, | ||
|
|
||
| down: async (queryInterface, Sequelize) => { | ||
| return queryInterface.sequelize.transaction(t => { | ||
| return Promise.all([ | ||
| queryInterface.removeColumn('Rates', 'currency', { transaction: t }) | ||
| ]) | ||
| }) | ||
| } | ||
| }; |
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
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,193 @@ | ||
| import React, { useEffect, useState } from 'react' | ||
| import { useQuery, useMutation } from '@apollo/client' | ||
| import { useHistory } from 'react-router-dom' | ||
| import { | ||
| Box, | ||
| Button, | ||
| FormControl, | ||
| Grid, | ||
| Snackbar, | ||
| TextField, | ||
| Typography | ||
| } from '@material-ui/core' | ||
| import Alert from '@material-ui/lab/Alert' | ||
| import { | ||
| MuiPickersUtilsProvider, | ||
| KeyboardDatePicker | ||
| } from '@material-ui/pickers' | ||
| import CurrencyTextField from '@unicef/material-ui-currency-textfield' | ||
| import moment from 'moment' | ||
| import MomentUtils from '@date-io/moment' | ||
|
|
||
| import LoadingProgress from './LoadingProgress' | ||
| import { GET_CLIENT_INFO } from '../operations/queries/ClientQueries' | ||
| import { GET_CLIENT_PAYMENTS } from '../operations/queries/PaymentQueries' | ||
| import { CREATE_PAYMENT } from '../operations/mutations/PaymentMutations' | ||
| import { | ||
| selectCurrencyInformation | ||
| } from '../scripts/selectors' | ||
|
|
||
| const AddPaymentForm = (props) => { | ||
|
|
||
| const { | ||
| clientId | ||
| } = props | ||
|
|
||
| const history = useHistory() | ||
|
|
||
| const { | ||
| data: dataClient, | ||
| error: errorClient, | ||
| loading: loadingProject | ||
| } = useQuery(GET_CLIENT_INFO, { | ||
| variables: { | ||
| id: Number(clientId) | ||
| } | ||
| }) | ||
|
|
||
| const [createPayment, { | ||
| dataNewPayment, | ||
| loadingNewPayment, | ||
| errorNewPayment | ||
| }] = useMutation(CREATE_PAYMENT, { | ||
| refetchQueries: [{ | ||
| query: GET_CLIENT_PAYMENTS, | ||
| variables: { | ||
| clientId: Number(clientId) | ||
| } | ||
| }] | ||
| }) | ||
|
|
||
| const handleAlertClose = (event, reason) => { | ||
| if (reason === 'clickaway') { | ||
| return | ||
| } | ||
| setDisplayError(false) | ||
| } | ||
| const handleCreatePayment = async () => { | ||
| const variables = { | ||
| amount: paymentAmount, | ||
| client_id: Number(clientId), | ||
| date_incurred: dateIncurred, | ||
| date_paid: datePaid | ||
| } | ||
| const newPayment = await createPayment({ variables }) | ||
| if (loadingNewPayment) return <LoadingProgress/> | ||
| if (newPayment.errors) { | ||
| setCreatePaymentError(`${Object.keys(newPayment.errors[0].extensions.exception.fields)[0]}`) | ||
| setDisplayError(true) | ||
| } else { | ||
| history.push(`/clients/${clientId}`) | ||
| } | ||
| } | ||
| const handleDateIncurredChange = (date) => { | ||
| setDateIncurred(moment(date['_d']).format('YYYY-MM-DD')) | ||
| } | ||
| const handleDatePaidChange = (date) => { | ||
| setDatePaid(moment(date['_d']).format('YYYY-MM-DD')) | ||
| } | ||
| const handlePaymentAmountChange = (input) => { | ||
| setInvalidPaymentAmountInput(false) | ||
| const amount = Number(input.replace(/\D/g, '')) | ||
| setPaymentAmount(amount) | ||
| } | ||
|
|
||
| const [createPaymentError, setCreatePaymentError] = useState('') | ||
| const [dateIncurred, setDateIncurred] = useState(null) | ||
| const [datePaid, setDatePaid] = useState(null) | ||
| const [disableAdd, setDisableAdd] = useState(true) | ||
| const [displayError, setDisplayError] = useState(false) | ||
| const [invalidPaymentAmountInput, setInvalidPaymentAmountInput] = useState(false) | ||
| const [paymentAmount, setPaymentAmount] = useState(null) | ||
|
|
||
| useEffect(() => { | ||
| if (dateIncurred && paymentAmount) { | ||
| setDisableAdd(false) | ||
| } | ||
| }) | ||
|
|
||
| if (loadingProject) return <LoadingProgress/> | ||
| if (errorClient) return `Error! ${errorClient}` | ||
|
|
||
| const { getClientById: client } = dataClient | ||
|
|
||
| const currencyInformation = selectCurrencyInformation({ | ||
| currency: client.currency | ||
| }) | ||
|
|
||
| return ( | ||
| <FormControl | ||
| fullWidth | ||
| align='left' | ||
| > | ||
| <Grid container spacing={5}> | ||
| <Grid item xs={12}> | ||
| <Grid container> | ||
| <Grid item xs={12} sm={6} lg={4}> | ||
| <CurrencyTextField | ||
| fullWidth | ||
| label='Payment amount' | ||
| variant='outlined' | ||
| currencySymbol={`${currencyInformation['symbol']}`} | ||
| minimumValue='0' | ||
| outputFormat='string' | ||
| decimalCharacter={`${currencyInformation['decimal']}`} | ||
| digitGroupSeparator={`${currencyInformation['thousand']}`} | ||
| onChange={(event) => handlePaymentAmountChange(event.target.value)} | ||
| /> | ||
| </Grid> | ||
| </Grid> | ||
| </Grid> | ||
| <Grid item xs={12} sm={6} lg={4}> | ||
| <MuiPickersUtilsProvider utils={MomentUtils}> | ||
| <KeyboardDatePicker | ||
| fullWidth | ||
| disableToolbar | ||
| variant='inline' | ||
| format='MM/DD/YYYY' | ||
| margin='normal' | ||
| label='Payment date incurred' | ||
| value={dateIncurred} | ||
| onChange={handleDateIncurredChange} | ||
| /> | ||
| </MuiPickersUtilsProvider> | ||
| </Grid> | ||
| <Grid item xs={12} sm={6} lg={4}> | ||
| <MuiPickersUtilsProvider utils={MomentUtils}> | ||
| <KeyboardDatePicker | ||
| fullWidth | ||
| disableToolbar | ||
| variant='inline' | ||
| format='MM/DD/YYYY' | ||
| margin='normal' | ||
| label='Payment date paid' | ||
| value={datePaid} | ||
| onChange={handleDatePaidChange} | ||
| /> | ||
| </MuiPickersUtilsProvider> | ||
| </Grid> | ||
| <Grid item xs={12}> | ||
| <Button | ||
| variant='contained' | ||
| color='primary' | ||
| disabled={disableAdd} | ||
| onClick={handleCreatePayment} | ||
| > | ||
| {`Add Payment`} | ||
| </Button> | ||
| </Grid> | ||
| </Grid> | ||
| <Snackbar | ||
| open={displayError} | ||
| autoHideDuration={4000} | ||
| onClose={handleAlertClose} | ||
| > | ||
| <Alert severity='error'> | ||
| {`${createPaymentError}`} | ||
| </Alert> | ||
| </Snackbar> | ||
| </FormControl> | ||
| ) | ||
| } | ||
|
|
||
| export default AddPaymentForm |
Oops, something went wrong.