djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove warehouse selection for preorder cases on fulfill page (#2515)

Browse source
This commit is contained in:
Michał Droń 2022-11-25 14:59:11 +01:00 committed by GitHub
parent 7933ecf482
commit 4f78d00534
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/orders/components/OrderFulfillLine/OrderFulfillLine.tsx
View file

@ -164,22 +164,26 @@ export const OrderFulfillLine: React.FC<OrderFulfillLineProps> = props => {
: "-"} : "-"}
</TableCell> </TableCell>
<TableCell className={classes.colWarehouse}> <TableCell className={classes.colWarehouse}>
<IconButton {isPreorder ? (
onClick={onWarehouseChange} "-"
className={classNames( ) : (
classes.warehouseButton, <IconButton
"MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-adornedEnd MuiOutlinedInput-adornedEnd", onClick={onWarehouseChange}
)} className={classNames(
data-test-id="select-warehouse-button" classes.warehouseButton,
> "MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-adornedEnd MuiOutlinedInput-adornedEnd",
<div className={classes.warehouseButtonContent}> )}
<Typography className={classes.warehouseButtonContentText}> data-test-id="select-warehouse-button"
{lineFormWarehouse?.name ?? >
intl.formatMessage(messages.selectWarehouse)} <div className={classes.warehouseButtonContent}>
</Typography> <Typography className={classes.warehouseButtonContentText}>
<ChevronIcon /> {lineFormWarehouse?.name ??
</div> intl.formatMessage(messages.selectWarehouse)}
</IconButton> </Typography>
<ChevronIcon />
</div>
</IconButton>
)}
</TableCell> </TableCell>
</TableRowLink> </TableRowLink>
); );

6
src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx
View file

@ -163,9 +163,9 @@ const OrderFulfillPage: React.FC<OrderFulfillPageProps> = props => {
!shopSettings?.fulfillmentAllowUnpaid && !shopSettings?.fulfillmentAllowUnpaid &&
!order?.isPaid; !order?.isPaid;
const areWarehousesSet = formsetData.every(line => const areWarehousesSet = formsetData
line.value.every(v => v.warehouse), .filter(item => !!item?.value) // preorder case
); .every(line => line.value.every(v => v.warehouse));
const shouldEnableSave = () => { const shouldEnableSave = () => {
if (!order || loading) { if (!order || loading) {