Skip to content
This repository has been archived by the owner on Nov 12, 2024. It is now read-only.

Dev #117

Merged
merged 2 commits into from
Oct 17, 2023
Merged

Dev #117

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
"source": "/3170631789/invoices/:invoiceId",
"destination": "https://hummingbird-hammocks.myshopify.com/3170631789/invoices/:invoiceId",
"type": 307
},
{
"source": "/account/orders/:orderId/return_labels/:labelId/print",
"destination": "https://hummingbird-hammocks.myshopify.com/account/orders/:orderId/return_labels/:labelId/print",
"type": 307
}
],
"rewrites": [
Expand Down Expand Up @@ -122,6 +127,11 @@
"source": "/3170631789/invoices/:invoiceId",
"destination": "https://hummingbird-hammocks.myshopify.com/3170631789/invoices/:invoiceId",
"type": 307
},
{
"source": "/account/orders/:orderId/return_labels/:labelId/print",
"destination": "https://hummingbird-hammocks.myshopify.com/account/orders/:orderId/return_labels/:labelId/print",
"type": 307
}
],
"rewrites": [
Expand Down Expand Up @@ -164,6 +174,11 @@
"source": "/3170631789/invoices/:invoiceId",
"destination": "https://hummingbird-hammocks.myshopify.com/3170631789/invoices/:invoiceId",
"type": 307
},
{
"source": "/account/orders/:orderId/return_labels/:labelId/print",
"destination": "https://hummingbird-hammocks.myshopify.com/account/orders/:orderId/return_labels/:labelId/print",
"type": 307
}
],
"rewrites": [
Expand Down
2 changes: 1 addition & 1 deletion src/sections/Returns/ReturnReviewSubmit.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { fShopify, fulfillmentStatusChipColor } from '../../utils';

export function ReturnReviewSubmit({ selectedOrder, selectedItems, handleOpenTicketDialog }) {
return (
<Box padding="30px" justifyContent="center" display="flex">
<Box paddingTop="30px" paddingBottom="30px" justifyContent="center" display="flex">
<Grid container spacing={2}>
<Grid
item
Expand Down
6 changes: 3 additions & 3 deletions src/sections/Returns/ReturnsItemSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export function ReturnsItemSelector({
}

return (
<Box padding="30px" justifyContent="center" display="flex">
<Box paddingTop="30px" paddingBottom="30px" justifyContent="center" display="flex">
<Grid container spacing={2}>
<Grid
item
Expand Down Expand Up @@ -158,15 +158,15 @@ export function ReturnsItemSelector({
: 'none'
}}>
<Grid container>
<Grid item xs={2}>
<Grid item xs={12} sm={4}>
<img
src={item.node.fulfillmentLineItem.lineItem.image.url}
alt={item.node.fulfillmentLineItem.lineItem.image.altText}
height={'80px'}
width={'80px'}
/>
</Grid>
<Grid item xs={10}>
<Grid item xs={12} sm={8}>
<Stack
direction="row"
justifyContent="space-between"
Expand Down
4 changes: 2 additions & 2 deletions src/sections/Returns/ReturnsOrderLookup.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export function ReturnsOrderLookup({
}, [paramsOrderName, orders]);

return (
<Box padding="30px" justifyContent="center" display="flex">
<Box paddingTop="30px" paddingBottom="30px" justifyContent="center" display="flex">
<Grid container spacing={2}>
<Grid
item
Expand Down Expand Up @@ -215,7 +215,7 @@ export function ReturnsOrderLookup({
</Stack>
<Divider />
<Stack
direction="row"
direction={{ xs: 'column', sm: 'row', md: 'row', lg: 'row' }}
justifyContent="space-between"
spacing={2}
sx={{ marginTop: 2 }}>
Expand Down
Loading