diff --git a/src/components/article/boxes/ArticleViewPrice.jsx b/src/components/article/boxes/ArticleViewPrice.jsx index 3a31fff..7504a07 100644 --- a/src/components/article/boxes/ArticleViewPrice.jsx +++ b/src/components/article/boxes/ArticleViewPrice.jsx @@ -228,11 +228,13 @@ class PriceOverlay extends Component { unitOptions, articleUnitSi, onOpenEditor, + onOpenTiers, } = this.props; if (!editing || draft == null) return null; return ( { if (hasUnit) { const unitamount = draft.unitamount || '1'; @@ -557,7 +559,6 @@ export default class ArticleViewPrice extends PureComponent { : undefined } readOnly={!editing} - onOpenTiers={this.openTiersDialog} /> )} @@ -575,6 +576,7 @@ export default class ArticleViewPrice extends PureComponent { unitOptions={unitOptions} articleUnitSi={articleData.unit?.si} onOpenEditor={this.openUnitEditor} + onOpenTiers={this.openTiersDialog} /> )} display={ diff --git a/src/components/article/boxes/PriceTaxRow.jsx b/src/components/article/boxes/PriceTaxRow.jsx index 0a287c6..341c5d3 100644 --- a/src/components/article/boxes/PriceTaxRow.jsx +++ b/src/components/article/boxes/PriceTaxRow.jsx @@ -1,8 +1,6 @@ import { Component } from 'react'; import Box from '@mui/material/Box'; import Chip from '@mui/material/Chip'; -import IconButton from '@mui/material/IconButton'; -import LayersOutlinedIcon from '@mui/icons-material/LayersOutlined'; import { TINT_CHIP, TINT_PILL_ACTIVE, @@ -50,7 +48,7 @@ export class TaxRatePills extends Component { export class PriceTaxRow extends Component { render() { - const { rates, selected, onSelectTax, readOnly, onOpenTiers } = this.props; + const { rates, selected, onSelectTax, readOnly } = this.props; return ( - - - ); } diff --git a/src/components/article/boxes/PriceUnitRow.jsx b/src/components/article/boxes/PriceUnitRow.jsx index 72ed9da..8c7fd74 100644 --- a/src/components/article/boxes/PriceUnitRow.jsx +++ b/src/components/article/boxes/PriceUnitRow.jsx @@ -6,6 +6,7 @@ import IconButton from '@mui/material/IconButton'; import InputLabel from '@mui/material/InputLabel'; import MenuItem from '@mui/material/MenuItem'; import Select from '@mui/material/Select'; +import LayersOutlinedIcon from '@mui/icons-material/LayersOutlined'; import StraightenOutlinedIcon from '@mui/icons-material/StraightenOutlined'; import Switch from '@mui/material/Switch'; import TextInput from '../../TextInput'; @@ -16,12 +17,12 @@ import { const priceUnitCornerSx = { position: 'absolute', - top: 72, + bottom: 8, right: 4, display: 'flex', flexDirection: 'column', alignItems: 'center', - gap: 1.25, + gap: 0.25, zIndex: 2, }; @@ -119,9 +120,18 @@ export class PriceUnitRow extends Component { export class PriceUnitCorner extends Component { render() { - const { hasUnit, onToggleHasUnit, onOpenEditor } = this.props; + const { hasUnit, onToggleHasUnit, onOpenEditor, onOpenTiers } = this.props; return ( + + +