seb/dashfront
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

u

Browse Source
This commit is contained in:
seb
2026-10-17 04:11:42 +02:00
parent 6df833b362
commit bd16df64a1
3 changed files with 44 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/components/manifest/ManifestFormLine.jsx
View File

@@ -584,12 +584,28 @@ class ManifestFormLine extends PureComponent {
const primaryEan = Array.isArray(eans) ? eans[0] : eans;
const vkPrice = primaryPrice(cachedArticle);
const vkNetto = vkPrice?.net;
const vkNetto =
vkPrice?.net != null
? Number(vkPrice.net)
: cachedArticle.net != null
? Number(cachedArticle.net)
: cachedArticle.price != null
? Number(cachedArticle.price)
: null;
const vkTaxRate =
vkPrice?.taxRate ??
vkPrice?.taxrate ??
cachedArticle.taxrate ??
cachedArticle.taxRate ??
selectCompanyTaxrate() ??
19;
const vkBrutto = vkPrice
? priceBrutto(vkPrice) ??
(vkPrice.net != null && vkPrice.taxrate != null
? vkPrice.net * (1 + vkPrice.taxrate / 100)
: null)
(vkNetto != null && vkTaxRate != null
? Math.round((vkNetto * (1 + Number(vkTaxRate) / 100) + Number.EPSILON) * 100) / 100
: null)
: vkNetto != null
? Math.round((vkNetto * (1 + Number(vkTaxRate) / 100) + Number.EPSILON) * 100) / 100
: null;
const suppliers =
@@ -625,7 +641,7 @@ class ManifestFormLine extends PureComponent {
: null;
const hasPriceInfo =
vkNetto != null || vkBrutto != null || ekNetto != null || ekBrutto != null || kind === 'quote';
vkNetto != null || vkBrutto != null || ekNetto != null || ekBrutto != null || kind === 'quote' || kind === 'order';
return (
<Box
@@ -733,7 +749,7 @@ class ManifestFormLine extends PureComponent {
)}
{/* EK Netto, EK Brutto, VK Netto, VK Brutto */}
{!isOrder && hasPriceInfo && (
{hasPriceInfo && (
<Box
sx={{
display: 'flex',
@@ -784,26 +800,28 @@ class ManifestFormLine extends PureComponent {
</Tooltip>
{/* VK Netto */}
{vkNetto != null && (
<Typography
variant="caption"
fontWeight={600}
sx={{ color: 'text.secondary', fontSize: '0.72rem' }}
>
VK Netto: {formatPrice(vkNetto)}
</Typography>
)}
<Typography
variant="caption"
fontWeight={600}
sx={{
color: vkNetto != null ? 'text.secondary' : 'text.disabled',
fontSize: '0.72rem',
}}
>
VK Netto: {vkNetto != null ? formatPrice(vkNetto) : '—'}
</Typography>
{/* VK Brutto */}
{vkBrutto != null && (
<Typography
variant="caption"
fontWeight={600}
sx={{ color: 'primary.dark', fontSize: '0.72rem' }}
>
VK Brutto: {formatPrice(vkBrutto)}
</Typography>
)}
<Typography
variant="caption"
fontWeight={600}
sx={{
color: vkBrutto != null ? 'primary.dark' : 'text.disabled',
fontSize: '0.72rem',
}}
>
VK Brutto: {vkBrutto != null ? formatPrice(vkBrutto) : '—'}
</Typography>
</Box>
)}
</Box>

25
src/components/manifest/ManifestHeader.jsx
View File

@@ -9,7 +9,6 @@ import Chip from '@mui/material/Chip';
import UploadFileIcon from '@mui/icons-material/UploadFile';
import PictureAsPdfIcon from '@mui/icons-material/PictureAsPdf';
import ShoppingCartIcon from '@mui/icons-material/ShoppingCart';
import LocalShippingOutlinedIcon from '@mui/icons-material/LocalShippingOutlined';
import Inventory2OutlinedIcon from '@mui/icons-material/Inventory2Outlined';
import CheckCircleOutlineOutlinedIcon from '@mui/icons-material/CheckCircleOutlineOutlined';
import SingleLineTextEdit from 'dashgui/SingleLineTextEdit';
@@ -251,8 +250,6 @@ class ManifestHeader extends PureComponent {
onRestore,
orderCreating,
onCreateOrder,
onOpenCreateShipment,
deliverDisabled,
actionsColor,
partyError,
docId,
@@ -570,28 +567,6 @@ class ManifestHeader extends PureComponent {
{orderCreating ? 'Wird erstellt…' : 'Bestellung erstellen'}
</Button>
)}
{kind === 'order' && docId != null && onOpenCreateShipment && (
<Button
type="button"
variant="outlined"
color="primary"
startIcon={<LocalShippingOutlinedIcon />}
disabled={saving || pdfCreating || orderCreating || deliverDisabled}
onClick={onOpenCreateShipment}
title={deliverDisabled ? 'Alle Positionen bereits ausgeliefert' : 'Lieferschein erstellen'}
sx={{
whiteSpace: 'nowrap',
height: 40,
width: '100%',
px: 1.5,
boxSizing: 'border-box',
fontWeight: 600,
fontSize: '0.875rem',
}}
>
Liefern
</Button>
)}
{(kind === 'quote' || kind === 'order') && onPdfCreate && docId != null && Boolean(number) && (
<Button
type="button"

43
src/components/manifest/OrderDocumentsTiles.jsx
View File

@@ -156,31 +156,7 @@ export class OrderDocumentsTiles extends PureComponent {
);
})}
</Stack>
) : (
<Box
sx={{
p: 1.5,
textAlign: 'center',
bgcolor: 'rgba(255,255,255,0.6)',
borderRadius: 1,
border: '1px dashed',
borderColor: 'divider',
}}
>
<Typography variant="caption" color="text.secondary" sx={{ display: 'block', mb: 1 }}>
Noch keine Lieferscheine erstellt.
</Typography>
<Button
size="small"
variant="contained"
startIcon={<LocalShippingOutlinedIcon />}
onClick={this.props.onOpenCreateShipment || (() => navigate?.('/auftrag/ausliefern'))}
sx={{ textTransform: 'none', fontWeight: 600, fontSize: '0.75rem' }}
>
Lieferschein anlegen
</Button>
</Box>
)}
) : null}
</PanelTile>
);
}
@@ -298,22 +274,7 @@ export class OrderDocumentsTiles extends PureComponent {
);
})}
</Stack>
) : (
<Box
sx={{
p: 1.5,
textAlign: 'center',
bgcolor: 'rgba(255,255,255,0.6)',
borderRadius: 1,
border: '1px dashed',
borderColor: 'divider',
}}
>
<Typography variant="caption" color="text.secondary">
Noch keine Zahlungen erfasst.
</Typography>
</Box>
)}
) : null}
</PanelTile>
);
}