diff --git a/src/components/manifest/OrderPaymentList.jsx b/src/components/manifest/OrderPaymentList.jsx
index 6487cbc..bdcf321 100644
--- a/src/components/manifest/OrderPaymentList.jsx
+++ b/src/components/manifest/OrderPaymentList.jsx
@@ -1,28 +1,21 @@
import { PureComponent } from 'react';
import Box from '@mui/material/Box';
-import Button from '@mui/material/Button';
import Chip from '@mui/material/Chip';
import CircularProgress from '@mui/material/CircularProgress';
import Divider from '@mui/material/Divider';
import IconButton from '@mui/material/IconButton';
import ListItemButton from '@mui/material/ListItemButton';
-import TextField from '@mui/material/TextField';
import Typography from '@mui/material/Typography';
-import MenuItem from '@mui/material/MenuItem';
import PaymentsIcon from '@mui/icons-material/Payments';
import AccountBalanceIcon from '@mui/icons-material/AccountBalance';
import PointOfSaleIcon from '@mui/icons-material/PointOfSale';
import CreditCardIcon from '@mui/icons-material/CreditCard';
-import AddIcon from '@mui/icons-material/Add';
import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined';
-import CloseIcon from '@mui/icons-material/Close';
-import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
import { enqueueSnackbar } from 'notistack';
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
import FillSpace from 'dashgui/FillSpace';
import { PanelTile, PanelTileGrid } from 'dashgui/panels';
import BackendError from '../BackendError';
-import AppDialog from '../AppDialog';
import orderAutomat from '../../automats/orderAutomat';
import accountAutomat from '../../automats/accountAutomat';
import { payment as paymentApi } from '../../api';
@@ -31,7 +24,6 @@ import { notifyError } from '../../utils/notify';
import { formatPrice } from '../../utils/price';
import withNavigate from '../withNavigate';
import {
- formatDate,
loadParties,
manifestConfig,
partyDisplayName,
@@ -39,7 +31,6 @@ import {
import {
YELLOW_PANEL,
SURFACE_RAISED,
- WHITE,
} from '../../colors';
const cfg = manifestConfig('order');
@@ -166,175 +157,6 @@ class PaymentTableRow extends PureComponent {
}
}
-// MARK:
-class RecordPaymentDialog extends PureComponent {
- constructor(props) {
- super(props);
- const orders = props.orders || [];
- // Prefer unpaid orders
- const unpaidOrders = orders.filter((o) => {
- const tot = Number(o.orderTotal) || 0;
- const pd = Number(o.paidTotal) || 0;
- return tot === 0 || pd < tot;
- });
-
- const selectedOrder = unpaidOrders[0] || orders[0] || null;
- const remaining = selectedOrder ? Math.max(0, Math.round(((Number(selectedOrder.orderTotal) || 0) - (Number(selectedOrder.paidTotal) || 0)) * 100) / 100) : 0;
- const accounts = accountAutomat.state.items || [];
- const defaultAccountId = accounts[0]?.id || 1;
-
- this.state = {
- orderId: selectedOrder?.id || '',
- accountId: defaultAccountId,
- type: 'transfer',
- amount: remaining > 0 ? String(remaining) : '',
- saving: false,
- };
-
- this.handleOrderChange = this.handleOrderChange.bind(this);
- this.handleSubmit = this.handleSubmit.bind(this);
- }
-
- handleOrderChange(newOrderId) {
- const order = this.props.orders.find((o) => o.id === Number(newOrderId));
- const remaining = order ? Math.max(0, Math.round(((Number(order.orderTotal) || 0) - (Number(order.paidTotal) || 0)) * 100) / 100) : 0;
- this.setState({
- orderId: newOrderId,
- amount: remaining > 0 ? String(remaining) : '',
- });
- }
-
- async handleSubmit() {
- const { onClose, onSuccess } = this.props;
- const { orderId, accountId, type, amount } = this.state;
- const numAmount = Number(String(amount).replace(',', '.'));
-
- if (!orderId) {
- enqueueSnackbar('Bitte einen Auftrag auswählen.', { variant: 'warning' });
- return;
- }
-
- if (!Number.isFinite(numAmount) || numAmount <= 0) {
- enqueueSnackbar('Bitte einen gültigen Betrag größer 0 eingeben.', { variant: 'warning' });
- return;
- }
-
- this.setState({ saving: true });
- try {
- await paymentApi.create(orderId, {
- accountId: Number(accountId),
- type,
- amount: numAmount,
- });
- enqueueSnackbar('Zahlungseingang erfolgreich verbucht!', { variant: 'success' });
- await orderAutomat.actions.reload();
- onSuccess?.();
- onClose();
- } catch (err) {
- notifyError(err);
- this.setState({ saving: false });
- }
- }
-
- render() {
- const { open, onClose, orders, partiesById } = this.props;
- const { orderId, accountId, type, amount, saving } = this.state;
- const accounts = accountAutomat.state.items || [];
-
- return (
-
-
-
-
-
-
- Zahlungseingang erfassen
-
-
-
-
-
-
-
-
- this.handleOrderChange(e.target.value)}
- fullWidth
- >
- {orders.map((o) => {
- const party = partiesById[o.entityId];
- const partyName = partyDisplayName('order', party) || `Kunde #${o.entityId}`;
- const tot = Number(o.orderTotal) || 0;
- const pd = Number(o.paidTotal) || 0;
- const rem = Math.max(0, tot - pd);
- return (
-
- );
- })}
-
-
- this.setState({ accountId: e.target.value })}
- >
- {accounts.length > 0 ? (
- accounts.map((acc) => (
-
- ))
- ) : (
-
- )}
-
-
- this.setState({ type: e.target.value })}
- >
- {PAYMENT_TYPES.map((pt) => (
-
- ))}
-
-
- this.setState({ amount: e.target.value })}
- slotProps={{ htmlInput: { min: 0.01, step: 'any' } }}
- />
-
-
-
-
- }>
- {saving ? 'Wird verbucht…' : 'Zahlung buchen'}
-
-
-
-
- );
- }
-}
-
// MARK:
export class OrderPaymentList extends PureComponent {
constructor(props) {
@@ -348,7 +170,6 @@ export class OrderPaymentList extends PureComponent {
partiesById: {},
accountsById: {},
busyId: null,
- recordDialogOpen: false,
};
this._cancelled = false;
this.handleRetry = this.handleRetry.bind(this);
@@ -461,7 +282,7 @@ export class OrderPaymentList extends PureComponent {
}
render() {
- const { status, error, filter, partiesById, accountsById, busyId, recordDialogOpen, items } = this.state;
+ const { status, error, filter, partiesById, accountsById, busyId } = this.state;
if (status === 'loading' || status === 'idle') {
return (
@@ -526,15 +347,6 @@ export class OrderPaymentList extends PureComponent {
{allPayments.length}
-
- }
- onClick={() => this.setState({ recordDialogOpen: true })}
- sx={{ height: 40 }}
- >
- Zahlungseingang erfassen
-
{/* Search Bar */}
@@ -594,15 +406,6 @@ export class OrderPaymentList extends PureComponent {
/>
-
- {recordDialogOpen && (
- this.setState({ recordDialogOpen: false })}
- />
- )}
>
);
}
diff --git a/src/nav.js b/src/nav.js
index cec838f..f6285f8 100644
--- a/src/nav.js
+++ b/src/nav.js
@@ -226,7 +226,7 @@ export const SUB_NAV = {
label: 'Zahlungen',
title: 'Zahlungen',
icon: PaymentsIcon,
- help: 'Zahlungseingänge erfassen und Auftragszahlungen überwachen',
+ help: 'Auftragszahlungen und Zahlungsjournal überwachen',
},
{
segment: 'versandarten',