CR changes, switch net to gross prices
This commit is contained in:
Tomasz Szymanski
parent
cfb5bb5168
commit
2c2d07be0c
2 changed files with 237 additions and 237 deletions
|
|
@ -181,18 +181,18 @@ const OrderDraftDetailsProducts: React.FC<OrderDraftDetailsProductsProps> = prop
|
||||||
)}
|
)}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell className={classes.colPrice}>
|
<TableCell className={classes.colPrice}>
|
||||||
{maybe(() => line.unitPrice.net) ? (
|
{maybe(() => line.unitPrice.gross) ? (
|
||||||
<Money money={line.unitPrice.net} />
|
<Money money={line.unitPrice.gross} />
|
||||||
) : (
|
) : (
|
||||||
<Skeleton />
|
<Skeleton />
|
||||||
)}
|
)}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell className={classes.colTotal}>
|
<TableCell className={classes.colTotal}>
|
||||||
{maybe(() => line.unitPrice.net && line.quantity) ? (
|
{maybe(() => line.unitPrice.gross && line.quantity) ? (
|
||||||
<Money
|
<Money
|
||||||
money={{
|
money={{
|
||||||
amount: line.unitPrice.net.amount * line.quantity,
|
amount: line.unitPrice.gross.amount * line.quantity,
|
||||||
currency: line.unitPrice.net.currency
|
currency: line.unitPrice.gross.currency
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
|
|
|
||||||
|
|
@ -126,6 +126,9 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
|
||||||
return <NotFoundPage onBack={handleBack} />;
|
return <NotFoundPage onBack={handleBack} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isOrderUnconfirmed = order?.status === OrderStatus.UNCONFIRMED;
|
||||||
|
const isOrderDraft = order?.status === OrderStatus.DRAFT;
|
||||||
|
|
||||||
const handleSubmit = async (data: MetadataFormData) => {
|
const handleSubmit = async (data: MetadataFormData) => {
|
||||||
if (order?.status === OrderStatus.UNCONFIRMED) {
|
if (order?.status === OrderStatus.UNCONFIRMED) {
|
||||||
await orderConfirm({ variables: { id: order?.id } });
|
await orderConfirm({ variables: { id: order?.id } });
|
||||||
|
|
@ -212,242 +215,239 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
|
||||||
orderInvoiceSend
|
orderInvoiceSend
|
||||||
}) => (
|
}) => (
|
||||||
<>
|
<>
|
||||||
{order?.status !== OrderStatus.DRAFT &&
|
{!isOrderDraft && !isOrderUnconfirmed && (
|
||||||
order?.status !== OrderStatus.UNCONFIRMED && (
|
<>
|
||||||
<>
|
<WindowTitle
|
||||||
<WindowTitle
|
title={intl.formatMessage(
|
||||||
title={intl.formatMessage(
|
{
|
||||||
{
|
defaultMessage: "Order #{orderNumber}",
|
||||||
defaultMessage: "Order #{orderNumber}",
|
description: "window title"
|
||||||
description: "window title"
|
},
|
||||||
},
|
{
|
||||||
{
|
orderNumber: getStringOrPlaceholder(
|
||||||
orderNumber: getStringOrPlaceholder(
|
data?.order?.number
|
||||||
data?.order?.number
|
|
||||||
)
|
|
||||||
}
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
<OrderDetailsPage
|
|
||||||
onOrderReturn={() => navigate(orderReturnPath(id))}
|
|
||||||
disabled={
|
|
||||||
updateMetadataOpts.loading ||
|
|
||||||
updatePrivateMetadataOpts.loading
|
|
||||||
}
|
|
||||||
onNoteAdd={variables =>
|
|
||||||
orderAddNote.mutate({
|
|
||||||
input: variables,
|
|
||||||
order: id
|
|
||||||
})
|
|
||||||
}
|
|
||||||
onBack={handleBack}
|
|
||||||
order={order}
|
|
||||||
saveButtonBarState={getMutationState(
|
|
||||||
updateMetadataOpts.called ||
|
|
||||||
updatePrivateMetadataOpts.called,
|
|
||||||
updateMetadataOpts.loading ||
|
|
||||||
updatePrivateMetadataOpts.loading,
|
|
||||||
[
|
|
||||||
...(updateMetadataOpts.data?.deleteMetadata
|
|
||||||
.errors || []),
|
|
||||||
...(updateMetadataOpts.data?.updateMetadata
|
|
||||||
.errors || []),
|
|
||||||
...(updatePrivateMetadataOpts.data
|
|
||||||
?.deletePrivateMetadata.errors || []),
|
|
||||||
...(updatePrivateMetadataOpts.data
|
|
||||||
?.updatePrivateMetadata.errors || [])
|
|
||||||
]
|
|
||||||
)}
|
|
||||||
shippingMethods={maybe(
|
|
||||||
() => data.order.availableShippingMethods,
|
|
||||||
[]
|
|
||||||
)}
|
|
||||||
userPermissions={user?.userPermissions || []}
|
|
||||||
onOrderCancel={() => openModal("cancel")}
|
|
||||||
onOrderFulfill={() => navigate(orderFulfillUrl(id))}
|
|
||||||
onFulfillmentCancel={fulfillmentId =>
|
|
||||||
navigate(
|
|
||||||
orderUrl(id, {
|
|
||||||
action: "cancel-fulfillment",
|
|
||||||
id: fulfillmentId
|
|
||||||
})
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
onFulfillmentTrackingNumberUpdate={fulfillmentId =>
|
)}
|
||||||
navigate(
|
/>
|
||||||
orderUrl(id, {
|
<OrderDetailsPage
|
||||||
action: "edit-fulfillment",
|
onOrderReturn={() => navigate(orderReturnPath(id))}
|
||||||
id: fulfillmentId
|
disabled={
|
||||||
})
|
updateMetadataOpts.loading ||
|
||||||
)
|
updatePrivateMetadataOpts.loading
|
||||||
}
|
}
|
||||||
onPaymentCapture={() => openModal("capture")}
|
onNoteAdd={variables =>
|
||||||
onPaymentVoid={() => openModal("void")}
|
orderAddNote.mutate({
|
||||||
onPaymentRefund={() => navigate(orderRefundUrl(id))}
|
input: variables,
|
||||||
onProductClick={id => () =>
|
order: id
|
||||||
navigate(productUrl(id))}
|
})
|
||||||
onBillingAddressEdit={() =>
|
}
|
||||||
openModal("edit-billing-address")
|
onBack={handleBack}
|
||||||
}
|
order={order}
|
||||||
onShippingAddressEdit={() =>
|
saveButtonBarState={getMutationState(
|
||||||
openModal("edit-shipping-address")
|
updateMetadataOpts.called ||
|
||||||
}
|
updatePrivateMetadataOpts.called,
|
||||||
onPaymentPaid={() => openModal("mark-paid")}
|
updateMetadataOpts.loading ||
|
||||||
onProfileView={() =>
|
updatePrivateMetadataOpts.loading,
|
||||||
navigate(customerUrl(order.user.id))
|
[
|
||||||
}
|
...(updateMetadataOpts.data?.deleteMetadata
|
||||||
onInvoiceClick={id =>
|
.errors || []),
|
||||||
window.open(
|
...(updateMetadataOpts.data?.updateMetadata
|
||||||
order.invoices.find(
|
.errors || []),
|
||||||
invoice => invoice.id === id
|
...(updatePrivateMetadataOpts.data
|
||||||
)?.url,
|
?.deletePrivateMetadata.errors || []),
|
||||||
"_blank"
|
...(updatePrivateMetadataOpts.data
|
||||||
)
|
?.updatePrivateMetadata.errors || [])
|
||||||
}
|
]
|
||||||
onInvoiceGenerate={() =>
|
)}
|
||||||
orderInvoiceRequest.mutate({
|
shippingMethods={maybe(
|
||||||
orderId: id
|
() => data.order.availableShippingMethods,
|
||||||
|
[]
|
||||||
|
)}
|
||||||
|
userPermissions={user?.userPermissions || []}
|
||||||
|
onOrderCancel={() => openModal("cancel")}
|
||||||
|
onOrderFulfill={() => navigate(orderFulfillUrl(id))}
|
||||||
|
onFulfillmentCancel={fulfillmentId =>
|
||||||
|
navigate(
|
||||||
|
orderUrl(id, {
|
||||||
|
action: "cancel-fulfillment",
|
||||||
|
id: fulfillmentId
|
||||||
})
|
})
|
||||||
}
|
)
|
||||||
onInvoiceSend={id =>
|
}
|
||||||
openModal("invoice-send", { id })
|
onFulfillmentTrackingNumberUpdate={fulfillmentId =>
|
||||||
}
|
navigate(
|
||||||
onSubmit={handleSubmit}
|
orderUrl(id, {
|
||||||
/>
|
action: "edit-fulfillment",
|
||||||
<OrderCannotCancelOrderDialog
|
id: fulfillmentId
|
||||||
onClose={closeModal}
|
|
||||||
open={
|
|
||||||
params.action === "cancel" &&
|
|
||||||
order?.fulfillments.some(
|
|
||||||
fulfillment =>
|
|
||||||
fulfillment.status ===
|
|
||||||
FulfillmentStatus.FULFILLED
|
|
||||||
)
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<OrderCancelDialog
|
|
||||||
confirmButtonState={orderCancel.opts.status}
|
|
||||||
errors={
|
|
||||||
orderCancel.opts.data?.orderCancel.errors || []
|
|
||||||
}
|
|
||||||
number={order?.number}
|
|
||||||
open={params.action === "cancel"}
|
|
||||||
onClose={closeModal}
|
|
||||||
onSubmit={() =>
|
|
||||||
orderCancel.mutate({
|
|
||||||
id
|
|
||||||
})
|
})
|
||||||
}
|
)
|
||||||
/>
|
}
|
||||||
<OrderMarkAsPaidDialog
|
onPaymentCapture={() => openModal("capture")}
|
||||||
confirmButtonState={
|
onPaymentVoid={() => openModal("void")}
|
||||||
orderPaymentMarkAsPaid.opts.status
|
onPaymentRefund={() => navigate(orderRefundUrl(id))}
|
||||||
}
|
onProductClick={id => () => navigate(productUrl(id))}
|
||||||
errors={
|
onBillingAddressEdit={() =>
|
||||||
orderPaymentMarkAsPaid.opts.data?.orderMarkAsPaid
|
openModal("edit-billing-address")
|
||||||
.errors || []
|
}
|
||||||
}
|
onShippingAddressEdit={() =>
|
||||||
onClose={closeModal}
|
openModal("edit-shipping-address")
|
||||||
onConfirm={() =>
|
}
|
||||||
orderPaymentMarkAsPaid.mutate({
|
onPaymentPaid={() => openModal("mark-paid")}
|
||||||
id,
|
onProfileView={() =>
|
||||||
transactionReference
|
navigate(customerUrl(order.user.id))
|
||||||
})
|
}
|
||||||
}
|
onInvoiceClick={id =>
|
||||||
open={params.action === "mark-paid"}
|
window.open(
|
||||||
transactionReference={transactionReference}
|
order.invoices.find(invoice => invoice.id === id)
|
||||||
handleTransactionReference={({ target }) =>
|
?.url,
|
||||||
setTransactionReference(target.value)
|
"_blank"
|
||||||
}
|
)
|
||||||
/>
|
}
|
||||||
<OrderPaymentVoidDialog
|
onInvoiceGenerate={() =>
|
||||||
confirmButtonState={orderVoid.opts.status}
|
orderInvoiceRequest.mutate({
|
||||||
errors={orderVoid.opts.data?.orderVoid.errors || []}
|
orderId: id
|
||||||
open={params.action === "void"}
|
})
|
||||||
onClose={closeModal}
|
}
|
||||||
onConfirm={() => orderVoid.mutate({ id })}
|
onInvoiceSend={id =>
|
||||||
/>
|
openModal("invoice-send", { id })
|
||||||
<OrderPaymentDialog
|
}
|
||||||
confirmButtonState={orderPaymentCapture.opts.status}
|
onSubmit={handleSubmit}
|
||||||
errors={
|
/>
|
||||||
orderPaymentCapture.opts.data?.orderCapture
|
<OrderCannotCancelOrderDialog
|
||||||
.errors || []
|
onClose={closeModal}
|
||||||
}
|
open={
|
||||||
initial={order?.total.gross.amount}
|
params.action === "cancel" &&
|
||||||
open={params.action === "capture"}
|
order?.fulfillments.some(
|
||||||
onClose={closeModal}
|
fulfillment =>
|
||||||
onSubmit={variables =>
|
fulfillment.status ===
|
||||||
orderPaymentCapture.mutate({
|
FulfillmentStatus.FULFILLED
|
||||||
|
)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<OrderCancelDialog
|
||||||
|
confirmButtonState={orderCancel.opts.status}
|
||||||
|
errors={
|
||||||
|
orderCancel.opts.data?.orderCancel.errors || []
|
||||||
|
}
|
||||||
|
number={order?.number}
|
||||||
|
open={params.action === "cancel"}
|
||||||
|
onClose={closeModal}
|
||||||
|
onSubmit={() =>
|
||||||
|
orderCancel.mutate({
|
||||||
|
id
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<OrderMarkAsPaidDialog
|
||||||
|
confirmButtonState={
|
||||||
|
orderPaymentMarkAsPaid.opts.status
|
||||||
|
}
|
||||||
|
errors={
|
||||||
|
orderPaymentMarkAsPaid.opts.data?.orderMarkAsPaid
|
||||||
|
.errors || []
|
||||||
|
}
|
||||||
|
onClose={closeModal}
|
||||||
|
onConfirm={() =>
|
||||||
|
orderPaymentMarkAsPaid.mutate({
|
||||||
|
id,
|
||||||
|
transactionReference
|
||||||
|
})
|
||||||
|
}
|
||||||
|
open={params.action === "mark-paid"}
|
||||||
|
transactionReference={transactionReference}
|
||||||
|
handleTransactionReference={({ target }) =>
|
||||||
|
setTransactionReference(target.value)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<OrderPaymentVoidDialog
|
||||||
|
confirmButtonState={orderVoid.opts.status}
|
||||||
|
errors={orderVoid.opts.data?.orderVoid.errors || []}
|
||||||
|
open={params.action === "void"}
|
||||||
|
onClose={closeModal}
|
||||||
|
onConfirm={() => orderVoid.mutate({ id })}
|
||||||
|
/>
|
||||||
|
<OrderPaymentDialog
|
||||||
|
confirmButtonState={orderPaymentCapture.opts.status}
|
||||||
|
errors={
|
||||||
|
orderPaymentCapture.opts.data?.orderCapture
|
||||||
|
.errors || []
|
||||||
|
}
|
||||||
|
initial={order?.total.gross.amount}
|
||||||
|
open={params.action === "capture"}
|
||||||
|
onClose={closeModal}
|
||||||
|
onSubmit={variables =>
|
||||||
|
orderPaymentCapture.mutate({
|
||||||
|
...variables,
|
||||||
|
id
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<OrderFulfillmentCancelDialog
|
||||||
|
confirmButtonState={
|
||||||
|
orderFulfillmentCancel.opts.status
|
||||||
|
}
|
||||||
|
errors={
|
||||||
|
orderFulfillmentCancel.opts.data
|
||||||
|
?.orderFulfillmentCancel.errors || []
|
||||||
|
}
|
||||||
|
open={params.action === "cancel-fulfillment"}
|
||||||
|
warehouses={
|
||||||
|
warehouses.data?.warehouses.edges.map(
|
||||||
|
edge => edge.node
|
||||||
|
) || []
|
||||||
|
}
|
||||||
|
onConfirm={variables =>
|
||||||
|
orderFulfillmentCancel.mutate({
|
||||||
|
id: params.id,
|
||||||
|
input: variables
|
||||||
|
})
|
||||||
|
}
|
||||||
|
onClose={closeModal}
|
||||||
|
/>
|
||||||
|
<OrderFulfillmentTrackingDialog
|
||||||
|
confirmButtonState={
|
||||||
|
orderFulfillmentUpdateTracking.opts.status
|
||||||
|
}
|
||||||
|
errors={
|
||||||
|
orderFulfillmentUpdateTracking.opts.data
|
||||||
|
?.orderFulfillmentUpdateTracking.errors || []
|
||||||
|
}
|
||||||
|
open={params.action === "edit-fulfillment"}
|
||||||
|
trackingNumber={getStringOrPlaceholder(
|
||||||
|
data?.order?.fulfillments.find(
|
||||||
|
fulfillment => fulfillment.id === params.id
|
||||||
|
)?.trackingNumber
|
||||||
|
)}
|
||||||
|
onConfirm={variables =>
|
||||||
|
orderFulfillmentUpdateTracking.mutate({
|
||||||
|
id: params.id,
|
||||||
|
input: {
|
||||||
...variables,
|
...variables,
|
||||||
id
|
notifyCustomer: true
|
||||||
})
|
}
|
||||||
}
|
})
|
||||||
/>
|
}
|
||||||
<OrderFulfillmentCancelDialog
|
onClose={closeModal}
|
||||||
confirmButtonState={
|
/>
|
||||||
orderFulfillmentCancel.opts.status
|
<OrderInvoiceEmailSendDialog
|
||||||
}
|
confirmButtonState={orderInvoiceSend.opts.status}
|
||||||
errors={
|
errors={
|
||||||
orderFulfillmentCancel.opts.data
|
orderInvoiceSend.opts.data?.invoiceSendEmail
|
||||||
?.orderFulfillmentCancel.errors || []
|
.errors || []
|
||||||
}
|
}
|
||||||
open={params.action === "cancel-fulfillment"}
|
open={params.action === "invoice-send"}
|
||||||
warehouses={
|
invoice={order?.invoices?.find(
|
||||||
warehouses.data?.warehouses.edges.map(
|
invoice => invoice.id === params.id
|
||||||
edge => edge.node
|
)}
|
||||||
) || []
|
onClose={closeModal}
|
||||||
}
|
onSend={() =>
|
||||||
onConfirm={variables =>
|
orderInvoiceSend.mutate({ id: params.id })
|
||||||
orderFulfillmentCancel.mutate({
|
}
|
||||||
id: params.id,
|
/>
|
||||||
input: variables
|
</>
|
||||||
})
|
)}
|
||||||
}
|
{isOrderDraft && (
|
||||||
onClose={closeModal}
|
|
||||||
/>
|
|
||||||
<OrderFulfillmentTrackingDialog
|
|
||||||
confirmButtonState={
|
|
||||||
orderFulfillmentUpdateTracking.opts.status
|
|
||||||
}
|
|
||||||
errors={
|
|
||||||
orderFulfillmentUpdateTracking.opts.data
|
|
||||||
?.orderFulfillmentUpdateTracking.errors || []
|
|
||||||
}
|
|
||||||
open={params.action === "edit-fulfillment"}
|
|
||||||
trackingNumber={getStringOrPlaceholder(
|
|
||||||
data?.order?.fulfillments.find(
|
|
||||||
fulfillment => fulfillment.id === params.id
|
|
||||||
)?.trackingNumber
|
|
||||||
)}
|
|
||||||
onConfirm={variables =>
|
|
||||||
orderFulfillmentUpdateTracking.mutate({
|
|
||||||
id: params.id,
|
|
||||||
input: {
|
|
||||||
...variables,
|
|
||||||
notifyCustomer: true
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
onClose={closeModal}
|
|
||||||
/>
|
|
||||||
<OrderInvoiceEmailSendDialog
|
|
||||||
confirmButtonState={orderInvoiceSend.opts.status}
|
|
||||||
errors={
|
|
||||||
orderInvoiceSend.opts.data?.invoiceSendEmail
|
|
||||||
.errors || []
|
|
||||||
}
|
|
||||||
open={params.action === "invoice-send"}
|
|
||||||
invoice={order?.invoices?.find(
|
|
||||||
invoice => invoice.id === params.id
|
|
||||||
)}
|
|
||||||
onClose={closeModal}
|
|
||||||
onSend={() =>
|
|
||||||
orderInvoiceSend.mutate({ id: params.id })
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
{order?.status === OrderStatus.DRAFT && (
|
|
||||||
<>
|
<>
|
||||||
<WindowTitle
|
<WindowTitle
|
||||||
title={intl.formatMessage(
|
title={intl.formatMessage(
|
||||||
|
|
@ -590,7 +590,7 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{order?.status === OrderStatus.UNCONFIRMED && (
|
{isOrderUnconfirmed && (
|
||||||
<>
|
<>
|
||||||
<WindowTitle
|
<WindowTitle
|
||||||
title={intl.formatMessage(
|
title={intl.formatMessage(
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue