Skip to content

Fixing tanners dirty bug #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ELI7VH wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixing tanners dirty bug #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faf506c
unused vars
ELI7VH May 3, 2021
6bd1a49
🧹
ELI7VH May 3, 2021
cdce9dd
🧹
ELI7VH May 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
257 changes: 148 additions & 109 deletions webclient/src/Account.js
View file
Open in desktop

Large diffs are not rendered by default.

379 changes: 251 additions & 128 deletions webclient/src/Admin.js
View file
Open in desktop

Large diffs are not rendered by default.

675 changes: 403 additions & 272 deletions webclient/src/AdminMembers.js
View file
Open in desktop

Large diffs are not rendered by default.

190 changes: 107 additions & 83 deletions webclient/src/AdminTransactions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
import React, { useState, useEffect } from 'react';
import { BrowserRouter as Router, Switch, Route, Link, useParams, useHistory } from 'react-router-dom';
import { Link } from 'react-router-dom';
import './light.css';
import { Button, Container, Checkbox, Dimmer, Divider, Dropdown, Form, Grid, Header, Icon, Image, Menu, Message, Segment, Table } from 'semantic-ui-react';
import { Container, Checkbox, Form, Header, Segment } from 'semantic-ui-react';
import * as Datetime from 'react-datetime';
import 'react-datetime/css/react-datetime.css';
import moment from 'moment';
import { statusColor, BasicTable, staticUrl, requester } from './utils.js';
import { requester } from './utils.js';
import { TransactionList, TransactionEditor } from './Transactions.js';
import { NotFound } from './Misc.js';

export function AdminReportedTransactions(props) {
const { token, user } = props;
const { token } = props;
const [transactions, setTransactions] = useState(false);
const [error, setError] = useState(false);

useEffect(() => {
requester('/transactions/', 'GET', token)
.then(res => {
setTransactions(res.results);
setError(false);
})
.catch(err => {
console.log(err);
setError(true);
});
.then((res) => {
setTransactions(res.results);
setError(false);
})
.catch((err) => {
console.log(err);
setError(true);
});
}, []);

return (
<div>
{!error ?
transactions ?
{!error ? (
transactions ? (
<div>
<TransactionList transactions={transactions} />
</div>
:
) : (
<p>Loading...</p>
:
)
) : (
<p>Error loading.</p>
}
)}
</div>
);
};
}

let transactionsCache = false;
let excludePayPalCache = false;

export function AdminHistoricalTransactions(props) {
const { token, user } = props;
const { token } = props;
const [input, setInput] = useState({ month: moment() });
const [transactions, setTransactions] = useState(transactionsCache);
const [excludePayPal, setExcludePayPal] = useState(excludePayPalCache);
Expand All @@ -65,17 +65,17 @@ export function AdminHistoricalTransactions(props) {
setLoading(true);
const month = input.month.format('YYYY-MM');
requester('/transactions/?month=' + month, 'GET', token)
.then(res => {
setLoading(false);
setError(false);
setTransactions(res.results);
transactionsCache = res.results;
})
.catch(err => {
setLoading(false);
console.log(err);
setError(true);
});
.then((res) => {
setLoading(false);
setError(false);
setTransactions(res.results);
transactionsCache = res.results;
})
.catch((err) => {
setLoading(false);
console.log(err);
setError(true);
});
};

return (
Expand All @@ -85,45 +85,59 @@ export function AdminHistoricalTransactions(props) {
<Form.Group>
<Form.Field>
<Datetime
dateFormat='YYYY-MM'
dateFormat="YYYY-MM"
timeFormat={false}
value={input.month}
onChange={handleDatetime}
/>
</Form.Field>

<Form.Button loading={loading}>
Submit
</Form.Button>
<Form.Button loading={loading}>Submit</Form.Button>
</Form.Group>
</Form>

{!error ?
transactions && <div>
<p>Found {transactions.length} transactions.</p>
{!!transactions.length &&
<Header size='small'>{moment(transactions[0].date, 'YYYY-MM-DD').format('MMMM YYYY')} Transactions</Header>
}

<Checkbox
label='Exclude PayPal'
onChange={handleExcludePayPal}
checked={excludePayPal}
/>

<TransactionList transactions={transactions.filter(x => !excludePayPal || x.account_type !== 'PayPal')} />
</div>
:
{!error ? (
transactions && (
<div>
<p>Found {transactions.length} transactions.</p>
{!!transactions.length && (
<Header size="small">
{moment(
transactions[0].date,
'YYYY-MM-DD'
).format('MMMM YYYY')}{' '}
Transactions
</Header>
)}

<Checkbox
label="Exclude PayPal"
onChange={handleExcludePayPal}
checked={excludePayPal}
/>

<TransactionList
transactions={transactions.filter(
(x) =>
!excludePayPal ||
x.account_type !== 'PayPal'
)}
/>
</div>
)
) : (
<p>Error loading transactions.</p>
}
)}
</div>
);
};
}

