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

Fix adding empty order line in order drafts & unconfirmed orders (#3371)

Browse source 
* Extract util function to a seperate file

* Disable confirm button when no variant is selected
This commit is contained in:
Michał Droń 2023-03-17 12:44:20 +01:00 committed by GitHub
parent 7a5b919ae4
commit cdd733423b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx
View file

@ -277,6 +277,7 @@ const OrderProductAddDialog: React.FC<OrderProductAddDialogProps> = props => {
transitionState={confirmButtonState}
type="submit"
onClick={handleSubmit}
disabled={variants.length === 0}
>
<FormattedMessage {...buttonMessages.confirm} />
</ConfirmButton>

7
src/orders/utils/data.ts
View file

@ -445,3 +445,10 @@ export const prepareMoney = (
amount,
currency: currency ?? "USD",
});
export const isAnyAddressEditModalOpen = (uri: string | undefined): boolean =>
[
"edit-customer-addresses",
"edit-shipping-address",
"edit-billing-address",
].includes(uri);

12
src/orders/views/OrderDetails/OrderDraftDetails/index.tsx
View file

@ -24,7 +24,10 @@ import {
} from "@dashboard/orders/components/OrderCustomerChangeDialog/form";
import OrderCustomerChangeDialog from "@dashboard/orders/components/OrderCustomerChangeDialog/OrderCustomerChangeDialog";
import { OrderBothTypes, OrderSharedType } from "@dashboard/orders/types";
import { getVariantSearchAddress } from "@dashboard/orders/utils/data";
import {
getVariantSearchAddress,
isAnyAddressEditModalOpen,
} from "@dashboard/orders/utils/data";
import { OrderDiscountProvider } from "@dashboard/products/components/OrderDiscountProviders/OrderDiscountProvider";
import { OrderLineDiscountProvider } from "@dashboard/products/components/OrderDiscountProviders/OrderLineDiscountProvider";
import useCustomerSearch from "@dashboard/searches/useCustomerSearch";
@ -82,13 +85,6 @@ interface OrderDraftDetailsProps {
closeModal: any;
}
export const isAnyAddressEditModalOpen = (uri: string | undefined): boolean =>
[
"edit-customer-addresses",
"edit-shipping-address",
"edit-billing-address",
].includes(uri);
export const OrderDraftDetails: React.FC<OrderDraftDetailsProps> = ({
id,
params,

6
src/orders/views/OrderDetails/OrderNormalDetails/index.tsx
View file

@ -31,7 +31,10 @@ import OrderFulfillStockExceededDialog from "@dashboard/orders/components/OrderF
import OrderInvoiceEmailSendDialog from "@dashboard/orders/components/OrderInvoiceEmailSendDialog";
import { OrderManualTransactionDialog } from "@dashboard/orders/components/OrderManualTransactionDialog";
import { OrderTransactionActionDialog } from "@dashboard/orders/components/OrderTransactionActionDialog/OrderTransactionActionDialog";
import { transformFuflillmentLinesToStockFormsetData } from "@dashboard/orders/utils/data";
import {
isAnyAddressEditModalOpen,
transformFuflillmentLinesToStockFormsetData,
} from "@dashboard/orders/utils/data";
import { PartialMutationProviderOutput } from "@dashboard/types";
import {
CloseModalFunction,
@ -59,7 +62,6 @@ import {
OrderUrlDialog,
OrderUrlQueryParams,
} from "../../../urls";
import { isAnyAddressEditModalOpen } from "../OrderDraftDetails";
interface OrderNormalDetailsProps {
id: string;

2
src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx
View file

@ -23,6 +23,7 @@ import OrderFulfillmentApproveDialog from "@dashboard/orders/components/OrderFul
import OrderInvoiceEmailSendDialog from "@dashboard/orders/components/OrderInvoiceEmailSendDialog";
import { OrderManualTransactionDialog } from "@dashboard/orders/components/OrderManualTransactionDialog";
import { OrderTransactionActionDialog } from "@dashboard/orders/components/OrderTransactionActionDialog/OrderTransactionActionDialog";
import { isAnyAddressEditModalOpen } from "@dashboard/orders/utils/data";
import { OrderDiscountProvider } from "@dashboard/products/components/OrderDiscountProviders/OrderDiscountProvider";
import { OrderLineDiscountProvider } from "@dashboard/products/components/OrderDiscountProviders/OrderLineDiscountProvider";
import { useOrderVariantSearch } from "@dashboard/searches/useOrderVariantSearch";
@ -55,7 +56,6 @@ import {
orderUrl,
OrderUrlQueryParams,
} from "../../../urls";
import { isAnyAddressEditModalOpen } from "../OrderDraftDetails";
interface OrderUnconfirmedDetailsProps {
id: string;