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

CR changes, switch net to gross prices

Browse source
This commit is contained in:
Tomasz Szymanski 2021-02-05 13:46:15 +01:00
parent cfb5bb5168
commit 2c2d07be0c
2 changed files with 237 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx
View file

@ -181,18 +181,18 @@ const OrderDraftDetailsProducts: React.FC<OrderDraftDetailsProductsProps> = prop
)}
</TableCell>
<TableCell className={classes.colPrice}>
{maybe(() => line.unitPrice.net) ? (
<Money money={line.unitPrice.net} />
{maybe(() => line.unitPrice.gross) ? (
<Money money={line.unitPrice.gross} />
) : (
<Skeleton />
)}
</TableCell>
<TableCell className={classes.colTotal}>
{maybe(() => line.unitPrice.net && line.quantity) ? (
{maybe(() => line.unitPrice.gross && line.quantity) ? (
<Money
money={{
amount: line.unitPrice.net.amount * line.quantity,
currency: line.unitPrice.net.currency
amount: line.unitPrice.gross.amount * line.quantity,
currency: line.unitPrice.gross.currency
}}
/>
) : (

18
src/orders/views/OrderDetails/index.tsx
View file

@ -126,6 +126,9 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
return <NotFoundPage onBack={handleBack} />;
}
const isOrderUnconfirmed = order?.status === OrderStatus.UNCONFIRMED;
const isOrderDraft = order?.status === OrderStatus.DRAFT;
const handleSubmit = async (data: MetadataFormData) => {
if (order?.status === OrderStatus.UNCONFIRMED) {
await orderConfirm({ variables: { id: order?.id } });
@ -212,8 +215,7 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
orderInvoiceSend
}) => (
<>
{order?.status !== OrderStatus.DRAFT &&
order?.status !== OrderStatus.UNCONFIRMED && (
{!isOrderDraft && !isOrderUnconfirmed && (
<>
<WindowTitle
title={intl.formatMessage(
@ -284,8 +286,7 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
onPaymentCapture={() => openModal("capture")}
onPaymentVoid={() => openModal("void")}
onPaymentRefund={() => navigate(orderRefundUrl(id))}
onProductClick={id => () =>
navigate(productUrl(id))}
onProductClick={id => () => navigate(productUrl(id))}
onBillingAddressEdit={() =>
openModal("edit-billing-address")
}
@ -298,9 +299,8 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
}
onInvoiceClick={id =>
window.open(
order.invoices.find(
invoice => invoice.id === id
)?.url,
order.invoices.find(invoice => invoice.id === id)
?.url,
"_blank"
)
}
@ -447,7 +447,7 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
/>
</>
)}
{order?.status === OrderStatus.DRAFT && (
{isOrderDraft && (
<>
<WindowTitle
title={intl.formatMessage(
@ -590,7 +590,7 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
/>
</>
)}
{order?.status === OrderStatus.UNCONFIRMED && (
{isOrderUnconfirmed && (
<>
<WindowTitle
title={intl.formatMessage(