u
This commit is contained in:
@@ -4,7 +4,7 @@ import CircularProgress from '@mui/material/CircularProgress';
|
||||
import { enqueueSnackbar } from 'notistack';
|
||||
import BackendError from '../BackendError';
|
||||
import { PanelTileGrid } from 'dashgui/panels';
|
||||
import { delivery as deliveryApi, quote as quoteApi } from '../../api';
|
||||
import { delivery as deliveryApi, quote as quoteApi, order as orderApi, shipment as shipmentApi, payment as paymentApi } from '../../api';
|
||||
import { requireArray, requireDefined, requireObject } from '../../utils/apiShape';
|
||||
import { backendErrorFrom } from '../../utils/backendError';
|
||||
import { notifyError } from '../../utils/notify';
|
||||
@@ -13,6 +13,7 @@ import ManifestHeader from './ManifestHeader';
|
||||
import ManifestLines from './ManifestLines';
|
||||
import ManifestPdfDialog from './ManifestPdfDialog';
|
||||
import ArticleSearchDialog from './ArticleSearchDialog';
|
||||
import OrderDocumentsTiles from './OrderDocumentsTiles';
|
||||
import artikelAutomat, { getArticle } from '../../automats/artikelAutomat';
|
||||
import entityAutomat from '../../automats/entityAutomat';
|
||||
import supplierAutomat from '../../automats/supplierAutomat';
|
||||
@@ -80,6 +81,14 @@ class ManifestForm extends PureComponent {
|
||||
externalNumber: initialDoc?.externalNumber || '',
|
||||
lines: initialDoc?.lines?.length > 0 ? initialDoc.lines : [emptyLine()],
|
||||
attachments: initialDoc?.attachments || [],
|
||||
shipments: initialEdit?.shipments || [],
|
||||
payments: initialEdit?.payments || [],
|
||||
shippings: initialEdit?.shippings || [],
|
||||
orderTotal: initialEdit?.orderTotal ?? null,
|
||||
paidTotal: initialEdit?.paidTotal ?? null,
|
||||
paid: Boolean(initialEdit?.paid),
|
||||
shipped: Boolean(initialEdit?.shipped),
|
||||
delivered: Boolean(initialEdit?.delivered),
|
||||
isDirty: Boolean(initialEdit?.isDirty),
|
||||
dirtyFields: initialEdit?.dirtyFields || null,
|
||||
dirtyLineKeys: initialEdit?.dirtyLineKeys || [],
|
||||
@@ -188,6 +197,14 @@ class ManifestForm extends PureComponent {
|
||||
externalNumber: state.externalNumber || '',
|
||||
lines: state.lines?.length > 0 ? state.lines : [emptyLine()],
|
||||
attachments: state.attachments || [],
|
||||
shipments: state.shipments || [],
|
||||
payments: state.payments || [],
|
||||
shippings: state.shippings || [],
|
||||
orderTotal: state.orderTotal ?? null,
|
||||
paidTotal: state.paidTotal ?? null,
|
||||
paid: Boolean(state.paid),
|
||||
shipped: Boolean(state.shipped),
|
||||
delivered: Boolean(state.delivered),
|
||||
isDirty: Boolean(state.isDirty),
|
||||
dirtyFields: state.dirtyFields,
|
||||
dirtyLineKeys: state.dirtyLineKeys,
|
||||
@@ -347,6 +364,27 @@ class ManifestForm extends PureComponent {
|
||||
const apiFiles = doc.files ?? [];
|
||||
const attachments = await restoreAttachmentsFromApi(apiFiles);
|
||||
|
||||
let shipments = doc.shipments;
|
||||
let payments = doc.payments;
|
||||
if (kind === 'order') {
|
||||
if (!shipments) {
|
||||
try {
|
||||
const shRes = await shipmentApi.listByOrder(docId);
|
||||
shipments = shRes?.shipments ?? [];
|
||||
} catch {
|
||||
shipments = [];
|
||||
}
|
||||
}
|
||||
if (!payments) {
|
||||
try {
|
||||
const payRes = await paymentApi.listByOrder(docId);
|
||||
payments = payRes?.payments ?? [];
|
||||
} catch {
|
||||
payments = [];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const loadedDoc = {
|
||||
date: dateInputValue(doc.date),
|
||||
partyId: doc[cfg.partyField],
|
||||
@@ -355,6 +393,14 @@ class ManifestForm extends PureComponent {
|
||||
doc.externalNumber != null ? String(doc.externalNumber) : '',
|
||||
lines,
|
||||
attachments,
|
||||
shipments: shipments || [],
|
||||
payments: payments || [],
|
||||
shippings: doc.shippings || [],
|
||||
orderTotal: doc.orderTotal ?? null,
|
||||
paidTotal: doc.paidTotal ?? null,
|
||||
paid: Boolean(doc.paid),
|
||||
shipped: Boolean(doc.shipped),
|
||||
delivered: Boolean(doc.delivered),
|
||||
};
|
||||
|
||||
if (this.editAutomat) {
|
||||
@@ -861,19 +907,21 @@ class ManifestForm extends PureComponent {
|
||||
async handleCreatePdf(e) {
|
||||
e?.preventDefault?.();
|
||||
e?.stopPropagation?.();
|
||||
const { docId } = this.props;
|
||||
const { docId, kind } = this.props;
|
||||
if (this.state.pdfCreating || this.state.saving) return;
|
||||
if (docId == null) return;
|
||||
|
||||
this.setState({ pdfCreating: true });
|
||||
try {
|
||||
const res = await quoteApi.createPdf(docId);
|
||||
requireObject(res, 'POST /api/quote/:id/pdf');
|
||||
const api = kind === 'order' ? orderApi : quoteApi;
|
||||
const res = await api.createPdf(docId);
|
||||
requireObject(res, `POST /api/${kind}/:id/pdf`);
|
||||
|
||||
const quoteRes = await quoteApi.get(docId);
|
||||
if (quoteRes?.quote?.files && !this._cancelled) {
|
||||
const getRes = await api.get(docId);
|
||||
const doc = getRes?.[kind];
|
||||
if (doc?.files && !this._cancelled) {
|
||||
const attachments = await restoreAttachmentsFromApi(
|
||||
quoteRes.quote.files,
|
||||
doc.files,
|
||||
this.state.attachments,
|
||||
);
|
||||
this.setState({ attachments });
|
||||
@@ -882,7 +930,10 @@ class ManifestForm extends PureComponent {
|
||||
}
|
||||
}
|
||||
|
||||
enqueueSnackbar('Angebot-PDF erfolgreich erstellt.', { variant: 'success' });
|
||||
enqueueSnackbar(
|
||||
kind === 'order' ? 'Auftrag-PDF erfolgreich erstellt.' : 'Angebot-PDF erfolgreich erstellt.',
|
||||
{ variant: 'success' },
|
||||
);
|
||||
} catch (err) {
|
||||
if (!this._cancelled) {
|
||||
notifyError(err);
|
||||
@@ -1091,7 +1142,7 @@ class ManifestForm extends PureComponent {
|
||||
onRestore={this.props.mode === 'edit' && this.state.isDirty ? this.handleRestore : undefined}
|
||||
onPdfUpload={kind === 'delivery' ? this.handlePdfUpload : undefined}
|
||||
onPdfDelete={this.handleAttachmentDelete}
|
||||
onPdfCreate={kind === 'quote' ? this.handleCreatePdf : undefined}
|
||||
onPdfCreate={kind === 'quote' || kind === 'order' ? this.handleCreatePdf : undefined}
|
||||
onSave={this.handleSave}
|
||||
onPartyChange={this.handlePartyChange}
|
||||
onDateChange={this.handleDateChange}
|
||||
@@ -1099,6 +1150,25 @@ class ManifestForm extends PureComponent {
|
||||
onExternalNumberChange={this.handleExternalNumberChange}
|
||||
/>
|
||||
{status === 'ready' ? this.renderArticles() : null}
|
||||
{status === 'ready' && kind === 'order' && this.props.mode === 'edit' ? (
|
||||
<OrderDocumentsTiles
|
||||
orderId={this.props.docId}
|
||||
orderNumber={number}
|
||||
externalNumber={externalNumber}
|
||||
orderTotal={this.state.orderTotal}
|
||||
paidTotal={this.state.paidTotal}
|
||||
paid={this.state.paid}
|
||||
shipped={this.state.shipped}
|
||||
delivered={this.state.delivered}
|
||||
shipments={this.state.shipments}
|
||||
payments={this.state.payments}
|
||||
attachments={this.state.attachments}
|
||||
onPdfCreate={this.handleCreatePdf}
|
||||
pdfCreating={this.state.pdfCreating}
|
||||
onAttachmentDelete={this.handleAttachmentDelete}
|
||||
navigate={this.props.navigate}
|
||||
/>
|
||||
) : null}
|
||||
</PanelTileGrid>
|
||||
<ManifestPdfDialog
|
||||
open={pdfDialogOpen}
|
||||
|
||||
Reference in New Issue
Block a user