u
This commit is contained in:
@@ -22,6 +22,7 @@ import Inventory2OutlinedIcon from '@mui/icons-material/Inventory2Outlined';
|
||||
import LinkIcon from '@mui/icons-material/Link';
|
||||
import { StorageManagerContext } from '../../api/storageManagerContext';
|
||||
import ArticlePhoto from '../article/ArticlePhoto';
|
||||
import { BrandLabel } from '../brand';
|
||||
|
||||
export default class ArticleSearchDialog extends PureComponent {
|
||||
static contextType = StorageManagerContext;
|
||||
@@ -291,15 +292,28 @@ export default class ArticleSearchDialog extends PureComponent {
|
||||
</Box>
|
||||
}
|
||||
secondary={
|
||||
primaryEan ? (
|
||||
<Typography
|
||||
variant="caption"
|
||||
color="text.secondary"
|
||||
sx={{ fontFamily: 'monospace', fontSize: '0.7rem' }}
|
||||
>
|
||||
EAN: {primaryEan}
|
||||
</Typography>
|
||||
) : null
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mt: 0.25 }}>
|
||||
{(article.brand?.name || article.brandName) && (
|
||||
<BrandLabel
|
||||
brand={article.brand || { name: article.brandName, thumbHash: article.brandThumbHash }}
|
||||
name={article.brand?.name || article.brandName}
|
||||
size={14}
|
||||
typographyProps={{
|
||||
variant: 'caption',
|
||||
color: 'text.secondary',
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{primaryEan ? (
|
||||
<Typography
|
||||
variant="caption"
|
||||
color="text.secondary"
|
||||
sx={{ fontFamily: 'monospace', fontSize: '0.7rem' }}
|
||||
>
|
||||
EAN: {primaryEan}
|
||||
</Typography>
|
||||
) : null}
|
||||
</Box>
|
||||
}
|
||||
/>
|
||||
<Button
|
||||
|
||||
@@ -23,6 +23,7 @@ import { formatPrice } from '../../utils/price';
|
||||
import { primaryPrice, priceBrutto } from '../../utils/articleDetail';
|
||||
import artikelAutomat, { createArticleSelector, getArticle } from '../../automats/artikelAutomat';
|
||||
import { artikelDetailPath } from '../../pages/artikel/articleRoute';
|
||||
import { BrandLabel } from '../brand';
|
||||
|
||||
class ManifestFormLine extends PureComponent {
|
||||
constructor(props) {
|
||||
@@ -367,6 +368,19 @@ class ManifestFormLine extends PureComponent {
|
||||
/>
|
||||
)}
|
||||
|
||||
{/* Brand */}
|
||||
{(fullArticle.brand?.name || article.brand?.name) && (
|
||||
<BrandLabel
|
||||
brand={fullArticle.brand || article.brand}
|
||||
size={16}
|
||||
typographyProps={{
|
||||
variant: 'caption',
|
||||
color: 'text.secondary',
|
||||
fontWeight: 500,
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
|
||||
{/* Article Name */}
|
||||
{(fullArticle.name || article.name) && (
|
||||
<Typography
|
||||
|
||||
Reference in New Issue
Block a user