diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormProvider.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormProvider.js index 488d3d21f..1ad876618 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormProvider.js +++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormProvider.js @@ -56,10 +56,18 @@ function InvoiceFormProvider({ invoiceId, ...props }) { } = useCustomers({ page_size: 10000 }); // Fetch warehouses list. - const { data: warehouses, isLoading: isWarehouesLoading } = useWarehouses(); + const { + data: warehouses, + isLoading: isWarehouesLoading, + isSuccess: isWarehousesSuccess, + } = useWarehouses(); // Fetches the branches list. - const { data: branches, isLoading: isBranchesLoading } = useBranches(); + const { + data: branches, + isLoading: isBranchesLoading, + isSuccess: isBranchesSuccess, + } = useBranches(); // Handle fetching settings. const { isLoading: isSettingsLoading } = useSettingsInvoices(); @@ -100,6 +108,8 @@ function InvoiceFormProvider({ invoiceId, ...props }) { isBranchesLoading, isFeatureLoading, isForeignCustomer, + isBranchesSuccess, + isWarehousesSuccess, createInvoiceMutate, editInvoiceMutate, diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js index dea29da8f..b63aa5786 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js +++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js @@ -9,6 +9,10 @@ import { } from '@blueprintjs/core'; import intl from 'react-intl-universal'; import styled from 'styled-components'; +import { + useSetPrimaryWarehouseToForm, + useSetPrimaryBranchToForm, +} from './utils'; import { useFeatureCan } from 'hooks/state'; import { Icon, BranchSelect, FeatureCan, WarehouseSelect } from 'components'; @@ -23,6 +27,12 @@ export default function InvoiceFormTopBar() { // Features guard. const { featureCan } = useFeatureCan(); + // Sets the primary warehouse to form. + useSetPrimaryWarehouseToForm(); + + // Sets the primary branch to form. + useSetPrimaryBranchToForm(); + // Can't display the navigation bar if warehouses or branches feature is not enabled. if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) { return null; @@ -79,7 +89,7 @@ function InvoiceFormSelectWarehouse() { function InvoiceWarehouseSelectButton({ label }) { return (