diff --git a/src/components/manifest/ManifestFormLine.jsx b/src/components/manifest/ManifestFormLine.jsx index ae9e19a..02fc1f8 100644 --- a/src/components/manifest/ManifestFormLine.jsx +++ b/src/components/manifest/ManifestFormLine.jsx @@ -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 ( {/* VK Netto */} - {vkNetto != null && ( - - VK Netto: {formatPrice(vkNetto)} - - )} + + VK Netto: {vkNetto != null ? formatPrice(vkNetto) : '—'} + {/* VK Brutto */} - {vkBrutto != null && ( - - VK Brutto: {formatPrice(vkBrutto)} - - )} + + VK Brutto: {vkBrutto != null ? formatPrice(vkBrutto) : '—'} + )} diff --git a/src/components/manifest/ManifestHeader.jsx b/src/components/manifest/ManifestHeader.jsx index c3c74e6..0870282 100644 --- a/src/components/manifest/ManifestHeader.jsx +++ b/src/components/manifest/ManifestHeader.jsx @@ -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'} )} - {kind === 'order' && docId != null && onOpenCreateShipment && ( - - )} {(kind === 'quote' || kind === 'order') && onPdfCreate && docId != null && Boolean(number) && ( - - )} + ) : null} ); } @@ -298,22 +274,7 @@ export class OrderDocumentsTiles extends PureComponent { ); })} - ) : ( - - - Noch keine Zahlungen erfasst. - - - )} + ) : null} ); }