export function AdminAddTransaction(props) {
const { token } = props;
const [open, setOpen] = useState(false);
const [input, setInput] = useState({ date: moment().format('YYYY-MM-DD'), info_source: 'Web' });
const [input, setInput] = useState({
date: moment().format('YYYY-MM-DD'),
info_source: 'Web',
});
const [error, setError] = useState(false);
const [loading, setLoading] = useState(false);
const [success, setSuccess] = useState(false);
Expand All @@ -133,69 +147,79 @@ export function AdminAddTransaction(props) {
setLoading(true);
setSuccess(false);
requester('/transactions/', 'POST', token, input)
.then(res => {
setSuccess(res.id);
setInput({});
setLoading(false);
setError(false);
})
.catch(err => {
setLoading(false);
console.log(err);
setError(err.data);
});
.then((res) => {
setSuccess(res.id);
setInput({});
setLoading(false);
setError(false);
})
.catch((err) => {
setLoading(false);
console.log(err);
setError(err.data);
});
};

return (
<Form onSubmit={handleSubmit}>
<TransactionEditor {...props} input={input} setInput={setInput} error={error} />
<TransactionEditor
{...props}
input={input}
setInput={setInput}
error={error}
/>

<Form.Button loading={loading} error={error.non_field_errors}>
Submit
</Form.Button>
{success && <p>Added! <Link to={'/transactions/'+success}>View the transaction.</Link></p>}
{success && (
<p>
Added!{' '}
<Link to={'/transactions/' + success}>
View the transaction.
</Link>
</p>
)}
</Form>
);
};
}

export function AdminTransactions(props) {
return (
<Container>
<Header size='large'>Admin Transactions</Header>
<Header size="large">Admin Transactions</Header>

<Segment padded>
<Header size='medium'>Add a Transaction</Header>
<Header size="medium">Add a Transaction</Header>
<AdminAddTransaction {...props} />
</Segment>

<Header size='medium'>Reported</Header>
<Header size="medium">Reported</Header>
<AdminReportedTransactions {...props} />

<Header size='medium'>Historical</Header>
<Header size="medium">Historical</Header>
<AdminHistoricalTransactions {...props} />
</Container>
);
}

export function AdminMemberTransactions(props) {
const { token, result, refreshResult } = props;
const { result } = props;
const transactions = result.transactions;
const { id } = useParams();

return (
<div>
<Header size='medium'>Member Transactions</Header>
<Header size="medium">Member Transactions</Header>

<Link to='/admintrans'>Add a transaction</Link>
<Link to="/admintrans">Add a transaction</Link>

<Header size='small'>Current Transactions</Header>
<Header size="small">Current Transactions</Header>

{transactions.length ?
{transactions.length ? (
<TransactionList noMember transactions={transactions} />
:
) : (
<p>None</p>
}

)}
</div>
);
};
}
Loading