+
+ );
+}
+
+const useWarehousesContext = () => React.useContext(WarehousesContext);
+
+export { WarehousesProvider, useWarehousesContext };
diff --git a/src/containers/Preferences/Warehouses/components.js b/src/containers/Preferences/Warehouses/components.js
new file mode 100644
index 000000000..1ab35654b
--- /dev/null
+++ b/src/containers/Preferences/Warehouses/components.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+
+import { Menu, MenuItem, MenuDivider, Intent } from '@blueprintjs/core';
+import { If, Icon, Can } from '../../../components';
+import { safeCallback } from 'utils';
+
+/**
+ * Warehouse context menu.
+ */
+export function WarehouseContextMenu({
+ onEditClick,
+ onDeleteClick,
+ onPrimary,
+}) {
+ return (
+
+ );
+}
diff --git a/src/containers/Preferences/Warehouses/index.js b/src/containers/Preferences/Warehouses/index.js
new file mode 100644
index 000000000..65ec45d5a
--- /dev/null
+++ b/src/containers/Preferences/Warehouses/index.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import { WarehousesProvider } from './WarehousesProvider';
+import Warehouses from './WarehousesList';
+
+/**
+ * Warehouses Preferences.
+ * @returns
+ */
+export default function WarehousesPerences() {
+ return (
+
+
{/*------------ Warehouse Name -----------*/}
-
+
{({ form, field, meta: { error, touched } }) => (
+
+ {/*------------ Warehouse Code -----------*/}
+
+ {({ form, field, meta: { error, touched } }) => (
+
+
{/*------------ Warehouse Address -----------*/}
-
+
{({ form, field, meta: { error, touched } }) => (
-
- {({ form, field, meta: { error, touched } }) => (
-
{/*------------ Warehouse Address City & Country-----------*/}
-
+
{({ field, meta: { error, touched } }) => (
-
+
{({ field, meta: { error, touched } }) => (
+
{/*------------ Phone Number -----------*/}
{({ form, field, meta: { error, touched } }) => (
@@ -117,6 +116,36 @@ export default function WarehouseFormFields() {
)}
+
+ {/*------------ Email -----------*/}
+
+ {({ form, field, meta: { error, touched } }) => (
+
+
+ {/*------------ Website -----------*/}
+
+ {({ form, field, meta: { error, touched } }) => (
+
);
}
diff --git a/src/containers/Dialogs/WarehouseFormDialog/WarehouseFormProvider.js b/src/containers/Dialogs/WarehouseFormDialog/WarehouseFormProvider.js
index 336a2f93f..901468fbd 100644
--- a/src/containers/Dialogs/WarehouseFormDialog/WarehouseFormProvider.js
+++ b/src/containers/Dialogs/WarehouseFormDialog/WarehouseFormProvider.js
@@ -1,22 +1,44 @@
import React from 'react';
import { DialogContent } from 'components';
-// import {} from 'hooks/query';
+import {
+ useCreateWarehouse,
+ useEditWarehouse,
+ useWarehouse,
+} from 'hooks/query';
+import { useLocation } from 'react-router-dom';
const WarehouseFormContext = React.createContext();
/**
* Warehouse form provider.
*/
-function WarehouseFormProvider({ dialogName, ...props }) {
+function WarehouseFormProvider({ dialogName, warehouseId, ...props }) {
+ const { state } = useLocation();
+
+ console.log(state, 'XXX');
+ // Create and edit warehouse mutations.
+ const { mutateAsync: createWarehouseMutate } = useCreateWarehouse();
+ const { mutateAsync: editWarehouseMutate } = useEditWarehouse();
+
+ // Handle fetch invoice detail.
+ const { data: warehouse, isLoading: isWarehouseLoading } = useWarehouse(
+ warehouseId,
+ {
+ enabled: !!warehouseId,
+ },
+ );
+
// State provider.
const provider = {
dialogName,
+ warehouse,
+ warehouseId,
+ createWarehouseMutate,
+ editWarehouseMutate,
};
return (
-
-
+ {isWarehouesLoading ? (
+
);
}
@@ -22,3 +36,9 @@ function WarehousesProvider({ ...props }) {
const useWarehousesContext = () => React.useContext(WarehousesContext);
export { WarehousesProvider, useWarehousesContext };
+
+const WarehousePreference = styled.div`
+ display: flex;
+ flex-wrap: wrap;
+ margin: 15px;
+`;
diff --git a/src/containers/Preferences/Warehouses/components.js b/src/containers/Preferences/Warehouses/components.js
index 1ab35654b..7027343b5 100644
--- a/src/containers/Preferences/Warehouses/components.js
+++ b/src/containers/Preferences/Warehouses/components.js
@@ -1,5 +1,6 @@
import React from 'react';
import intl from 'react-intl-universal';
+import styled from 'styled-components';
import { Menu, MenuItem, MenuDivider, Intent } from '@blueprintjs/core';
import { If, Icon, Can } from '../../../components';
@@ -35,3 +36,64 @@ export function WarehouseContextMenu({
);
}
+
+export function WarehousesGrid({ warehouse }) {
+ return (
+
+
{/*------------ Branch Name -----------*/}
-
+
{({ form, field, meta: { error, touched } }) => (
+ {/*------------ Branch Code -----------*/}
+
+ {({ form, field, meta: { error, touched } }) => (
+
- {/*------------ Branch Address 1 -----------*/}
-
+ {/*------------ Branch Address -----------*/}
+
{({ form, field, meta: { error, touched } }) => (
- {/*------------ Branch Address 2 -----------*/}
-
- {({ form, field, meta: { error, touched } }) => (
-
-
{/*------------ Branch Address City & Country-----------*/}
-
+
{({ field, meta: { error, touched } }) => (
-
+
{({ field, meta: { error, touched } }) => (
diff --git a/src/containers/Dialogs/BranchFormDialog/BranchFormProvider.js b/src/containers/Dialogs/BranchFormDialog/BranchFormProvider.js
index 18e97bc92..7d9ee8a3d 100644
--- a/src/containers/Dialogs/BranchFormDialog/BranchFormProvider.js
+++ b/src/containers/Dialogs/BranchFormDialog/BranchFormProvider.js
@@ -1,21 +1,33 @@
import React from 'react';
import { DialogContent } from 'components';
-// import {} from 'hooks/query';
+import { useCreateBranch, useEditBranch, useBranch } from 'hooks/query';
const BranchFormContext = React.createContext();
/**
* Branch form dialog provider.
*/
-function BranchFormProvider({ dialogName, ...props }) {
+function BranchFormProvider({ dialogName, branchId, ...props }) {
+ // Create and edit warehouse mutations.
+ const { mutateAsync: createBranchMutate } = useCreateBranch();
+ const { mutateAsync: editBranchMutate } = useEditBranch();
+
+ // Handle fetch branch detail.
+ const { data: branch, isLoading: isBranchLoading } = useBranch(branchId, {
+ enabled: !!branchId,
+ });
+
// State provider.
const provider = {
dialogName,
+ branch,
+ branchId,
+ createBranchMutate,
+ editBranchMutate,
};
+
return (
-
+
);
diff --git a/src/containers/Dialogs/BranchFormDialog/index.js b/src/containers/Dialogs/BranchFormDialog/index.js
index fca572330..f5b611148 100644
--- a/src/containers/Dialogs/BranchFormDialog/index.js
+++ b/src/containers/Dialogs/BranchFormDialog/index.js
@@ -12,18 +12,28 @@ const BranchFormDialogContent = React.lazy(() =>
/**
* Branch form form dialog.
*/
-function BranchFormDialog({ dialogName, payload = {}, isOpen }) {
+function BranchFormDialog({
+ dialogName,
+ payload: { branchId, action },
+ isOpen,
+}) {
return (
}
+ title={
+ action === 'edit' ? (
+
-
);
diff --git a/src/containers/Preferences/Branches/BranchesActions.js b/src/containers/Preferences/Branches/BranchesActions.js
index a73c4bb93..a59309d69 100644
--- a/src/containers/Preferences/Branches/BranchesActions.js
+++ b/src/containers/Preferences/Branches/BranchesActions.js
@@ -20,7 +20,7 @@ function BranchesActions({
onClick={handleClickNewBranche}
intent={Intent.PRIMARY}
>
-
+
+ );
}
export default compose(withDashboardActions)(WarehousesList);
+
+const WarehousesListRoot = styled.div`
+ display: flex;
+ flex-wrap: wrap;
+ margin: 15px;
+`;
diff --git a/src/containers/Preferences/Warehouses/WarehousesProvider.js b/src/containers/Preferences/Warehouses/WarehousesProvider.js
index 3b2320431..bbcfdcf38 100644
--- a/src/containers/Preferences/Warehouses/WarehousesProvider.js
+++ b/src/containers/Preferences/Warehouses/WarehousesProvider.js
@@ -21,14 +21,19 @@ function WarehousesProvider({ ...props }) {
};
return (
-
[
{
- id: 'branch_name',
+ id: 'name',
Header: intl.get('branches.column.branch_name'),
- accessor: 'branch_name',
- className: 'branch_name',
+ accessor: 'name',
+ className: 'name',
width: '120',
disableSortBy: true,
textOverview: true,
},
+ {
+ id: 'code',
+ Header: intl.get('branches.column.code'),
+ accessor: 'code',
+ className: 'code',
+ width: '100',
+ disableSortBy: true,
+ textOverview: true,
+ },
{
Header: intl.get('branches.column.address'),
accessor: 'address',
diff --git a/src/hooks/query/branches.js b/src/hooks/query/branches.js
new file mode 100644
index 000000000..b4cbb7daf
--- /dev/null
+++ b/src/hooks/query/branches.js
@@ -0,0 +1,99 @@
+import { useQueryClient, useMutation } from 'react-query';
+import { useRequestQuery } from '../useQueryRequest';
+import useApiRequest from '../useRequest';
+import t from './types';
+
+// Common invalidate queries.
+const commonInvalidateQueries = (queryClient) => {
+ // Invalidate warehouses.
+ queryClient.invalidateQueries(t.BRANCHES);
+ queryClient.invalidateQueries(t.BRANCH);
+};
+
+/**
+ * Create a new branch.
+ */
+export function useCreateBranch(props) {
+ const queryClient = useQueryClient();
+ const apiRequest = useApiRequest();
+
+ return useMutation((values) => apiRequest.post('branches', values), {
+ onSuccess: (res, values) => {
+ // Common invalidate queries.
+ commonInvalidateQueries(queryClient);
+ },
+ ...props,
+ });
+}
+
+/**
+ * Edits the given branch.
+ */
+export function useEditBranch(props) {
+ const queryClient = useQueryClient();
+ const apiRequest = useApiRequest();
+
+ return useMutation(
+ ([id, values]) => apiRequest.post(`branches/${id}`, values),
+ {
+ onSuccess: (res, [id, values]) => {
+ // Invalidate specific branch.
+ queryClient.invalidateQueries([t.BRANCH, id]);
+
+ // Common invalidate queries.
+ commonInvalidateQueries(queryClient);
+ },
+ ...props,
+ },
+ );
+}
+
+/**
+ * Deletes the given branch.
+ */
+export function useDeleteBranch(props) {
+ const queryClient = useQueryClient();
+ const apiRequest = useApiRequest();
+
+ return useMutation((id) => apiRequest.delete(`branches/${id}`), {
+ onSuccess: (res, id) => {
+ // Invalidate specific branch.
+ queryClient.invalidateQueries([t.BRANCH, id]);
+
+ // Common invalidate queries.
+ commonInvalidateQueries(queryClient);
+ },
+ ...props,
+ });
+}
+
+/**
+ * Retrieve Branches list.
+ */
+export function useBranches(query, props) {
+ return useRequestQuery(
+ [t.BRANCHES, query],
+ { method: 'get', url: 'branches', params: query },
+ {
+ select: (res) => res.data.branches,
+ defaultData: [],
+ ...props,
+ },
+ );
+}
+
+/**
+ * Retrieve the branch details.
+ * @param {number}
+ */
+export function useBranch(id, props, requestProps) {
+ return useRequestQuery(
+ [t.BRANCH, id],
+ { method: 'get', url: `branches/${id}`, ...requestProps },
+ {
+ select: (res) => res.data.branch,
+ defaultData: {},
+ ...props,
+ },
+ );
+}
diff --git a/src/hooks/query/index.js b/src/hooks/query/index.js
index 629f4f1b4..433717958 100644
--- a/src/hooks/query/index.js
+++ b/src/hooks/query/index.js
@@ -33,3 +33,4 @@ export * from './roles';
export * from './creditNote';
export * from './vendorCredit';
export * from './transactionsLocking';
+export * from './branches';
diff --git a/src/hooks/query/types.js b/src/hooks/query/types.js
index d98f99db8..afa6a21ef 100644
--- a/src/hooks/query/types.js
+++ b/src/hooks/query/types.js
@@ -191,6 +191,11 @@ const TARNSACTIONS_LOCKING = {
TRANSACTIONS_LOCKING: 'TRANSACTIONS_LOCKING',
};
+const BRANCHES = {
+ BRANCHES: 'BRANCHES',
+ BRANCH: 'BRANCH',
+};
+
export default {
...ACCOUNTS,
...BILLS,
@@ -218,4 +223,5 @@ export default {
...CREDIT_NOTES,
...VENDOR_CREDIT_NOTES,
...TARNSACTIONS_LOCKING,
+ ...BRANCHES,
};
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index eb7b674b3..c61dcb604 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1750,20 +1750,25 @@
"credit_note_preview.dialog.title": "Credit Note PDF Preview",
"payment_receive_preview.dialog.title": "Payment Receive PDF Preview",
"branches.label": "Branches",
- "branches.label.new_branche": "New Branch",
+ "branches.label.new_branch": "New Branch",
"branches.action.edit_branch": "Edit Branch",
- "branches.action.delete_branch": "Edit Branch",
+ "branches.action.delete_branch": "Delete Branch",
"branches.column.branch_name": "Branch name",
"branches.column.address": "Address",
"branches.column.phone_number": "Phone number",
- "branch.dialog.label": "New Branch",
+ "branches.column.code": "Code",
+ "branch.dialog.label_new_branch": "New Branch",
+ "branch.dialog.label_edit_branch": "New Branch",
"branch.dialog.label.branch_name": "Branch Name",
+ "branch.dialog.label.branch_code": "Code",
"branch.dialog.label.branch_address": "Branch Address",
- "branch.dialog.label.address_1": "Address 1",
- "branch.dialog.label.address_2": "Address 2",
+ "branch.dialog.label.address_1": "Address",
"branch.dialog.label.city": "City",
"branch.dialog.label.country": "Country",
"branch.dialog.label.phone_number": "Phone Number",
"branch.dialog.label.email": "Email",
- "branch.dialog.label.website": "Website"
+ "branch.dialog.label.website": "Website",
+ "branch.dialog.success_message": "The branch has been created successfully.",
+ "branch.alert.delete_message":"The branch has been deleted successfully",
+ "branch.once_delete_this_branch":"Once you delete this branch, you won't be able to restore it later. Are you sure you want to delete this branch?"
}
\ No newline at end of file
From dc491281aa93330e9513dd879f0b755f16c321d3 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Wed, 2 Feb 2022 00:46:02 +0200
Subject: [PATCH 12/30] feat(warehousetransfer): add api.
---
.../WarehouseTransferForm.schema.js | 13 +--
.../WarehouseTransferFormHeaderFields.js | 22 ++---
.../WarehouseTransferFormProvider.js | 16 +++-
.../WarehouseTransferForm/utils.js | 23 +----
src/hooks/query/warehouses.js | 95 +++++++++++++++++++
5 files changed, 129 insertions(+), 40 deletions(-)
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.schema.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.schema.js
index efe3afe45..defb8db87 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.schema.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.schema.js
@@ -4,11 +4,11 @@ import { DATATYPES_LENGTH } from 'common/dataTypes';
const Schema = Yup.object().shape({
date: Yup.date().required().label(intl.get('date')),
- transfer_number: Yup.string()
+ transaction_number: Yup.string()
.max(DATATYPES_LENGTH.STRING)
- .label(intl.get('transfer_number')),
- from_warehouse: Yup.number().required().label(intl.get('from_warehouse')),
- to_warehouse: Yup.number().required().label(intl.get('from_warehouse')),
+ .label(intl.get('transaction_number')),
+ from_warehouse_id: Yup.number().required().label(intl.get('from_warehouse')),
+ to_warehouse_id: Yup.number().required().label(intl.get('from_warehouse')),
reason: Yup.string()
.trim()
.min(1)
@@ -17,8 +17,9 @@ const Schema = Yup.object().shape({
entries: Yup.array().of(
Yup.object().shape({
item_id: Yup.number().nullable(),
- source_warehouse: Yup.number().nullable(),
- destination_warehouse: Yup.number().nullable(),
+ // source_warehouse: Yup.number().nullable(),
+ // destination_warehouse: Yup.number().nullable(),
+ description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT),
quantity: Yup.number().nullable().max(DATATYPES_LENGTH.INT_10),
}),
),
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js
index c036eb167..6b7fc9f1b 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js
@@ -37,7 +37,7 @@ function WarehouseTransferFormHeaderFields({
warehouseTransferNextNumber,
warehouseTransferNumberPrefix,
}) {
- const { accounts } = useWarehouseTransferFormContext();
+ const { warehouses } = useWarehouseTransferFormContext();
// Handle warehouse transfer number changing.
const handleTransferNumberChange = () => {
@@ -92,11 +92,11 @@ function WarehouseTransferFormHeaderFields({
)}
{/* ----------- Transfer number ----------- */}
-
+
{({ form, field, meta: { error, touched } }) => (
{/* ----------- Form Warehouse ----------- */}
-
+
{({ form, field: { value }, meta: { error, touched } }) => (
{
- form.setFieldValue('form_warehouse', account.id);
+ form.setFieldValue('from_warehouse_id', account.id);
}}
defaultSelectText={'Select Warehouse Transfer'}
selectedAccountId={value}
@@ -158,7 +158,7 @@ function WarehouseTransferFormHeaderFields({
)}
{/* ----------- To Warehouse ----------- */}
-
+
{({ form, field: { value }, meta: { error, touched } }) => (
{
- form.setFieldValue('to_warehouse', account.id);
+ form.setFieldValue('to_warehouse_id', account.id);
}}
defaultSelectText={'Select Warehouse Transfer'}
selectedAccountId={value}
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js
index 664262689..2531e9e73 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js
@@ -1,6 +1,6 @@
import React from 'react';
import DashboardInsider from 'components/Dashboard/DashboardInsider';
-import { useItems, useAccounts } from 'hooks/query';
+import { useItems, useWarehouses } from 'hooks/query';
import { ITEMS_FILTER_ROLES_QUERY } from './utils.js';
const WarehouseFormContext = React.createContext();
@@ -19,17 +19,23 @@ function WarehouseTransferFormProvider({ warehouseTransferId, ...props }) {
stringified_filter_roles: ITEMS_FILTER_ROLES_QUERY,
});
- // Fetch accounts list.
- const { data: accounts, isLoading: isAccountsLoading } = useAccounts();
+ // Fetch warehouses list.
+ const {
+ data: warehouses,
+ isFetching: isWarehouesFetching,
+ isLoading: isWarehouesLoading,
+ } = useWarehouses();
// Provider payload.
const provider = {
items,
- accounts,
+ warehouses,
+ isItemsFetching,
+ isWarehouesFetching,
};
return (
+
-
-
-
- '$10'
-
-
-
- {/*
);
}
-
-const AmountItem = styled(DetailItem)`
- width: 50%;
-`;
diff --git a/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailTable.js b/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailTable.js
index e85b7014f..47c7d445f 100644
--- a/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailTable.js
+++ b/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailTable.js
@@ -3,6 +3,7 @@ import React from 'react';
import { CommercialDocEntriesTable } from 'components';
import { TableStyle } from '../../../common';
import { useWarehouseTransferReadOnlyEntriesColumns } from './utils';
+import { useWarehouseDetailDrawerContext } from './WarehouseTransferDetailDrawerProvider';
/**
* Warehouse transfer detail table.
@@ -12,10 +13,14 @@ export default function WarehouseTransferDetailTable() {
// Warehouse transfer entries table columns.
const columns = useWarehouseTransferReadOnlyEntriesColumns();
+ const {
+ warehouseTransfer: { entries },
+ } = useWarehouseDetailDrawerContext();
+
return (
{({
form: { values, setFieldValue },
@@ -29,6 +33,7 @@ export default function WarehouseTransferEditorField() {
setFieldValue('entries', entries);
}}
items={items}
+ defaultEntry={defaultWarehouseTransferEntry}
errors={error}
/>
)}
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFloatingActions.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFloatingActions.js
index e69de29bb..9362a1ce5 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFloatingActions.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFloatingActions.js
@@ -0,0 +1,112 @@
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+import {
+ Intent,
+ Button,
+ ButtonGroup,
+ Popover,
+ PopoverInteractionKind,
+ Position,
+ Menu,
+ MenuItem,
+} from '@blueprintjs/core';
+import { FormattedMessage as T } from 'components';
+import classNames from 'classnames';
+import { useFormikContext } from 'formik';
+import { CLASSES } from 'common/classes';
+
+import { Icon } from 'components';
+import { useWarehouseTransferFormContext } from './WarehouseTransferFormProvider';
+
+/**
+ * Warehouse transfer floating actions bar.
+ */
+export default function WarehouseTransferFloatingActions() {
+ // History context.
+ const history = useHistory();
+
+ // Formik form context.
+ const { isSubmitting, submitForm, resetForm, values, errors } =
+ useFormikContext();
+
+ // Warehouse tansfer form context.
+ const { isNewMode, setSubmitPayload } = useWarehouseTransferFormContext();
+
+ // Handle submit button click.
+ const handleSubmitBtnClick = (event) => {
+ setSubmitPayload({ redirect: true });
+ submitForm();
+ };
+
+ // Handle clear button click.
+ const handleClearBtnClick = (event) => {
+ resetForm();
+ };
+
+ // Handle submit & new button click.
+ const handleSubmitAndNewClick = (event) => {
+ setSubmitPayload({ redirect: false, resetForm: true });
+ submitForm();
+ };
+
+ // Handle cancel button click.
+ const handleCancelBtnClick = (event) => {
+ history.goBack();
+ };
+
+ return (
+
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormEntriesTable.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormEntriesTable.js
index 1d1ca8141..8ba567803 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormEntriesTable.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormEntriesTable.js
@@ -2,8 +2,15 @@ import React from 'react';
import { useWarehouseTransferTableColumns } from '../utils';
import { DataTableEditable } from 'components';
-import { compose, saveInvoke, updateTableCell } from 'utils';
-
+import {
+ saveInvoke,
+ compose,
+ updateTableCell,
+ updateMinEntriesLines,
+ updateAutoAddNewLine,
+ updateRemoveLineByIndex,
+ orderingLinesIndexes,
+} from 'utils';
/**
* Warehouse transfer form entries table.
*/
@@ -11,6 +18,7 @@ export default function WarehouseTransferFormEntriesTable({
// #ownProps
items,
entries,
+ defaultEntry,
onUpdateData,
errors,
}) {
@@ -20,12 +28,30 @@ export default function WarehouseTransferFormEntriesTable({
// Handle update data.
const handleUpdateData = React.useCallback(
(rowIndex, columnId, value) => {
- const newRows = compose(updateTableCell(rowIndex, columnId, value))(
- entries,
- );
- onUpdateData(newRows);
+ const newRows = compose(
+ // Update auto-adding new line.
+ updateAutoAddNewLine(defaultEntry, ['item_id']),
+ // Update the row value of the given row index and column id.
+ updateTableCell(rowIndex, columnId, value),
+ )(entries);
+
+ saveInvoke(onUpdateData, newRows);
},
- [onUpdateData, entries],
+ [entries, defaultEntry, onUpdateData],
+ );
+ // Handles click remove datatable row.
+ const handleRemoveRow = React.useCallback(
+ (rowIndex) => {
+ const newRows = compose(
+ // Ensure minimum lines count.
+ updateMinEntriesLines(4, defaultEntry),
+ // Remove the line by the given index.
+ updateRemoveLineByIndex(rowIndex),
+ )(entries);
+
+ saveInvoke(onUpdateData, newRows);
+ },
+ [entries, defaultEntry, onUpdateData],
);
return (
@@ -36,6 +62,8 @@ export default function WarehouseTransferFormEntriesTable({
items,
errors: errors || [],
updateData: handleUpdateData,
+ removeRow: handleRemoveRow,
+ autoFocus: ['item_id', 0],
}}
/>
);
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js
index 6b7fc9f1b..ee572e8fc 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.js
@@ -2,7 +2,6 @@ import React from 'react';
import {
FormGroup,
InputGroup,
- TextArea,
Position,
ControlGroup,
} from '@blueprintjs/core';
@@ -149,7 +148,7 @@ function WarehouseTransferFormHeaderFields({
onAccountSelected={(account) => {
form.setFieldValue('from_warehouse_id', account.id);
}}
- defaultSelectText={'Select Warehouse Transfer'}
+ defaultSelectText={ ({
+ ...transformToForm(warehouse, defaultWarehouseTransferEntry),
+ })),
+ ...repeatValue(
+ defaultWarehouseTransferEntry,
+ Math.max(MIN_LINES_NUMBER - warehouse.entries.length, 0),
+ ),
+ ];
+ const entries = compose(
+ ensureEntriesHaveEmptyLine(defaultWarehouseTransferEntry),
+ updateItemsEntriesTotal,
+ )(initialEntries);
+
+ return {
+ ...transformToForm(warehouse, defaultWarehouseTransfer),
+ entries,
+ };
+}
+
/**
* Syncs transfer no. settings with form.
*/
@@ -40,3 +80,28 @@ export const useObserveTransferNoSettings = (prefix, nextNumber) => {
setFieldValue('transaction_number', transferNo);
}, [setFieldValue, prefix, nextNumber]);
};
+
+/**
+ * Detarmines warehouse entries field when should update.
+ */
+export const entriesFieldShouldUpdate = (newProps, oldProps) => {
+ return (
+ newProps.items !== oldProps.items ||
+ defaultFastFieldShouldUpdate(newProps, oldProps)
+ );
+};
+
+/**
+ * Transformes the form values to request body values.
+ */
+export function transformValueToRequest(values) {
+ const entries = values.entries.filter(
+ (item) => item.item_id && item.quantity,
+ );
+ return {
+ ...values,
+ entries: entries.map((entry) => ({
+ ...omit(entry, ['destination_warehouse', 'source_warehouse']),
+ })),
+ };
+}
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.js
index f3ec0832e..048a7151f 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.js
@@ -33,7 +33,7 @@ function WarehouseTransfersActionsBar({
// Handle new warehouse transfer button click.
const handleClickNewWarehouseTransfer = () => {
- history.push('/warehouse-transfers/new');
+ history.push('/warehouses-transfers/new');
};
// Handle click a refresh warehouse transfers
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.js
index 5a571df84..f707d70a3 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.js
@@ -43,18 +43,26 @@ function WarehouseTransfersDataTable({
const columns = useWarehouseTransfersTableColumns();
// Handle view detail.
- const handleViewDetailWarehouseTransfer = () => {
- openDrawer('warehouse-transfer-detail-drawer', {});
+ const handleViewDetailWarehouseTransfer = ({ id }) => {
+ openDrawer('warehouse-transfer-detail-drawer', { warehouseTransferId: id });
};
// Handle edit warehouse transfer.
- const handleEditWarehouseTransfer = () => {};
+ const handleEditWarehouseTransfer = ({ id }) => {
+ history.push(`/warehouses-transfers/${id}/edit`);
+ };
// Handle delete warehouse transfer.
- const handleDeleteWarehouseTransfer = () => {};
+ const handleDeleteWarehouseTransfer = ({ id }) => {
+ openAlert('warehouse-transfer-delete', { warehouseTransferId: id });
+ };
// Handle cell click.
- const handleCellClick = (cell, event) => {};
+ const handleCellClick = (cell, event) => {
+ openDrawer('warehouse-transfer-detail-drawer', {
+ warehouseTransferId: cell.row.original.id,
+ });
+ };
// Local storage memorizing columns widths.
const [initialColumnsWidths, , handleColumnResizing] =
diff --git a/src/containers/WarehouseTransfers/WarehousesTransfersAlerts.js b/src/containers/WarehouseTransfers/WarehousesTransfersAlerts.js
new file mode 100644
index 000000000..c11fabb4d
--- /dev/null
+++ b/src/containers/WarehouseTransfers/WarehousesTransfersAlerts.js
@@ -0,0 +1,15 @@
+import React from 'react';
+
+const WarehouseTransferDeleteAlert = React.lazy(() =>
+ import('../Alerts/Warehouses/WarehouseTransferDeleteAlert'),
+);
+
+/**
+ * Warehouses alerts.
+ */
+export default [
+ {
+ name: 'warehouse-transfer-delete',
+ component: WarehouseTransferDeleteAlert,
+ },
+];
diff --git a/src/containers/WarehouseTransfers/utils.js b/src/containers/WarehouseTransfers/utils.js
index e3d67946c..1c8713416 100644
--- a/src/containers/WarehouseTransfers/utils.js
+++ b/src/containers/WarehouseTransfers/utils.js
@@ -1,6 +1,14 @@
import React from 'react';
-import { CLASSES } from 'common/classes';
-import { MoneyFieldCell, FormatDateCell, AppToaster, T } from 'components';
+import intl from 'react-intl-universal';
+import { Tooltip, Button, Intent, Position } from '@blueprintjs/core';
+
+import {
+ MoneyFieldCell,
+ FormatDateCell,
+ Icon,
+ AppToaster,
+ T,
+} from 'components';
import { InputGroupCell, ItemsListCell } from 'components/DataTableCells';
// Index table cell.
@@ -8,6 +16,33 @@ export function IndexTableCell({ row: { index } }) {
return {index + 1};
}
+/**
+ * Actions cell renderer component.
+ */
+export function ActionsCellRenderer({
+ row: { index },
+ column: { id },
+ cell: { value },
+ data,
+ payload: { removeRow },
+}) {
+ const onRemoveRole = () => {
+ removeRow(index);
+ };
+
+ return (
+
From 8bf64c68e0da527a77552076c5dfbb06eacfd373 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 3 Feb 2022 00:27:42 +0200
Subject: [PATCH 15/30] feat(warehouseTransfer): add crud warehouse transfer.
---
src/common/tables.js | 1 +
.../WarehouseTransferDetailDrawerProvider.js | 4 +-
.../WarehouseTransferForm.js | 4 +-
.../WarehouseTransferFormPage.js | 7 +-
.../WarehouseTransferFormProvider.js | 14 +++-
.../WarehouseTransfersActionsBar.js | 62 ++++++++++++++--
.../WarehouseTransfersDataTable.js | 70 +++++++++++++------
.../WarehouseTransfersEmptyStatus.js | 2 +-
.../WarehouseTransfersList.js | 40 +++++++++--
.../WarehouseTransfersListProvider.js | 58 ++++++++++++++-
.../WarehouseTransfersViewTabs.js | 28 ++++++--
.../WarehouseTransfersLanding/components.js | 31 ++++----
.../withWarehouseTransfers.js | 19 +++++
.../withWarehouseTransfersActions.js | 13 ++++
src/hooks/query/warehouses.js | 33 +++++++--
src/routes/dashboard.js | 7 +-
.../warehouseTransfer.actions.js | 14 ++++
.../warehouseTransfer.reducer.js | 34 +++++++++
.../warehouseTransfer.selector.js | 33 +++++++++
.../warehouseTransfer.type.js | 4 ++
src/store/reducers.js | 2 +
src/store/types.js | 4 +-
22 files changed, 407 insertions(+), 77 deletions(-)
create mode 100644 src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfers.js
create mode 100644 src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfersActions.js
create mode 100644 src/store/WarehouseTransfer/warehouseTransfer.actions.js
create mode 100644 src/store/WarehouseTransfer/warehouseTransfer.reducer.js
create mode 100644 src/store/WarehouseTransfer/warehouseTransfer.selector.js
create mode 100644 src/store/WarehouseTransfer/warehouseTransfer.type.js
diff --git a/src/common/tables.js b/src/common/tables.js
index 59d6ca127..59c50dff7 100644
--- a/src/common/tables.js
+++ b/src/common/tables.js
@@ -16,6 +16,7 @@ export const TABLES = {
CASHFLOW_Transactions: 'cashflow_transactions',
CREDIT_NOTES: 'credit_notes',
VENDOR_CREDITS: 'vendor_credits',
+ WAREHOUSE_TRANSFERS:'warehouse_transfers'
};
export const TABLE_SIZE = {
diff --git a/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailDrawerProvider.js b/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailDrawerProvider.js
index 371131568..b470c954f 100644
--- a/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailDrawerProvider.js
+++ b/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailDrawerProvider.js
@@ -9,10 +9,10 @@ const WarehouseTransferDetailDrawerContext = React.createContext();
* Warehouse transfer detail drawer provider.
*/
function WarehouseTransferDetailDrawerProvider({
- warehouseTransferId = 5,
+ warehouseTransferId,
...props
}) {
- // Handle fetch invoice detail.
+ // Handle fetch warehouse transfer detail.
const { data: warehouseTransfer, isLoading: isWarehouseTransferLoading } =
useWarehouseTransfer(warehouseTransferId, {
enabled: !!warehouseTransferId,
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
index 1d172e6c4..760a8e306 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
@@ -53,8 +53,8 @@ function WarehouseTransferForm({
// Form initial values.
const initialValues = React.useMemo(
() => ({
- ...(!isEmpty(null)
- ? { ...transformToEditForm(null) }
+ ...(!isEmpty(warehouseTransfer)
+ ? { ...transformToEditForm(warehouseTransfer) }
: {
...defaultWarehouseTransfer,
entries: orderingLinesIndexes(defaultWarehouseTransfer.entries),
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormPage.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormPage.js
index b9862488c..e7a622010 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormPage.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormPage.js
@@ -1,6 +1,7 @@
import React from 'react';
+import { useParams } from 'react-router-dom';
-import '../../../style/pages/WarehouseTransfers/PageForm.scss'
+import '../../../style/pages/WarehouseTransfers/PageForm.scss';
import WarehouseTransferForm from './WarehouseTransferForm';
import { WarehouseTransferFormProvider } from './WarehouseTransferFormProvider';
@@ -8,8 +9,10 @@ import { WarehouseTransferFormProvider } from './WarehouseTransferFormProvider';
* WarehouseTransfer form page.
*/
export default function WarehouseTransferFormPage() {
+ const { id } = useParams();
+ const idAsInteger = parseInt(id, 10);
return (
-
+
);
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js
index 5c57d645e..1570ad160 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js
@@ -3,6 +3,7 @@ import DashboardInsider from 'components/Dashboard/DashboardInsider';
import {
useItems,
useWarehouses,
+ useWarehouseTransfer,
useCreateWarehouseTransfer,
useEditWarehouseTransfer,
} from 'hooks/query';
@@ -24,6 +25,12 @@ function WarehouseTransferFormProvider({ warehouseTransferId, ...props }) {
stringified_filter_roles: ITEMS_FILTER_ROLES_QUERY,
});
+ // Handle fetch warehouse transfer detail.
+ const { data: warehouseTransfer, isLoading: isWarehouseTransferLoading } =
+ useWarehouseTransfer(warehouseTransferId, {
+ enabled: !!warehouseTransferId,
+ });
+
// Fetch warehouses list.
const {
data: warehouses,
@@ -47,7 +54,7 @@ function WarehouseTransferFormProvider({ warehouseTransferId, ...props }) {
const provider = {
items,
warehouses,
- warehouseTransfer: [],
+ warehouseTransfer,
isItemsFetching,
isWarehouesFetching,
@@ -58,9 +65,12 @@ function WarehouseTransferFormProvider({ warehouseTransferId, ...props }) {
createWarehouseTransferMutate,
editWarehouseTransferMutate,
};
+
return (
@@ -63,6 +86,22 @@ function WarehouseTransfersActionsBar({
onClick={handleClickNewWarehouseTransfer}
/>
{
+ setWarehouseTransferTableState({ filterRoles: filterConditions });
+ },
+ }}
+ >
+
+
}
@@ -80,8 +119,8 @@ function WarehouseTransfersActionsBar({
/>
@@ -89,11 +128,20 @@ function WarehouseTransfersActionsBar({
}
- // onClick={handleRefreshBtnClick}
+ onClick={handleRefreshBtnClick}
/>
);
}
-export default compose(withSettingsActions)(WarehouseTransfersActionsBar);
+export default compose(
+ withSettingsActions,
+ withWarehouseTransfersActions,
+ withWarehouseTransfers(({ warehouseTransferTableState }) => ({
+ warehouseTransferFilterRoles: warehouseTransferTableState.filterRoles,
+ })),
+ withSettings(({ warehouseTransferSettings }) => ({
+ warehouseTransferTableSize: warehouseTransferSettings?.tableSize,
+ })),
+)(WarehouseTransfersActionsBar);
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.js
index f707d70a3..a6dd9c907 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.js
@@ -11,6 +11,7 @@ import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
import TableSkeletonHeader from 'components/Datatable/TableHeaderSkeleton';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
+import withWarehouseTransfersActions from './withWarehouseTransfersActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions';
@@ -25,6 +26,9 @@ import { compose } from 'utils';
* Warehouse transfers datatable.
*/
function WarehouseTransfersDataTable({
+ // #withWarehouseTransfersActions
+ setWarehouseTransferTableState,
+
// #withAlertsActions
openAlert,
@@ -33,15 +37,45 @@ function WarehouseTransfersDataTable({
// #withDialogAction
openDialog,
+
+ // #withSettings
+ warehouseTransferTableSize,
}) {
const history = useHistory();
// Warehouse transfers list context.
- const { isEmptyStatus } = useWarehouseTranfersListContext();
+ const {
+ warehousesTransfers,
+ pagination,
+ isEmptyStatus,
+ isWarehouseTransfersLoading,
+ isWarehouseTransfersFetching,
+ } = useWarehouseTranfersListContext();
// Invoices table columns.
const columns = useWarehouseTransfersTableColumns();
+ // Local storage memorizing columns widths.
+ const [initialColumnsWidths, , handleColumnResizing] =
+ useMemorizedColumnsWidths(TABLES.WAREHOUSE_TRANSFERS);
+
+ // Handles fetch data once the table state change.
+ const handleDataTableFetchData = React.useCallback(
+ ({ pageSize, pageIndex, sortBy }) => {
+ setWarehouseTransferTableState({
+ pageSize,
+ pageIndex,
+ sortBy,
+ });
+ },
+ [setWarehouseTransferTableState],
+ );
+
+ // Display invoice empty status instead of the table.
+ if (isEmptyStatus) {
+ return
({
+ warehouseTransferTableSize: warehouseTransferSettings?.tableSize,
+ })),
)(WarehouseTransfersDataTable);
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersEmptyStatus.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersEmptyStatus.js
index 2672f4be0..9cb76ad5a 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersEmptyStatus.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersEmptyStatus.js
@@ -17,7 +17,7 @@ export default function WarehouseTransfersEmptyStatus() {
intent={Intent.PRIMARY}
large={true}
onClick={() => {
- history.push('/warehouse-transfers/new');
+ history.push('/warehouses-transfers/new');
}}
>
+
+
);
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersViewTabs.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersViewTabs.js
index 8be06aa31..f0b75af98 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersViewTabs.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersViewTabs.js
@@ -1,23 +1,34 @@
import React from 'react';
-import { useHistory } from 'react-router';
import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core';
import { FormattedMessage as T } from 'components';
import { DashboardViewsTabs } from 'components';
-import { useWarehouseTranfersListContext } from './WarehouseTransfersListProvider';
+import withWarehouseTransfers from './withWarehouseTransfers';
+import withWarehouseTransfersActions from './withWarehouseTransfersActions';
-import { compose } from 'utils';
+import { useWarehouseTranfersListContext } from './WarehouseTransfersListProvider';
+import { compose, transfromViewsToTabs } from 'utils';
/**
* Warehouse transfer view tabs.
*/
-function WarehouseTransfersViewTabs() {
+function WarehouseTransfersViewTabs({
+ // #withWarehouseTransfers
+ warehouseTransferCurrentView,
+
+ // #withWarehouseTransfersActions
+ setWarehouseTransferTableState,
+}) {
+ const { WarehouseTransferView } = useWarehouseTranfersListContext();
+
// Handles click a new view tab.
const handleClickNewView = () => {};
// Handles the active tab chaing.
- const handleTabsChange = (customView) => {};
+ const handleTabsChange = (viewSlug) => {
+ setWarehouseTransferTableState({ viewSlug });
+ };
return (
@@ -34,4 +45,9 @@ function WarehouseTransfersViewTabs() {
);
}
-export default WarehouseTransfersViewTabs;
+export default compose(
+ withWarehouseTransfersActions,
+ withWarehouseTransfers(({ warehouseTransferTableState }) => ({
+ warehouseTransferCurrentView: warehouseTransferTableState?.viewSlug,
+ })),
+)(WarehouseTransfersViewTabs);
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/components.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/components.js
index 0a4eb0dab..b7b9ee167 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/components.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/components.js
@@ -58,7 +58,7 @@ export function useWarehouseTransfersTableColumns() {
{
id: 'date',
Header: intl.get('date'),
- accessor: 'date',
+ accessor: 'formatted_date',
Cell: FormatDateCell,
width: 120,
className: 'date',
@@ -66,36 +66,29 @@ export function useWarehouseTransfersTableColumns() {
textOverview: true,
},
{
- id: 'transfer_no',
+ id: 'transaction_number',
Header: intl.get('warehouse_transfer.column.transfer_no'),
- accessor: 'transfer_no',
- width: 120,
- className: 'transfer_no',
+ accessor: 'transaction_number',
+ width: 100,
+ className: 'transaction_number',
clickable: true,
textOverview: true,
},
{
id: 'from_warehouse',
Header: intl.get('warehouse_transfer.column.from_warehouse'),
- accessor: 'from_warehouse',
- width: 150,
+ accessor: 'from_warehouse.name',
+ width: 140,
+ className: 'from_warehouse',
clickable: true,
textOverview: true,
},
{
id: 'to_warehouse',
Header: intl.get('warehouse_transfer.column.to_warehouse'),
- accessor: 'to_warehouse',
- width: 150,
- clickable: true,
- textOverview: true,
- },
- {
- id: 'reason',
- Header: intl.get('reason'),
- accessor: 'reason',
- className: 'reason',
- width: 120,
+ accessor: 'to_warehouse.name',
+ width: 140,
+ className: 'to_warehouse',
clickable: true,
textOverview: true,
},
@@ -103,7 +96,7 @@ export function useWarehouseTransfersTableColumns() {
id: 'status',
Header: intl.get('status'),
// accessor: (row) => statusAccessor(row),
- width: 160,
+ width: 140,
className: 'status',
clickable: true,
},
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfers.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfers.js
new file mode 100644
index 000000000..0f1173f68
--- /dev/null
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfers.js
@@ -0,0 +1,19 @@
+import { connect } from 'react-redux';
+import {
+ getWarehouseTransfersTableStateFactory,
+ isWarehouseTransferTableStateChangedFactory,
+} from '../../../store/WarehouseTransfer/warehouseTransfer.selector';
+
+export default (mapState) => {
+ const getWarehouseTransferTableState = getWarehouseTransfersTableStateFactory();
+ const isWarehouseTransferTableChanged = isWarehouseTransferTableStateChangedFactory();
+
+ const mapStateToProps = (state, props) => {
+ const mapped = {
+ warehouseTransferTableState: getWarehouseTransferTableState(state, props),
+ warehouseTransferTableStateChanged: isWarehouseTransferTableChanged(state, props),
+ };
+ return mapState ? mapState(mapped, state, props) : mapped;
+ };
+ return connect(mapStateToProps);
+};
diff --git a/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfersActions.js b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfersActions.js
new file mode 100644
index 000000000..8e0bba3d5
--- /dev/null
+++ b/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfersActions.js
@@ -0,0 +1,13 @@
+import { connect } from 'react-redux';
+import {
+ setWarehouseTransferTableState,
+ resetWarehouseTransferTableState,
+} from '../../../store/WarehouseTransfer/warehouseTransfer.actions';
+
+const mapDipatchToProps = (dispatch) => ({
+ setWarehouseTransferTableState: (queries) =>
+ dispatch(setWarehouseTransferTableState(queries)),
+ resetWarehouseTransferTableState: () => dispatch(resetWarehouseTransferTableState()),
+});
+
+export default connect(null, mapDipatchToProps);
\ No newline at end of file
diff --git a/src/hooks/query/warehouses.js b/src/hooks/query/warehouses.js
index 27e052c2f..a095ab87e 100644
--- a/src/hooks/query/warehouses.js
+++ b/src/hooks/query/warehouses.js
@@ -1,4 +1,5 @@
import { useQueryClient, useMutation } from 'react-query';
+import { transformPagination } from 'utils';
import { useRequestQuery } from '../useQueryRequest';
import useApiRequest from '../useRequest';
import t from './types';
@@ -129,7 +130,7 @@ export function useEditWarehouseTransfer(props) {
const apiRequest = useApiRequest();
return useMutation(
- ([id, values]) => apiRequest.post(`warehouses/transfers${id}`, values),
+ ([id, values]) => apiRequest.post(`warehouses/transfers/${id}`, values),
{
onSuccess: (res, [id, values]) => {
// Invalidate specific sale invoice.
@@ -162,6 +163,12 @@ export function useDeleteWarehouseTransfer(props) {
});
}
+const transformWarehousesTransfer = (res) => ({
+ warehousesTransfers: res.data.data,
+ pagination: transformPagination(res.data.pagination),
+ filterMeta: res.data.filter,
+});
+
/**
* Retrieve Warehoues list.
*/
@@ -170,8 +177,16 @@ export function useWarehousesTransfers(query, props) {
[t.WAREHOUSE_TRANSFERS, query],
{ method: 'get', url: 'warehouses/transfers', params: query },
{
- select: (res) => res.data,
- defaultData: [],
+ select: transformWarehousesTransfer,
+ defaultData: {
+ warehousesTransfers: [],
+ pagination: {
+ page: 1,
+ pageSize: 20,
+ total: 0,
+ },
+ filterMeta: {},
+ },
...props,
},
);
@@ -186,9 +201,19 @@ export function useWarehouseTransfer(id, props, requestProps) {
[t.WAREHOUSE_TRANSFER, id],
{ method: 'get', url: `warehouses/transfers/${id}`, ...requestProps },
{
- select: (res) => res.data.warehouse_transfer,
+ select: (res) => res.data.data,
defaultData: {},
...props,
},
);
}
+
+export function useRefreshWarehouseTransfers() {
+ const queryClient = useQueryClient();
+
+ return {
+ refresh: () => {
+ queryClient.invalidateQueries(t.WAREHOUSE_TRANSFERS);
+ },
+ };
+}
diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js
index 3afc57e2b..8877b2396 100644
--- a/src/routes/dashboard.js
+++ b/src/routes/dashboard.js
@@ -117,10 +117,15 @@ export const getDashboardRoutes = () => [
defaultSearchResource: RESOURCES_TYPES.ITEM,
subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
},
+
// Warehouse Transfer.
{
path: `/warehouses-transfers/:id/edit`,
- component: lazy(() => import('containers/Items/ItemFormPage')),
+ component: lazy(() =>
+ import(
+ '../containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormPage'
+ ),
+ ),
name: 'warehouse-transfer-edit',
pageTitle: intl.get('warehouse_transfer.label.edit_warehouse_transfer'),
backLink: true,
diff --git a/src/store/WarehouseTransfer/warehouseTransfer.actions.js b/src/store/WarehouseTransfer/warehouseTransfer.actions.js
new file mode 100644
index 000000000..5fa8af202
--- /dev/null
+++ b/src/store/WarehouseTransfer/warehouseTransfer.actions.js
@@ -0,0 +1,14 @@
+import t from 'store/types';
+
+export const setWarehouseTransferTableState = (queries) => {
+ return {
+ type: t.WAREHOUSE_TRANSFERS_TABLE_STATE_SET,
+ payload: { queries },
+ };
+};
+
+export const resetWarehouseTransferTableState = () => {
+ return {
+ type: t.WAREHOUSE_TRANSFERS_TABLE_STATE_RESET,
+ };
+};
diff --git a/src/store/WarehouseTransfer/warehouseTransfer.reducer.js b/src/store/WarehouseTransfer/warehouseTransfer.reducer.js
new file mode 100644
index 000000000..193549eda
--- /dev/null
+++ b/src/store/WarehouseTransfer/warehouseTransfer.reducer.js
@@ -0,0 +1,34 @@
+import { createReducer } from '@reduxjs/toolkit';
+import { persistReducer, purgeStoredState } from 'redux-persist';
+import storage from 'redux-persist/lib/storage';
+import { createTableStateReducers } from 'store/tableState.reducer';
+import t from 'store/types';
+
+export const defaultTableQuery = {
+ pageSize: 20,
+ pageIndex: 0,
+ filterRoles: [],
+ viewSlug: null,
+};
+
+const initialState = {
+ tableState: defaultTableQuery,
+};
+
+const STORAGE_KEY = 'bigcapital:warehouse_transfers';
+
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: [],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('WAREHOUSE_TRANSFERS', defaultTableQuery),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
+ },
+});
+
+export default persistReducer(CONFIG, reducerInstance);
diff --git a/src/store/WarehouseTransfer/warehouseTransfer.selector.js b/src/store/WarehouseTransfer/warehouseTransfer.selector.js
new file mode 100644
index 000000000..ccea3c4df
--- /dev/null
+++ b/src/store/WarehouseTransfer/warehouseTransfer.selector.js
@@ -0,0 +1,33 @@
+import { isEqual } from 'lodash';
+import { paginationLocationQuery } from 'store/selectors';
+import { createDeepEqualSelector } from 'utils';
+import { defaultTableQuery } from './warehouseTransfer.reducer';
+
+const warehouseTransfersTableStateSelector = (state) =>
+ state.warehouseTransfers.tableState;
+
+/**
+ * Retrieve warehouse transfers table state.
+ */
+export const getWarehouseTransfersTableStateFactory = () =>
+ createDeepEqualSelector(
+ paginationLocationQuery,
+ warehouseTransfersTableStateSelector,
+ (locationQuery, tableState) => {
+ return {
+ ...locationQuery,
+ ...tableState,
+ };
+ },
+ );
+
+/**
+ * Retrieve warehouse transfers table state.
+ */
+export const isWarehouseTransferTableStateChangedFactory = () =>
+ createDeepEqualSelector(
+ warehouseTransfersTableStateSelector,
+ (tableState) => {
+ return !isEqual(tableState, defaultTableQuery);
+ },
+ );
diff --git a/src/store/WarehouseTransfer/warehouseTransfer.type.js b/src/store/WarehouseTransfer/warehouseTransfer.type.js
new file mode 100644
index 000000000..280b1cc02
--- /dev/null
+++ b/src/store/WarehouseTransfer/warehouseTransfer.type.js
@@ -0,0 +1,4 @@
+export default {
+ WAREHOUSE_TRANSFERS_TABLE_STATE_SET: 'WAREHOUSE_TRANSFERS/TABLE_STATE_SET',
+ WAREHOUSE_TRANSFERS_TABLE_STATE_RESET: 'WAREHOUSE_TRANSFERS/TABLE_STATE_RESET',
+};
diff --git a/src/store/reducers.js b/src/store/reducers.js
index ad28a32e6..0223270ad 100644
--- a/src/store/reducers.js
+++ b/src/store/reducers.js
@@ -34,6 +34,7 @@ import inventoryAdjustments from './inventoryAdjustments/inventoryAdjustment.red
import plans from './plans/plans.reducer';
import creditNotes from './CreditNote/creditNote.reducer';
import vendorCredit from './VendorCredit/VendorCredit.reducer';
+import warehouseTransfers from './WarehouseTransfer/warehouseTransfer.reducer';
const appReducer = combineReducers({
authentication,
@@ -68,6 +69,7 @@ const appReducer = combineReducers({
plans,
creditNotes,
vendorCredit,
+ warehouseTransfers,
});
// Reset the state of a redux store
diff --git a/src/store/types.js b/src/store/types.js
index 3e509142f..079344984 100644
--- a/src/store/types.js
+++ b/src/store/types.js
@@ -30,6 +30,7 @@ import subscription from './subscription/subscription.types';
import inventoryAdjustments from './inventoryAdjustments/inventoryAdjustment.type';
import creditNote from './CreditNote/creditNote.type';
import vendorCredit from './VendorCredit/vendorCredit.type';
+import WarehouseTransfer from './WarehouseTransfer/warehouseTransfer.type';
import plans from './plans/plans.types';
export default {
@@ -65,5 +66,6 @@ export default {
...inventoryAdjustments,
...plans,
...creditNote,
- ...vendorCredit
+ ...vendorCredit,
+ ...WarehouseTransfer,
};
From e7024955dd056743c3f8787f9a141115b541fece Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 3 Feb 2022 01:02:31 +0200
Subject: [PATCH 16/30] feat(warehouseTransfer): warehouse transfer detail.
---
.../Alerts/Warehouses/WarehouseTransferDeleteAlert.js | 8 +++++++-
.../WarehouseTransferDetailActionsBar.js | 7 +++++--
.../WarehouseTransferDetailDrawerProvider.js | 4 +++-
.../WarehouseTransferDetailHeader.js | 2 +-
src/lang/en/index.json | 5 +++--
5 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/containers/Alerts/Warehouses/WarehouseTransferDeleteAlert.js b/src/containers/Alerts/Warehouses/WarehouseTransferDeleteAlert.js
index 936ccc97c..a602be329 100644
--- a/src/containers/Alerts/Warehouses/WarehouseTransferDeleteAlert.js
+++ b/src/containers/Alerts/Warehouses/WarehouseTransferDeleteAlert.js
@@ -7,6 +7,7 @@ import { useDeleteWarehouseTransfer } from 'hooks/query';
import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
import withAlertActions from 'containers/Alert/withAlertActions';
+import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { compose } from 'utils';
@@ -23,9 +24,12 @@ function WarehouseTransferDeleteAlert({
// #withAlertActions
closeAlert,
+
+ // #withDrawerActions
+ closeDrawer,
}) {
const { mutateAsync: deleteWarehouseTransferMutate, isLoading } =
- useDeleteWarehouseTransfer();
+ useDeleteWarehouseTransfer();
// handle cancel delete warehouse alert.
const handleCancelDeleteAlert = () => {
@@ -40,6 +44,7 @@ function WarehouseTransferDeleteAlert({
message: intl.get('warehouse_transfer.alert.delete_message'),
intent: Intent.SUCCESS,
});
+ closeDrawer('warehouse-transfer-detail-drawer');
})
.catch(
({
@@ -76,4 +81,5 @@ function WarehouseTransferDeleteAlert({
export default compose(
withAlertStoreConnect(),
withAlertActions,
+ withDrawerActions,
)(WarehouseTransferDeleteAlert);
diff --git a/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailActionsBar.js b/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailActionsBar.js
index 9202666f4..9a443d5d8 100644
--- a/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailActionsBar.js
+++ b/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailActionsBar.js
@@ -34,15 +34,18 @@ function WarehouseTransferDetailActionsBar({
}) {
const history = useHistory();
+ const { warehouseTransferId, warehouseTransfer } =
+ useWarehouseDetailDrawerContext();
+
// Handle edit warehosue transfer.
const handleEditWarehosueTransfer = () => {
- // history.push(`/warehouse-transfers/${warehouseTransferId}/edit`);
+ history.push(`/warehouses-transfers/${warehouseTransferId}/edit`);
closeDrawer('warehouse-transfer-detail-drawer');
};
// Handle delete warehouse transfer.
const handleDeletetWarehosueTransfer = () => {
- // openAlert('warehouse-transfer-delete', { warehouseTransferId });
+ openAlert('warehouse-transfer-delete', { warehouseTransferId });
};
return (
diff --git a/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailDrawerProvider.js b/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailDrawerProvider.js
index b470c954f..d6b6572b6 100644
--- a/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailDrawerProvider.js
+++ b/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailDrawerProvider.js
@@ -28,7 +28,9 @@ function WarehouseTransferDetailDrawerProvider({
-
Date: Thu, 3 Feb 2022 01:03:00 +0200
Subject: [PATCH 17/30] feat(warehouseTransfer): handle error.
---
.../WarehouseTransferForm.js | 4 ++++
.../WarehouseTransferForm/utils.js | 23 ++++++++++++++++---
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
index 760a8e306..c5990ba34 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
@@ -25,6 +25,7 @@ import { compose, orderingLinesIndexes, transactionNumber } from 'utils';
import {
defaultWarehouseTransfer,
transformValueToRequest,
+ transformErrors,
transformToEditForm,
} from './utils';
@@ -97,6 +98,9 @@ function WarehouseTransferForm({
data: { errors },
},
}) => {
+ if (errors) {
+ transformErrors(errors, { setErrors });
+ }
setSubmitting(false);
};
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js
index aad275728..d03dda138 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js
@@ -1,8 +1,9 @@
import React from 'react';
-import intl from 'react-intl-universal';
-import clsx from 'classnames';
-import { useFormikContext } from 'formik';
import moment from 'moment';
+import intl from 'react-intl-universal';
+import { Intent } from '@blueprintjs/core';
+import { useFormikContext } from 'formik';
+import { AppToaster } from 'components';
import { omit } from 'lodash';
import {
@@ -105,3 +106,19 @@ export function transformValueToRequest(values) {
})),
};
}
+
+/**
+ * Transformes the response errors types.
+ */
+export const transformErrors = (errors, { setErrors }) => {
+ if (
+ errors.some(({ type }) => type === 'WAREHOUSES_TRANSFER_SHOULD_NOT_BE_SAME')
+ ) {
+ AppToaster.show({
+ message: intl.get(
+ 'warehouse_transfer.error.could_not_transfer_item_from_source_to_destination',
+ ),
+ intent: Intent.DANGER,
+ });
+ }
+};
From 164eebd6ae6c90881c5dbc14f1e0199c63b993e2 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 3 Feb 2022 22:47:38 +0200
Subject: [PATCH 18/30] feat(RealizedGainorLoss): add realized gain or loss.
---
src/config/sidebarMenu.js | 4 +
.../RealizedGainOrLoss/RealizedGainOrLoss.js | 67 ++++++++++
.../RealizedGainOrLossActionsBar.js | 122 ++++++++++++++++++
.../RealizedGainOrLossGeneralPanel.js | 17 +++
.../RealizedGainOrLossHeader.js | 108 ++++++++++++++++
.../RealizedGainOrLossProvider.js | 22 ++++
.../RealizedGainOrLossTable.js | 21 +++
.../RealizedGainOrLoss/components.js | 18 +++
.../withRealizedGainOrLoss.js | 12 ++
.../withRealizedGainOrLossActions.js | 9 ++
src/hooks/query/types.js | 5 +-
src/routes/dashboard.js | 14 ++
.../financialStatements.actions.js | 15 ++-
.../financialStatements.reducer.js | 5 +
.../financialStatements.selectors.js | 14 ++
.../financialStatements.types.js | 1 +
16 files changed, 451 insertions(+), 3 deletions(-)
create mode 100644 src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss.js
create mode 100644 src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossActionsBar.js
create mode 100644 src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossGeneralPanel.js
create mode 100644 src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossHeader.js
create mode 100644 src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossProvider.js
create mode 100644 src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossTable.js
create mode 100644 src/containers/FinancialStatements/RealizedGainOrLoss/components.js
create mode 100644 src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLoss.js
create mode 100644 src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLossActions.js
diff --git a/src/config/sidebarMenu.js b/src/config/sidebarMenu.js
index 84fece5ab..bf82e5fe2 100644
--- a/src/config/sidebarMenu.js
+++ b/src/config/sidebarMenu.js
@@ -641,6 +641,10 @@ export default [
ability: ReportsAction.READ_AP_AGING_SUMMARY,
},
},
+ {
+ text:
+
+
+
+
+
+ );
+}
+
+export default compose(
+ withCurrentOrganization(({ organization }) => ({
+ organizationName: organization.name,
+ })),
+ withRealizedGainOrLossActions,
+)(RealizedGainOrLoss);
diff --git a/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossActionsBar.js b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossActionsBar.js
new file mode 100644
index 000000000..4b9ca3c9e
--- /dev/null
+++ b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossActionsBar.js
@@ -0,0 +1,122 @@
+import React from 'react';
+import {
+ NavbarGroup,
+ NavbarDivider,
+ Button,
+ Classes,
+ Popover,
+ PopoverInteractionKind,
+ Position,
+} from '@blueprintjs/core';
+import { FormattedMessage as T, Icon } from 'components';
+import classNames from 'classnames';
+
+import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
+import NumberFormatDropdown from 'components/NumberFormatDropdown';
+
+import { useRealizedGainOrLossContext } from './RealizedGainOrLossProvider';
+import withRealizedGainOrLoss from './withRealizedGainOrLoss';
+import withRealizedGainOrLossActions from './withRealizedGainOrLossActions';
+
+import { compose, saveInvoke } from 'utils';
+
+/**
+ * Realized Gain or Loss actions bar.
+ */
+function RealizedGainOrLossActionsBar({
+ //#withRealizedGainOrLoss
+ isFilterDrawerOpen,
+
+ //#withRealizedGainOrLossActions
+ toggleRealizedGainOrLossFilterDrawer,
+
+ //#ownProps
+ numberFormat,
+ onNumberFormatSubmit,
+}) {
+ // Handle filter toggle click.
+ const handleFilterToggleClick = () => {
+ toggleRealizedGainOrLossFilterDrawer();
+ };
+
+ // Handle recalculate report button.
+ const handleRecalculateReport = () => {};
+
+ // handle number format form submit.
+ const handleNumberFormatSubmit = (values) =>
+ saveInvoke(onNumberFormatSubmit, values);
+
+ return (
+
+
+ }
+ onClick={handleRecalculateReport}
+ icon={
+
+ );
+}
+
+export default compose(
+ withRealizedGainOrLoss(({ realizedGainOrLossDrawerFilter }) => ({
+ isFilterDrawerOpen: realizedGainOrLossDrawerFilter,
+ })),
+ withRealizedGainOrLossActions,
+)(RealizedGainOrLossActionsBar);
diff --git a/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossGeneralPanel.js b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossGeneralPanel.js
new file mode 100644
index 000000000..f08938a29
--- /dev/null
+++ b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossGeneralPanel.js
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import { Row, Col } from '../../../components';
+import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
+import SelectDisplayColumnsBy from '../SelectDisplayColumnsBy';
+
+/**
+ * Realized Gain or Loss header - General panel.
+ */
+export default function RealizedGainOrLossGeneralPanel() {
+ return (
+
+
+
+
+
+ );
+}
+
+export default compose(
+ withRealizedGainOrLoss(({ realizedGainOrLossDrawerFilter }) => ({
+ isFilterDrawerOpen: realizedGainOrLossDrawerFilter,
+ })),
+ withRealizedGainOrLossActions,
+)(RealizedGainOrLossHeader);
diff --git a/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossProvider.js b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossProvider.js
new file mode 100644
index 000000000..0c8fb18fc
--- /dev/null
+++ b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossProvider.js
@@ -0,0 +1,22 @@
+import React from 'react';
+import FinancialReportPage from '../FinancialReportPage';
+
+const RealizedGainOrLossContext = React.createContext();
+
+/**
+ * Realized Gain or Loss provider.
+ */
+function RealizedGainOrLossProvider({ filter, ...props }) {
+ const provider = {};
+
+ return (
+
+
+ );
+}
+
+const useRealizedGainOrLossContext = () =>
+ React.useContext(RealizedGainOrLossContext);
+
+export { RealizedGainOrLossProvider, useRealizedGainOrLossContext };
diff --git a/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossTable.js b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossTable.js
new file mode 100644
index 000000000..426a0997a
--- /dev/null
+++ b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossTable.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+
+import { DataTable } from 'components';
+import FinancialSheet from 'components/FinancialSheet';
+
+/**
+ * Realized Gain or Loss table.
+ */
+export default function RealizedGainOrLossTable({
+ // #ownProps
+ companyName,
+}) {
+ return (
+
+
+ );
+}
diff --git a/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLoss.js b/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLoss.js
new file mode 100644
index 000000000..5f923884a
--- /dev/null
+++ b/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLoss.js
@@ -0,0 +1,12 @@
+import { connect } from 'react-redux';
+import { getRealizedGainOrLossFilterDrawer } from '../../../store/financialStatement/financialStatements.selectors';
+
+export default (mapState) => {
+ const mapStateToProps = (state, props) => {
+ const mapped = {
+ realizedGainOrLossDrawerFilter: getRealizedGainOrLossFilterDrawer(state),
+ };
+ return mapState ? mapState(mapped, state, props) : mapped;
+ };
+ return connect(mapStateToProps);
+};
diff --git a/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLossActions.js b/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLossActions.js
new file mode 100644
index 000000000..95feefac5
--- /dev/null
+++ b/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLossActions.js
@@ -0,0 +1,9 @@
+import { connect } from 'react-redux';
+import { toggleRealizedGainOrLossFilterDrawer } from '../../../store/financialStatement/financialStatements.actions';
+
+const mapDispatchToProps = (dispatch) => ({
+ toggleRealizedGainOrLossFilterDrawer: (toggle) =>
+ dispatch(toggleRealizedGainOrLossFilterDrawer(toggle)),
+});
+
+export default connect(null, mapDispatchToProps);
diff --git a/src/hooks/query/types.js b/src/hooks/query/types.js
index 663ea5679..2950f27c7 100644
--- a/src/hooks/query/types.js
+++ b/src/hooks/query/types.js
@@ -24,6 +24,7 @@ const FINANCIAL_REPORTS = {
CASH_FLOW_STATEMENT: 'CASH_FLOW_STATEMENT',
INVENTORY_ITEM_DETAILS: 'INVENTORY_ITEM_DETAILS',
TRANSACTIONS_BY_REFERENCE: 'TRANSACTIONS_BY_REFERENCE',
+ REALIZED_GAIN_OR_LOSS: 'REALIZED_GAIN_OR_LOSS',
};
const BILLS = {
@@ -195,11 +196,11 @@ const TARNSACTIONS_LOCKING = {
const WAREHOUSES = {
WAREHOUSE: 'WAREHOUSE',
WAREHOUSES: 'WAREHOUSES',
-}
+};
const WAREHOUSE_TRANSFERS = {
WAREHOUSE_TRANSFER: 'WAREHOUSE_TRANSFER',
WAREHOUSE_TRANSFERS: 'WAREHOUSE_TRANSFERS',
-}
+};
const BRANCHES = {
BRANCHES: 'BRANCHES',
BRANCH: 'BRANCH',
diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js
index 8877b2396..866c6d30a 100644
--- a/src/routes/dashboard.js
+++ b/src/routes/dashboard.js
@@ -376,6 +376,20 @@ export const getDashboardRoutes = () => [
sidebarExpand: false,
subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
},
+ {
+ path: `/financial-reports/realized-gain-loss`,
+ component: lazy(() =>
+ import(
+ '../containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss'
+ ),
+ ),
+
+ breadcrumb: intl.get('realized_gain_or_loss.label'),
+ pageTitle: intl.get('realized_gain_or_loss.label'),
+ backLink: true,
+ sidebarExpand: false,
+ subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
+ },
{
path: '/financial-reports',
component: lazy(() =>
diff --git a/src/store/financialStatement/financialStatements.actions.js b/src/store/financialStatement/financialStatements.actions.js
index 0ef8f9a41..b1229fd9e 100644
--- a/src/store/financialStatement/financialStatements.actions.js
+++ b/src/store/financialStatement/financialStatements.actions.js
@@ -196,7 +196,7 @@ export function toggleCashFlowStatementFilterDrawer(toggle) {
* Toggles display of the inventory item details filter drawer.
* @param {boolean} toggle
*/
- export function toggleInventoryItemDetailsFilterDrawer(toggle) {
+export function toggleInventoryItemDetailsFilterDrawer(toggle) {
return {
type: `${t.INVENTORY_ITEM_DETAILS}/${t.DISPLAY_FILTER_DRAWER_TOGGLE}`,
payload: {
@@ -204,3 +204,16 @@ export function toggleCashFlowStatementFilterDrawer(toggle) {
},
};
}
+
+/**
+ * Toggle display of the Realized Gain or Loss filter drawer.
+ * @param {boolean} toggle
+ */
+export function toggleRealizedGainOrLossCilterDrawer(toggle) {
+ return {
+ type: `${t.REALIZED_GAIN_OR_LOSS}/${t.DISPLAY_FILTER_DRAWER_TOGGLE}`,
+ payload: {
+ toggle,
+ },
+ };
+}
diff --git a/src/store/financialStatement/financialStatements.reducer.js b/src/store/financialStatement/financialStatements.reducer.js
index 63fea46b2..9c6e0a1ff 100644
--- a/src/store/financialStatement/financialStatements.reducer.js
+++ b/src/store/financialStatement/financialStatements.reducer.js
@@ -51,6 +51,9 @@ const initialState = {
inventoryItemDetails: {
displayFilterDrawer: false,
},
+ realizedGainOrLoss: {
+ displayFilterDrawer: false,
+ },
};
/**
@@ -102,4 +105,6 @@ export default createReducer(initialState, {
t.INVENTORY_ITEM_DETAILS,
'inventoryItemDetails',
),
+ ...financialStatementFilterToggle(t.REALIZED_GAIN_OR_LOSS, 'realizedGainOrLoss'),
+
});
diff --git a/src/store/financialStatement/financialStatements.selectors.js b/src/store/financialStatement/financialStatements.selectors.js
index f19337fa2..83de44342 100644
--- a/src/store/financialStatement/financialStatements.selectors.js
+++ b/src/store/financialStatement/financialStatements.selectors.js
@@ -73,6 +73,10 @@ export const inventoryItemDetailsDrawerFilter = (state) => {
return filterDrawerByTypeSelector('inventoryItemDetails')(state);
};
+export const realizedGainOrLossFilterDrawerSelector = (state) => {
+ return filterDrawerByTypeSelector('realizedGainOrLoss')(state);
+};
+
/**
* Retrieve balance sheet filter drawer.
*/
@@ -239,3 +243,13 @@ export const getInventoryItemDetailsFilterDrawer = createSelector(
return isOpen;
},
);
+
+/**
+ * Retrieve Realized Gain or Loss filter drawer.
+ */
+export const getRealizedGainOrLossFilterDrawer = createSelector(
+ realizedGainOrLossFilterDrawerSelector,
+ (isOpen) => {
+ return isOpen;
+ },
+);
diff --git a/src/store/financialStatement/financialStatements.types.js b/src/store/financialStatement/financialStatements.types.js
index ef82d5b92..cdda1f369 100644
--- a/src/store/financialStatement/financialStatements.types.js
+++ b/src/store/financialStatement/financialStatements.types.js
@@ -16,4 +16,5 @@ export default {
VENDORS_TRANSACTIONS: 'VENDORS TRANSACTIONS',
CASH_FLOW_STATEMENT: 'CASH FLOW STATEMENT',
INVENTORY_ITEM_DETAILS: 'INVENTORY ITEM DETAILS',
+ REALIZED_GAIN_OR_LOSS: 'REALIZED GAIN OR LOSS',
};
From 39d0e9c198051854316404c0c161ac1285e973c5 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 3 Feb 2022 22:47:56 +0200
Subject: [PATCH 19/30] feat(UnrealizedGainorLoss): add Unrealized gain or
loss.
---
src/config/sidebarMenu.js | 4 +
.../UnrealizedGainOrLoss.js | 65 ++++++++++
.../UnrealizedGainOrLossActionsBar.js | 122 ++++++++++++++++++
.../UnrealizedGainOrLossGeneralPanel.js | 17 +++
.../UnrealizedGainOrLossHeader.js | 108 ++++++++++++++++
.../UnrealizedGainOrLossProvider.js | 22 ++++
.../UnrealizedGainOrLossTable.js | 21 +++
.../UnrealizedGainOrLoss/components.js | 18 +++
.../withUnrealizedGainOrLoss.js | 12 ++
.../withUnrealizedGainOrLossActions.js | 9 ++
src/hooks/query/types.js | 1 +
src/lang/en/index.json | 4 +-
src/routes/dashboard.js | 14 +-
.../financialStatements.actions.js | 15 ++-
.../financialStatements.reducer.js | 4 +
.../financialStatements.selectors.js | 13 ++
.../financialStatements.types.js | 1 +
17 files changed, 447 insertions(+), 3 deletions(-)
create mode 100644 src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLoss.js
create mode 100644 src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossActionsBar.js
create mode 100644 src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossGeneralPanel.js
create mode 100644 src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossHeader.js
create mode 100644 src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossProvider.js
create mode 100644 src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossTable.js
create mode 100644 src/containers/FinancialStatements/UnrealizedGainOrLoss/components.js
create mode 100644 src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLoss.js
create mode 100644 src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLossActions.js
diff --git a/src/config/sidebarMenu.js b/src/config/sidebarMenu.js
index bf82e5fe2..480fa72e8 100644
--- a/src/config/sidebarMenu.js
+++ b/src/config/sidebarMenu.js
@@ -645,6 +645,10 @@ export default [
text:
+
+
+
+
+
+ );
+}
+
+export default compose(
+ withCurrentOrganization(({ organization }) => ({
+ organizationName: organization.name,
+ })),
+ withUnrealizedGainOrLossActions,
+)(UnrealizedGainOrLoss);
diff --git a/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossActionsBar.js b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossActionsBar.js
new file mode 100644
index 000000000..7e342ce3e
--- /dev/null
+++ b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossActionsBar.js
@@ -0,0 +1,122 @@
+import React from 'react';
+import {
+ NavbarGroup,
+ NavbarDivider,
+ Button,
+ Classes,
+ Popover,
+ PopoverInteractionKind,
+ Position,
+} from '@blueprintjs/core';
+import { FormattedMessage as T, Icon } from 'components';
+import classNames from 'classnames';
+
+import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
+import NumberFormatDropdown from 'components/NumberFormatDropdown';
+
+import { useUnrealizedGainOrLossContext } from './UnrealizedGainOrLossProvider';
+import withUnrealizedGainOrLoss from './withUnrealizedGainOrLoss';
+import withUnrealizedGainOrLossActions from './withUnrealizedGainOrLossActions';
+
+import { compose, saveInvoke } from 'utils';
+
+/**
+ * unrealized Gain or Loss actions bar.
+ */
+function UnrealizedGainOrLossActionsBar({
+ //#withRealizedGainOrLoss
+ isFilterDrawerOpen,
+
+ //#withRealizedGainOrLossActions
+ toggleUnrealizedGainOrLossFilterDrawer,
+
+ //#ownProps
+ numberFormat,
+ onNumberFormatSubmit,
+}) {
+ // Handle filter toggle click.
+ const handleFilterToggleClick = () => {
+ toggleUnrealizedGainOrLossFilterDrawer();
+ };
+
+ // Handle recalculate report button.
+ const handleRecalculateReport = () => {};
+
+ // handle number format form submit.
+ const handleNumberFormatSubmit = (values) =>
+ saveInvoke(onNumberFormatSubmit, values);
+
+ return (
+
+
+ }
+ onClick={handleRecalculateReport}
+ icon={
+
+ );
+}
+
+export default compose(
+ withUnrealizedGainOrLoss(({ unrealizedGainOrLossDrawerFilter }) => ({
+ isFilterDrawerOpen: unrealizedGainOrLossDrawerFilter,
+ })),
+ withUnrealizedGainOrLossActions,
+)(UnrealizedGainOrLossActionsBar);
diff --git a/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossGeneralPanel.js b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossGeneralPanel.js
new file mode 100644
index 000000000..7bb912da0
--- /dev/null
+++ b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossGeneralPanel.js
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import { Row, Col } from '../../../components';
+import FinancialStatementDateRange from 'containers/FinancialStatements/FinancialStatementDateRange';
+import SelectDisplayColumnsBy from '../SelectDisplayColumnsBy';
+
+/**
+ * Unrealized Gain or Loss header - General panel.
+ */
+export default function UnrealizedGainOrLossGeneralPanel() {
+ return (
+
+
+
+
+
+ );
+}
+
+export default compose(
+ withUnrealizedGainOrLoss(({ unrealizedGainOrLossDrawerFilter }) => ({
+ isFilterDrawerOpen: unrealizedGainOrLossDrawerFilter,
+ })),
+ withUnrealizedGainOrLossActions,
+)(UnrealizedGainOrLossHeader);
diff --git a/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossProvider.js b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossProvider.js
new file mode 100644
index 000000000..a9400489a
--- /dev/null
+++ b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossProvider.js
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import FinancialReportPage from '../FinancialReportPage';
+
+const UnrealizedGainOrLossContext = React.createContext();
+
+/**
+ * Unrealized Gain or Loss provider.
+ */
+function UnrealizedGainOrLossProvider({ filter, ...props }) {
+ const provider = {};
+ return (
+
+
+ );
+}
+
+const useUnrealizedGainOrLossContext = () =>
+ React.useContext(UnrealizedGainOrLossContext);
+
+export { UnrealizedGainOrLossProvider, useUnrealizedGainOrLossContext };
diff --git a/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossTable.js b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossTable.js
new file mode 100644
index 000000000..a5a99558c
--- /dev/null
+++ b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossTable.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+
+import { DataTable } from 'components';
+import FinancialSheet from 'components/FinancialSheet';
+
+/**
+ * Unrealized Gain or Loss table.
+ */
+export default function UnrealizedGainOrLossTable({
+ // #ownProps
+ companyName,
+}) {
+ return (
+
+
+ );
+}
diff --git a/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLoss.js b/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLoss.js
new file mode 100644
index 000000000..4017486dd
--- /dev/null
+++ b/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLoss.js
@@ -0,0 +1,12 @@
+import { connect } from 'react-redux';
+import { getUnrealizedGainOrLossFilterDrawer } from '../../../store/financialStatement/financialStatements.selectors';
+
+export default (mapState) => {
+ const mapStateToProps = (state, props) => {
+ const mapped = {
+ unrealizedGainOrLossDrawerFilter: getUnrealizedGainOrLossFilterDrawer(state),
+ };
+ return mapState ? mapState(mapped, state, props) : mapped;
+ };
+ return connect(mapStateToProps);
+};
diff --git a/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLossActions.js b/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLossActions.js
new file mode 100644
index 000000000..4c51a85dc
--- /dev/null
+++ b/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLossActions.js
@@ -0,0 +1,9 @@
+import { connect } from 'react-redux';
+import { toggleUnrealizedGainOrLossFilterDrawer } from '../../../store/financialStatement/financialStatements.actions';
+
+const mapDispatchToProps = (dispatch) => ({
+ toggleUnrealizedGainOrLossFilterDrawer: (toggle) =>
+ dispatch(toggleUnrealizedGainOrLossFilterDrawer(toggle)),
+});
+
+export default connect(null, mapDispatchToProps);
diff --git a/src/hooks/query/types.js b/src/hooks/query/types.js
index 2950f27c7..f4c10d1e4 100644
--- a/src/hooks/query/types.js
+++ b/src/hooks/query/types.js
@@ -25,6 +25,7 @@ const FINANCIAL_REPORTS = {
INVENTORY_ITEM_DETAILS: 'INVENTORY_ITEM_DETAILS',
TRANSACTIONS_BY_REFERENCE: 'TRANSACTIONS_BY_REFERENCE',
REALIZED_GAIN_OR_LOSS: 'REALIZED_GAIN_OR_LOSS',
+ UNREALIZED_GAIN_OR_LOSS: 'UNREALIZED_GAIN_OR_LOSS',
};
const BILLS = {
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index b5d16acc1..25e10793f 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -1824,5 +1824,7 @@
"branch.dialog.label.website": "Website",
"branch.dialog.success_message": "The branch has been created successfully.",
"branch.alert.delete_message":"The branch has been deleted successfully",
- "branch.once_delete_this_branch":"Once you delete this branch, you won't be able to restore it later. Are you sure you want to delete this branch?"
+ "branch.once_delete_this_branch":"Once you delete this branch, you won't be able to restore it later. Are you sure you want to delete this branch?",
+ "realized_gain_or_loss.label":"Realized Gain or Loss",
+ "unrealized_gain_or_loss.label":"Unrealized Gain or Loss"
}
\ No newline at end of file
diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js
index 866c6d30a..b68457202 100644
--- a/src/routes/dashboard.js
+++ b/src/routes/dashboard.js
@@ -383,13 +383,25 @@ export const getDashboardRoutes = () => [
'../containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss'
),
),
-
breadcrumb: intl.get('realized_gain_or_loss.label'),
pageTitle: intl.get('realized_gain_or_loss.label'),
backLink: true,
sidebarExpand: false,
subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
},
+ {
+ path: `/financial-reports/unrealized-gain-loss`,
+ component: lazy(() =>
+ import(
+ '../containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLoss'
+ ),
+ ),
+ breadcrumb: intl.get('unrealized_gain_or_loss.label'),
+ pageTitle: intl.get('unrealized_gain_or_loss.label'),
+ backLink: true,
+ sidebarExpand: false,
+ subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
+ },
{
path: '/financial-reports',
component: lazy(() =>
diff --git a/src/store/financialStatement/financialStatements.actions.js b/src/store/financialStatement/financialStatements.actions.js
index b1229fd9e..7e6abef03 100644
--- a/src/store/financialStatement/financialStatements.actions.js
+++ b/src/store/financialStatement/financialStatements.actions.js
@@ -209,7 +209,7 @@ export function toggleInventoryItemDetailsFilterDrawer(toggle) {
* Toggle display of the Realized Gain or Loss filter drawer.
* @param {boolean} toggle
*/
-export function toggleRealizedGainOrLossCilterDrawer(toggle) {
+export function toggleRealizedGainOrLossFilterDrawer(toggle) {
return {
type: `${t.REALIZED_GAIN_OR_LOSS}/${t.DISPLAY_FILTER_DRAWER_TOGGLE}`,
payload: {
@@ -217,3 +217,16 @@ export function toggleRealizedGainOrLossCilterDrawer(toggle) {
},
};
}
+
+/**
+ * Toggle display of the Unrealized Gain or Loss filter drawer.
+ * @param {boolean} toggle
+ */
+export function toggleUnrealizedGainOrLossFilterDrawer(toggle) {
+ return {
+ type: `${t.UNREALIZED_GAIN_OR_LOSS}/${t.DISPLAY_FILTER_DRAWER_TOGGLE}`,
+ payload: {
+ toggle,
+ },
+ };
+}
diff --git a/src/store/financialStatement/financialStatements.reducer.js b/src/store/financialStatement/financialStatements.reducer.js
index 9c6e0a1ff..8f206db6c 100644
--- a/src/store/financialStatement/financialStatements.reducer.js
+++ b/src/store/financialStatement/financialStatements.reducer.js
@@ -54,6 +54,9 @@ const initialState = {
realizedGainOrLoss: {
displayFilterDrawer: false,
},
+ unrealizedGainOrLoss: {
+ displayFilterDrawer: false,
+ },
};
/**
@@ -106,5 +109,6 @@ export default createReducer(initialState, {
'inventoryItemDetails',
),
...financialStatementFilterToggle(t.REALIZED_GAIN_OR_LOSS, 'realizedGainOrLoss'),
+ ...financialStatementFilterToggle(t.UNREALIZED_GAIN_OR_LOSS, 'unrealizedGainOrLoss'),
});
diff --git a/src/store/financialStatement/financialStatements.selectors.js b/src/store/financialStatement/financialStatements.selectors.js
index 83de44342..a554ebb37 100644
--- a/src/store/financialStatement/financialStatements.selectors.js
+++ b/src/store/financialStatement/financialStatements.selectors.js
@@ -77,6 +77,10 @@ export const realizedGainOrLossFilterDrawerSelector = (state) => {
return filterDrawerByTypeSelector('realizedGainOrLoss')(state);
};
+export const unrealizedGainOrLossFilterDrawerSelector = (state) => {
+ return filterDrawerByTypeSelector('unrealizedGainOrLoss')(state);
+};
+
/**
* Retrieve balance sheet filter drawer.
*/
@@ -253,3 +257,12 @@ export const getRealizedGainOrLossFilterDrawer = createSelector(
return isOpen;
},
);
+/**
+ * Retrieve Unrealized Gain or Loss filter drawer.
+ */
+export const getUnrealizedGainOrLossFilterDrawer = createSelector(
+ unrealizedGainOrLossFilterDrawerSelector,
+ (isOpen) => {
+ return isOpen;
+ },
+);
diff --git a/src/store/financialStatement/financialStatements.types.js b/src/store/financialStatement/financialStatements.types.js
index cdda1f369..98d37a1d5 100644
--- a/src/store/financialStatement/financialStatements.types.js
+++ b/src/store/financialStatement/financialStatements.types.js
@@ -17,4 +17,5 @@ export default {
CASH_FLOW_STATEMENT: 'CASH FLOW STATEMENT',
INVENTORY_ITEM_DETAILS: 'INVENTORY ITEM DETAILS',
REALIZED_GAIN_OR_LOSS: 'REALIZED GAIN OR LOSS',
+ UNREALIZED_GAIN_OR_LOSS: 'UNREALIZED GAIN OR LOSS',
};
From a368e5572b371d0fb63a0c7eac9b47cfefc38a2a Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Sun, 6 Feb 2022 09:58:38 +0200
Subject: [PATCH 20/30] Revert "feat(warehouse) add warehouse propover."
This reverts commit 2aa26959e924af32a49bb943f2e5877dfede0ae9.
---
.../DataTableCells/NumericInputCell.js | 4 +-
.../DataTableCells/RadioFieldCell.js | 44 -----------
src/components/DataTableCells/index.js | 2 -
.../WarehouseListPopover/WarehousesList.js | 75 -------------------
.../WarehouseListPopover/components.js | 38 ----------
src/containers/WarehouseListPopover/index.js | 36 ---------
6 files changed, 1 insertion(+), 198 deletions(-)
delete mode 100644 src/components/DataTableCells/RadioFieldCell.js
delete mode 100644 src/containers/WarehouseListPopover/WarehousesList.js
delete mode 100644 src/containers/WarehouseListPopover/components.js
delete mode 100644 src/containers/WarehouseListPopover/index.js
diff --git a/src/components/DataTableCells/NumericInputCell.js b/src/components/DataTableCells/NumericInputCell.js
index 5e6c5d245..eaf933fb8 100644
--- a/src/components/DataTableCells/NumericInputCell.js
+++ b/src/components/DataTableCells/NumericInputCell.js
@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
import { FormGroup, NumericInput, Intent } from '@blueprintjs/core';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
-import WarehouseListPopover from '../../containers/WarehouseListPopover';
/**
* Numeric input table cell.
@@ -37,8 +36,7 @@ export default function NumericInputCell({
onValueChange={handleValueChange}
onBlur={onBlur}
fill={true}
- buttonPosition={'none'}
- rightElement={
-
- );
-};
-
-export default RadioEditableCell;
diff --git a/src/components/DataTableCells/index.js b/src/components/DataTableCells/index.js
index 4e0a42835..fed349eed 100644
--- a/src/components/DataTableCells/index.js
+++ b/src/components/DataTableCells/index.js
@@ -9,7 +9,6 @@ import NumericInputCell from './NumericInputCell';
import CheckBoxFieldCell from './CheckBoxFieldCell';
import SwitchFieldCell from './SwitchFieldCell';
import TextAreaCell from './TextAreaCell';
-import RadioFieldCell from './RadioFieldCell';
export {
AccountsListFieldCell,
@@ -24,5 +23,4 @@ export {
CheckBoxFieldCell,
SwitchFieldCell,
TextAreaCell,
- RadioFieldCell,
};
diff --git a/src/containers/WarehouseListPopover/WarehousesList.js b/src/containers/WarehouseListPopover/WarehousesList.js
deleted file mode 100644
index 15c85743c..000000000
--- a/src/containers/WarehouseListPopover/WarehousesList.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { CLASSES } from 'common/classes';
-import { TableStyle } from '../../common';
-import { DataTableEditable, DataTable } from 'components';
-import { compose, saveInvoke, updateTableCell } from 'utils';
-import { useWarehouseEntriesColumns } from './components';
-
-export default function IntegrateWarehousesTable({
- // #ownProps
- initialWarehouse,
- selectedWarehouseId,
- onUpdateData,
- entries,
- errors,
-}) {
- const [rows, setRows] = React.useState(initialWarehouse);
-
- // warehouses entries columns.
- const columns = useWarehouseEntriesColumns();
-
- // Handle update data.
- const handleUpdateData = React.useCallback(
- (rowIndex, columnId, value) => {
- const newRows = compose(updateTableCell(rowIndex, columnId, value))(
- entries,
- );
- onUpdateData(newRows);
- },
- [onUpdateData, entries],
- );
-
- const DATA = [
- {
- warehouse_name: true,
- quantity: '9,444',
- availiable_for_sale: 0,
- },
- {
- warehouse_name: false,
- quantity: '19,444',
- availiable_for_sale: 0,
- },
- ];
-
- return (
- →
-
- );
-}
-
-const PopoverLink = styled.button`
- border: 0;
- cursor: pointer;
- background: transparent;
- margin-top: 18px;
- padding-right: 0px;
- color: #0052cc;
-
- &:hover,
- &:active {
- text-decoration: underline;
- }
-`;
From fe3314b5cb014cd02ff48411b8e67d3df458c5c7 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Mon, 7 Feb 2022 13:16:46 +0200
Subject: [PATCH 21/30] feat(invoice): add branch & warehouse.
---
src/components/CustomSelectList.js | 103 +++++++
src/components/index.js | 2 +
.../Invoices/InvoiceForm/BaseCurrency.js | 34 +++
.../Sales/Invoices/InvoiceForm/FlagKit.js | 20 ++
.../Sales/Invoices/InvoiceForm/InvoiceForm.js | 2 +
.../InvoiceForm/InvoiceFormHeaderFields.js | 275 ++++++++++++------
.../InvoiceForm/InvoiceFormProvider.js | 12 +
.../Invoices/InvoiceForm/InvoiceFormTopBar.js | 55 ++++
src/static/json/icons.js | 12 +
src/static/svg/AD.svg | 35 +++
src/static/svg/AE.svg | 33 +++
src/static/svg/AF.svg | 34 +++
src/static/svg/AG.svg | 44 +++
src/static/svg/AI.svg | 50 ++++
src/static/svg/AL.svg | 27 ++
src/static/svg/AM.svg | 32 ++
src/static/svg/AO.svg | 37 +++
src/static/svg/AR.svg | 26 ++
src/static/svg/AS.svg | 36 +++
src/static/svg/AT.svg | 24 ++
src/static/svg/AU.svg | 36 +++
src/static/svg/AW.svg | 30 ++
src/static/svg/AX.svg | 32 ++
src/static/svg/AZ.svg | 33 +++
src/static/svg/BA.svg | 32 ++
src/static/svg/BB.svg | 38 +++
src/static/svg/BD.svg | 27 ++
src/static/svg/BE.svg | 32 ++
src/static/svg/BF.svg | 28 ++
src/static/svg/BG.svg | 28 ++
src/static/svg/BH.svg | 23 ++
src/static/svg/BI.svg | 36 +++
src/static/svg/BJ.svg | 32 ++
src/static/svg/BL.svg | 42 +++
src/static/svg/BM.svg | 49 ++++
src/static/svg/BN.svg | 28 ++
src/static/svg/BO.svg | 32 ++
src/static/svg/BR.svg | 35 +++
src/static/svg/BS.svg | 33 +++
src/static/svg/BT.svg | 27 ++
src/static/svg/BV.svg | 28 ++
src/static/svg/BW.svg | 29 ++
src/static/svg/BY.svg | 30 ++
src/static/svg/BZ.svg | 30 ++
src/static/svg/CA.svg | 25 ++
src/static/svg/CC.svg | 33 +++
src/static/svg/CD.svg | 31 ++
src/static/svg/CF.svg | 43 +++
src/static/svg/CG.svg | 34 +++
src/static/svg/CH.svg | 23 ++
src/static/svg/CI.svg | 28 ++
src/static/svg/CK.svg | 31 ++
src/static/svg/CL.svg | 29 ++
src/static/svg/CM.svg | 38 +++
src/static/svg/CN.svg | 32 ++
src/static/svg/CO.svg | 32 ++
src/static/svg/CR.svg | 29 ++
src/static/svg/CU.svg | 32 ++
src/static/svg/CV.svg | 30 ++
src/static/svg/CW.svg | 29 ++
src/static/svg/CX.svg | 38 +++
src/static/svg/CY.svg | 24 ++
src/static/svg/CZ.svg | 28 ++
src/static/svg/DE.svg | 32 ++
src/static/svg/DJ.svg | 33 +++
src/static/svg/DK.svg | 23 ++
src/static/svg/DM.svg | 41 +++
src/static/svg/DO.svg | 33 +++
src/static/svg/DZ.svg | 29 ++
src/static/svg/EC.svg | 39 +++
src/static/svg/EE.svg | 28 ++
src/static/svg/EG.svg | 30 ++
src/static/svg/ER.svg | 40 +++
src/static/svg/ES.svg | 34 +++
src/static/svg/ET.svg | 42 +++
src/static/svg/EU.svg | 27 ++
src/static/svg/FI.svg | 22 ++
src/static/svg/FJ.svg | 51 ++++
src/static/svg/FK.svg | 58 ++++
src/static/svg/FM.svg | 23 ++
src/static/svg/FO.svg | 27 ++
src/static/svg/FR.svg | 28 ++
src/static/svg/GA.svg | 32 ++
src/static/svg/GB-ENG.svg | 22 ++
src/static/svg/GB-NIR.svg | 41 +++
src/static/svg/GB-SCT.svg | 23 ++
src/static/svg/GB-WLS.svg | 28 ++
src/static/svg/GB-ZET.svg | 23 ++
src/static/svg/GB.svg | 32 ++
src/static/svg/GD.svg | 49 ++++
src/static/svg/GE.svg | 26 ++
src/static/svg/GF.svg | 32 ++
src/static/svg/GG.svg | 27 ++
src/static/svg/GH.svg | 37 +++
src/static/svg/GI.svg | 38 +++
src/static/svg/GL.svg | 33 +++
src/static/svg/GM.svg | 33 +++
src/static/svg/GN.svg | 32 ++
src/static/svg/GP.svg | 40 +++
src/static/svg/GQ.svg | 34 +++
src/static/svg/GR.svg | 22 ++
src/static/svg/GS.svg | 112 +++++++
src/static/svg/GT.svg | 26 ++
src/static/svg/GU.svg | 65 +++++
src/static/svg/GW.svg | 37 +++
src/static/svg/GY.svg | 42 +++
src/static/svg/HK.svg | 23 ++
src/static/svg/HM.svg | 36 +++
src/static/svg/HN.svg | 33 +++
src/static/svg/HR.svg | 35 +++
src/static/svg/HT.svg | 46 +++
src/static/svg/HU.svg | 28 ++
src/static/svg/ID.svg | 23 ++
src/static/svg/IE.svg | 28 ++
src/static/svg/IL.svg | 26 ++
src/static/svg/IM.svg | 30 ++
src/static/svg/IN.svg | 31 ++
src/static/svg/IO.svg | 33 +++
src/static/svg/IQ.svg | 33 +++
src/static/svg/IR.svg | 31 ++
src/static/svg/IS.svg | 28 ++
src/static/svg/IT.svg | 28 ++
src/static/svg/JE.svg | 32 ++
src/static/svg/JM.svg | 33 +++
src/static/svg/JO.svg | 34 +++
src/static/svg/JP.svg | 22 ++
src/static/svg/KE.svg | 43 +++
src/static/svg/KG.svg | 28 ++
src/static/svg/KH.svg | 29 ++
src/static/svg/KI.svg | 35 +++
src/static/svg/KM.svg | 39 +++
src/static/svg/KN.svg | 39 +++
src/static/svg/KP.svg | 30 ++
src/static/svg/KR.svg | 38 +++
src/static/svg/KW.svg | 33 +++
src/static/svg/KY.svg | 44 +++
src/static/svg/KZ.svg | 29 ++
src/static/svg/LA.svg | 29 ++
src/static/svg/LB.svg | 29 ++
src/static/svg/LC.svg | 33 +++
src/static/svg/LGBT.svg | 42 +++
src/static/svg/LI.svg | 27 ++
src/static/svg/LK.svg | 43 +++
src/static/svg/LR.svg | 36 +++
src/static/svg/LS.svg | 34 +++
src/static/svg/LT.svg | 32 ++
src/static/svg/LU.svg | 28 ++
src/static/svg/LV.svg | 24 ++
src/static/svg/LY.svg | 33 +++
src/static/svg/MA.svg | 23 ++
src/static/svg/MC.svg | 23 ++
src/static/svg/MD.svg | 42 +++
src/static/svg/ME.svg | 29 ++
src/static/svg/MF.svg | 28 ++
src/static/svg/MG.svg | 28 ++
src/static/svg/MH.svg | 29 ++
src/static/svg/MK.svg | 29 ++
src/static/svg/ML.svg | 32 ++
src/static/svg/MM.svg | 33 +++
src/static/svg/MN.svg | 33 +++
src/static/svg/MO.svg | 26 ++
src/static/svg/MP.svg | 29 ++
src/static/svg/MQ.svg | 27 ++
src/static/svg/MR.svg | 27 ++
src/static/svg/MS.svg | 47 +++
src/static/svg/MT.svg | 29 ++
src/static/svg/MU.svg | 37 +++
src/static/svg/MV.svg | 28 ++
src/static/svg/MW.svg | 33 +++
src/static/svg/MX.svg | 30 ++
src/static/svg/MY.svg | 32 ++
src/static/svg/MZ.svg | 43 +++
src/static/svg/NA.svg | 75 +++++
src/static/svg/NC.svg | 42 +++
src/static/svg/NE.svg | 33 +++
src/static/svg/NF.svg | 29 ++
src/static/svg/NG.svg | 24 ++
src/static/svg/NI.svg | 26 ++
src/static/svg/NL.svg | 28 ++
src/static/svg/NO.svg | 28 ++
src/static/svg/NP.svg | 35 +++
src/static/svg/NR.svg | 28 ++
src/static/svg/NU.svg | 41 +++
src/static/svg/NZ.svg | 34 +++
src/static/svg/OM.svg | 29 ++
src/static/svg/PA.svg | 30 ++
src/static/svg/PE.svg | 24 ++
src/static/svg/PF.svg | 52 ++++
src/static/svg/PG.svg | 36 +++
src/static/svg/PH.svg | 33 +++
src/static/svg/PK.svg | 32 ++
src/static/svg/PL.svg | 23 ++
src/static/svg/PM.svg | 66 +++++
src/static/svg/PN.svg | 51 ++++
src/static/svg/PR.svg | 30 ++
src/static/svg/PS.svg | 33 +++
src/static/svg/PT.svg | 38 +++
src/static/svg/PW.svg | 27 ++
src/static/svg/PY.svg | 30 ++
src/static/svg/QA.svg | 23 ++
src/static/svg/RE.svg | 28 ++
src/static/svg/RO.svg | 32 ++
src/static/svg/RS.svg | 39 +++
src/static/svg/RU.svg | 28 ++
src/static/svg/RW.svg | 37 +++
src/static/svg/SA.svg | 26 ++
src/static/svg/SB.svg | 39 +++
src/static/svg/SC.svg | 43 +++
src/static/svg/SD.svg | 33 +++
src/static/svg/SE.svg | 27 ++
src/static/svg/SG.svg | 24 ++
src/static/svg/SH.svg | 53 ++++
src/static/svg/SI.svg | 28 ++
src/static/svg/SJ.svg | 28 ++
src/static/svg/SK.svg | 46 +++
src/static/svg/SL.svg | 28 ++
src/static/svg/SM.svg | 25 ++
src/static/svg/SN.svg | 33 +++
src/static/svg/SO.svg | 23 ++
src/static/svg/SR.svg | 34 +++
src/static/svg/SS.svg | 44 +++
src/static/svg/ST.svg | 39 +++
src/static/svg/SV.svg | 30 ++
src/static/svg/SX.svg | 45 +++
src/static/svg/SY.svg | 34 +++
src/static/svg/SZ.svg | 47 +++
src/static/svg/TC.svg | 40 +++
src/static/svg/TD.svg | 32 ++
src/static/svg/TF.svg | 35 +++
src/static/svg/TG.svg | 33 +++
src/static/svg/TH.svg | 29 ++
src/static/svg/TJ.svg | 29 ++
src/static/svg/TK.svg | 31 ++
src/static/svg/TL.svg | 33 +++
src/static/svg/TM.svg | 74 +++++
src/static/svg/TN.svg | 23 ++
src/static/svg/TO.svg | 28 ++
src/static/svg/TR.svg | 23 ++
src/static/svg/TT.svg | 28 ++
src/static/svg/TV.svg | 36 +++
src/static/svg/TW.svg | 28 ++
src/static/svg/TZ.svg | 37 +++
src/static/svg/UA.svg | 27 ++
src/static/svg/UG.svg | 37 +++
src/static/svg/UM.svg | 28 ++
src/static/svg/US-CA.svg | 33 +++
src/static/svg/US.svg | 28 ++
src/static/svg/UY.svg | 29 ++
src/static/svg/UZ.svg | 29 ++
src/static/svg/VA.svg | 39 +++
src/static/svg/VC.svg | 37 +++
src/static/svg/VE.svg | 33 +++
src/static/svg/VG.svg | 42 +++
src/static/svg/VI.svg | 49 ++++
src/static/svg/VN.svg | 27 ++
src/static/svg/VU.svg | 38 +++
src/static/svg/WF.svg | 28 ++
src/static/svg/WS.svg | 28 ++
src/static/svg/XK.svg | 28 ++
src/static/svg/YE.svg | 28 ++
src/static/svg/YT.svg | 77 +++++
src/static/svg/ZA.svg | 44 +++
src/static/svg/ZM.svg | 42 +++
src/static/svg/ZW.svg | 43 +++
src/style/pages/Dashboard/Dashboard.scss | 36 ++-
src/style/pages/SaleInvoice/PageForm.scss | 22 ++
266 files changed, 9061 insertions(+), 88 deletions(-)
create mode 100644 src/components/CustomSelectList.js
create mode 100644 src/containers/Sales/Invoices/InvoiceForm/BaseCurrency.js
create mode 100644 src/containers/Sales/Invoices/InvoiceForm/FlagKit.js
create mode 100644 src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js
create mode 100644 src/static/svg/AD.svg
create mode 100644 src/static/svg/AE.svg
create mode 100644 src/static/svg/AF.svg
create mode 100644 src/static/svg/AG.svg
create mode 100644 src/static/svg/AI.svg
create mode 100644 src/static/svg/AL.svg
create mode 100644 src/static/svg/AM.svg
create mode 100644 src/static/svg/AO.svg
create mode 100644 src/static/svg/AR.svg
create mode 100644 src/static/svg/AS.svg
create mode 100644 src/static/svg/AT.svg
create mode 100644 src/static/svg/AU.svg
create mode 100644 src/static/svg/AW.svg
create mode 100644 src/static/svg/AX.svg
create mode 100644 src/static/svg/AZ.svg
create mode 100644 src/static/svg/BA.svg
create mode 100644 src/static/svg/BB.svg
create mode 100644 src/static/svg/BD.svg
create mode 100644 src/static/svg/BE.svg
create mode 100644 src/static/svg/BF.svg
create mode 100644 src/static/svg/BG.svg
create mode 100644 src/static/svg/BH.svg
create mode 100644 src/static/svg/BI.svg
create mode 100644 src/static/svg/BJ.svg
create mode 100644 src/static/svg/BL.svg
create mode 100644 src/static/svg/BM.svg
create mode 100644 src/static/svg/BN.svg
create mode 100644 src/static/svg/BO.svg
create mode 100644 src/static/svg/BR.svg
create mode 100644 src/static/svg/BS.svg
create mode 100644 src/static/svg/BT.svg
create mode 100644 src/static/svg/BV.svg
create mode 100644 src/static/svg/BW.svg
create mode 100644 src/static/svg/BY.svg
create mode 100644 src/static/svg/BZ.svg
create mode 100644 src/static/svg/CA.svg
create mode 100644 src/static/svg/CC.svg
create mode 100644 src/static/svg/CD.svg
create mode 100644 src/static/svg/CF.svg
create mode 100644 src/static/svg/CG.svg
create mode 100644 src/static/svg/CH.svg
create mode 100644 src/static/svg/CI.svg
create mode 100644 src/static/svg/CK.svg
create mode 100644 src/static/svg/CL.svg
create mode 100644 src/static/svg/CM.svg
create mode 100644 src/static/svg/CN.svg
create mode 100644 src/static/svg/CO.svg
create mode 100644 src/static/svg/CR.svg
create mode 100644 src/static/svg/CU.svg
create mode 100644 src/static/svg/CV.svg
create mode 100644 src/static/svg/CW.svg
create mode 100644 src/static/svg/CX.svg
create mode 100644 src/static/svg/CY.svg
create mode 100644 src/static/svg/CZ.svg
create mode 100644 src/static/svg/DE.svg
create mode 100644 src/static/svg/DJ.svg
create mode 100644 src/static/svg/DK.svg
create mode 100644 src/static/svg/DM.svg
create mode 100644 src/static/svg/DO.svg
create mode 100644 src/static/svg/DZ.svg
create mode 100644 src/static/svg/EC.svg
create mode 100644 src/static/svg/EE.svg
create mode 100644 src/static/svg/EG.svg
create mode 100644 src/static/svg/ER.svg
create mode 100644 src/static/svg/ES.svg
create mode 100644 src/static/svg/ET.svg
create mode 100644 src/static/svg/EU.svg
create mode 100644 src/static/svg/FI.svg
create mode 100644 src/static/svg/FJ.svg
create mode 100644 src/static/svg/FK.svg
create mode 100644 src/static/svg/FM.svg
create mode 100644 src/static/svg/FO.svg
create mode 100644 src/static/svg/FR.svg
create mode 100644 src/static/svg/GA.svg
create mode 100644 src/static/svg/GB-ENG.svg
create mode 100644 src/static/svg/GB-NIR.svg
create mode 100644 src/static/svg/GB-SCT.svg
create mode 100644 src/static/svg/GB-WLS.svg
create mode 100644 src/static/svg/GB-ZET.svg
create mode 100644 src/static/svg/GB.svg
create mode 100644 src/static/svg/GD.svg
create mode 100644 src/static/svg/GE.svg
create mode 100644 src/static/svg/GF.svg
create mode 100644 src/static/svg/GG.svg
create mode 100644 src/static/svg/GH.svg
create mode 100644 src/static/svg/GI.svg
create mode 100644 src/static/svg/GL.svg
create mode 100644 src/static/svg/GM.svg
create mode 100644 src/static/svg/GN.svg
create mode 100644 src/static/svg/GP.svg
create mode 100644 src/static/svg/GQ.svg
create mode 100644 src/static/svg/GR.svg
create mode 100644 src/static/svg/GS.svg
create mode 100644 src/static/svg/GT.svg
create mode 100644 src/static/svg/GU.svg
create mode 100644 src/static/svg/GW.svg
create mode 100644 src/static/svg/GY.svg
create mode 100644 src/static/svg/HK.svg
create mode 100644 src/static/svg/HM.svg
create mode 100644 src/static/svg/HN.svg
create mode 100644 src/static/svg/HR.svg
create mode 100644 src/static/svg/HT.svg
create mode 100644 src/static/svg/HU.svg
create mode 100644 src/static/svg/ID.svg
create mode 100644 src/static/svg/IE.svg
create mode 100644 src/static/svg/IL.svg
create mode 100644 src/static/svg/IM.svg
create mode 100644 src/static/svg/IN.svg
create mode 100644 src/static/svg/IO.svg
create mode 100644 src/static/svg/IQ.svg
create mode 100644 src/static/svg/IR.svg
create mode 100644 src/static/svg/IS.svg
create mode 100644 src/static/svg/IT.svg
create mode 100644 src/static/svg/JE.svg
create mode 100644 src/static/svg/JM.svg
create mode 100644 src/static/svg/JO.svg
create mode 100644 src/static/svg/JP.svg
create mode 100644 src/static/svg/KE.svg
create mode 100644 src/static/svg/KG.svg
create mode 100644 src/static/svg/KH.svg
create mode 100644 src/static/svg/KI.svg
create mode 100644 src/static/svg/KM.svg
create mode 100644 src/static/svg/KN.svg
create mode 100644 src/static/svg/KP.svg
create mode 100644 src/static/svg/KR.svg
create mode 100644 src/static/svg/KW.svg
create mode 100644 src/static/svg/KY.svg
create mode 100644 src/static/svg/KZ.svg
create mode 100644 src/static/svg/LA.svg
create mode 100644 src/static/svg/LB.svg
create mode 100644 src/static/svg/LC.svg
create mode 100644 src/static/svg/LGBT.svg
create mode 100644 src/static/svg/LI.svg
create mode 100644 src/static/svg/LK.svg
create mode 100644 src/static/svg/LR.svg
create mode 100644 src/static/svg/LS.svg
create mode 100644 src/static/svg/LT.svg
create mode 100644 src/static/svg/LU.svg
create mode 100644 src/static/svg/LV.svg
create mode 100644 src/static/svg/LY.svg
create mode 100644 src/static/svg/MA.svg
create mode 100644 src/static/svg/MC.svg
create mode 100644 src/static/svg/MD.svg
create mode 100644 src/static/svg/ME.svg
create mode 100644 src/static/svg/MF.svg
create mode 100644 src/static/svg/MG.svg
create mode 100644 src/static/svg/MH.svg
create mode 100644 src/static/svg/MK.svg
create mode 100644 src/static/svg/ML.svg
create mode 100644 src/static/svg/MM.svg
create mode 100644 src/static/svg/MN.svg
create mode 100644 src/static/svg/MO.svg
create mode 100644 src/static/svg/MP.svg
create mode 100644 src/static/svg/MQ.svg
create mode 100644 src/static/svg/MR.svg
create mode 100644 src/static/svg/MS.svg
create mode 100644 src/static/svg/MT.svg
create mode 100644 src/static/svg/MU.svg
create mode 100644 src/static/svg/MV.svg
create mode 100644 src/static/svg/MW.svg
create mode 100644 src/static/svg/MX.svg
create mode 100644 src/static/svg/MY.svg
create mode 100644 src/static/svg/MZ.svg
create mode 100644 src/static/svg/NA.svg
create mode 100644 src/static/svg/NC.svg
create mode 100644 src/static/svg/NE.svg
create mode 100644 src/static/svg/NF.svg
create mode 100644 src/static/svg/NG.svg
create mode 100644 src/static/svg/NI.svg
create mode 100644 src/static/svg/NL.svg
create mode 100644 src/static/svg/NO.svg
create mode 100644 src/static/svg/NP.svg
create mode 100644 src/static/svg/NR.svg
create mode 100644 src/static/svg/NU.svg
create mode 100644 src/static/svg/NZ.svg
create mode 100644 src/static/svg/OM.svg
create mode 100644 src/static/svg/PA.svg
create mode 100644 src/static/svg/PE.svg
create mode 100644 src/static/svg/PF.svg
create mode 100644 src/static/svg/PG.svg
create mode 100644 src/static/svg/PH.svg
create mode 100644 src/static/svg/PK.svg
create mode 100644 src/static/svg/PL.svg
create mode 100644 src/static/svg/PM.svg
create mode 100644 src/static/svg/PN.svg
create mode 100644 src/static/svg/PR.svg
create mode 100644 src/static/svg/PS.svg
create mode 100644 src/static/svg/PT.svg
create mode 100644 src/static/svg/PW.svg
create mode 100644 src/static/svg/PY.svg
create mode 100644 src/static/svg/QA.svg
create mode 100644 src/static/svg/RE.svg
create mode 100644 src/static/svg/RO.svg
create mode 100644 src/static/svg/RS.svg
create mode 100644 src/static/svg/RU.svg
create mode 100644 src/static/svg/RW.svg
create mode 100644 src/static/svg/SA.svg
create mode 100644 src/static/svg/SB.svg
create mode 100644 src/static/svg/SC.svg
create mode 100644 src/static/svg/SD.svg
create mode 100644 src/static/svg/SE.svg
create mode 100644 src/static/svg/SG.svg
create mode 100644 src/static/svg/SH.svg
create mode 100644 src/static/svg/SI.svg
create mode 100644 src/static/svg/SJ.svg
create mode 100644 src/static/svg/SK.svg
create mode 100644 src/static/svg/SL.svg
create mode 100644 src/static/svg/SM.svg
create mode 100644 src/static/svg/SN.svg
create mode 100644 src/static/svg/SO.svg
create mode 100644 src/static/svg/SR.svg
create mode 100644 src/static/svg/SS.svg
create mode 100644 src/static/svg/ST.svg
create mode 100644 src/static/svg/SV.svg
create mode 100644 src/static/svg/SX.svg
create mode 100644 src/static/svg/SY.svg
create mode 100644 src/static/svg/SZ.svg
create mode 100644 src/static/svg/TC.svg
create mode 100644 src/static/svg/TD.svg
create mode 100644 src/static/svg/TF.svg
create mode 100644 src/static/svg/TG.svg
create mode 100644 src/static/svg/TH.svg
create mode 100644 src/static/svg/TJ.svg
create mode 100644 src/static/svg/TK.svg
create mode 100644 src/static/svg/TL.svg
create mode 100644 src/static/svg/TM.svg
create mode 100644 src/static/svg/TN.svg
create mode 100644 src/static/svg/TO.svg
create mode 100644 src/static/svg/TR.svg
create mode 100644 src/static/svg/TT.svg
create mode 100644 src/static/svg/TV.svg
create mode 100644 src/static/svg/TW.svg
create mode 100644 src/static/svg/TZ.svg
create mode 100644 src/static/svg/UA.svg
create mode 100644 src/static/svg/UG.svg
create mode 100644 src/static/svg/UM.svg
create mode 100644 src/static/svg/US-CA.svg
create mode 100644 src/static/svg/US.svg
create mode 100644 src/static/svg/UY.svg
create mode 100644 src/static/svg/UZ.svg
create mode 100644 src/static/svg/VA.svg
create mode 100644 src/static/svg/VC.svg
create mode 100644 src/static/svg/VE.svg
create mode 100644 src/static/svg/VG.svg
create mode 100644 src/static/svg/VI.svg
create mode 100644 src/static/svg/VN.svg
create mode 100644 src/static/svg/VU.svg
create mode 100644 src/static/svg/WF.svg
create mode 100644 src/static/svg/WS.svg
create mode 100644 src/static/svg/XK.svg
create mode 100644 src/static/svg/YE.svg
create mode 100644 src/static/svg/YT.svg
create mode 100644 src/static/svg/ZA.svg
create mode 100644 src/static/svg/ZM.svg
create mode 100644 src/static/svg/ZW.svg
diff --git a/src/components/CustomSelectList.js b/src/components/CustomSelectList.js
new file mode 100644
index 000000000..2b0ad4bad
--- /dev/null
+++ b/src/components/CustomSelectList.js
@@ -0,0 +1,103 @@
+import React from 'react';
+import {
+ Button,
+ MenuItem,
+ PopoverInteractionKind,
+ Position,
+} from '@blueprintjs/core';
+import { defaultTo } from 'lodash';
+import { Select } from '@blueprintjs/select';
+import { FormattedMessage as T, Icon } from 'components';
+
+/**
+ * warehouse & branches select list.
+ * @returns
+ */
+export default function CustomSelectList({
+ // #ownProps
+ items,
+ initialItemId,
+ selectedItemId,
+ text,
+ onItemSelected,
+ buttonProps,
+}) {
+ const initialItem = React.useMemo(
+ () => items.find((a) => a.id === initialItemId),
+ [initialItemId, items],
+ );
+
+ const [selecetedItem, setSelectedItem] = React.useState(initialItem || null);
+
+ React.useEffect(() => {
+ if (typeof selectedItemId !== 'undefined') {
+ const item = selectedItemId
+ ? items.find((a) => a.id === selectedItemId)
+ : null;
+ setSelectedItem(item);
+ }
+ }, [selectedItemId, items, setSelectedItem]);
+
+ // Menu items renderer.
+ const itemRenderer = (item, { handleClick, modifiers, query }) => (
+
+ );
+
+ // Filters items items.
+ const filterItemsPredicater = (query, item, _index, exactMatch) => {
+ const normalizedTitle = item.name.toLowerCase();
+ const normalizedQuery = query.toLowerCase();
+
+ if (exactMatch) {
+ return normalizedTitle === normalizedQuery;
+ } else {
+ return `${item.code} ${normalizedTitle}`.indexOf(normalizedQuery) >= 0;
+ }
+ };
+
+ const handleItemMenuSelect = React.useCallback(
+ (item) => {
+ if (item.id) {
+ setSelectedItem({ ...item });
+ onItemSelected && onItemSelected(item);
+ }
+ },
+ [onItemSelected, setSelectedItem],
+ );
+
+ return (
+ } />}
+ itemRenderer={itemRenderer}
+ itemPredicate={filterItemsPredicater}
+ onItemSelect={handleItemMenuSelect}
+ popoverProps={{
+ minimal: true,
+ position: Position.BOTTOM_LEFT,
+ interactionKind: PopoverInteractionKind.CLICK,
+ modifiers: {
+ offset: { offset: '0, 4' },
+ },
+ }}
+ >
+
+
+ );
+}
diff --git a/src/components/index.js b/src/components/index.js
index 5e14f2288..a5cde02ec 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -58,6 +58,7 @@ import AvaterCell from './AvaterCell';
import { ItemsMultiSelect } from './Items';
import MoreMenuItems from './MoreMenutItems';
+import CustomSelectList from './CustomSelectList'
export * from './Dialog';
export * from './Menu';
@@ -163,4 +164,5 @@ export {
ItemsMultiSelect,
AvaterCell,
MoreMenuItems,
+ CustomSelectList
};
diff --git a/src/containers/Sales/Invoices/InvoiceForm/BaseCurrency.js b/src/containers/Sales/Invoices/InvoiceForm/BaseCurrency.js
new file mode 100644
index 000000000..c4f72e7cc
--- /dev/null
+++ b/src/containers/Sales/Invoices/InvoiceForm/BaseCurrency.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import * as R from 'ramda';
+import styled from 'styled-components';
+
+import { CurrencyTag } from 'components';
+import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
+
+/**
+ * base currency sign.
+ */
+function BaseCurrency({
+ // #withCurrentOrganization
+ organization: { base_currency = '' },
+}) {
+ // if (base_currency.length <= 0) {
+ // return null;
+ // }
+
+ return (
+
+ {base_currency}
+
+ );
+}
+
+export default R.compose(withCurrentOrganization())(BaseCurrency);
+
+const BaseCurrencySign = styled.div`
+ font-size: 10px;
+ margin-left: 5px;
+ span {
+ background: #5c7080;
+ }
+`;
diff --git a/src/containers/Sales/Invoices/InvoiceForm/FlagKit.js b/src/containers/Sales/Invoices/InvoiceForm/FlagKit.js
new file mode 100644
index 000000000..0a64a8ad6
--- /dev/null
+++ b/src/containers/Sales/Invoices/InvoiceForm/FlagKit.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import styled from 'styled-components';
+
+export default function FlagKit({ flage }) {
+ return (
+
+ 
+
+ );
+}
+
+const Img = styled.img`
+ display: inline-block;
+ object-fit: cover;
+ object-position: center;
+ margin: 0 5px;
+`;
diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js
index 8c2f96c8c..b83f15072 100644
--- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js
+++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js
@@ -16,6 +16,7 @@ import InvoiceItemsEntriesEditorField from './InvoiceItemsEntriesEditorField';
import InvoiceFloatingActions from './InvoiceFloatingActions';
import InvoiceFormFooter from './InvoiceFormFooter';
import InvoiceFormDialogs from './InvoiceFormDialogs';
+import InvoiceFormTopBar from './InvoiceFormTopBar';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import withMediaActions from 'containers/Media/withMediaActions';
@@ -166,6 +167,7 @@ function InvoiceForm({
onSubmit={handleSubmit}
>
);
}
const useBranchesContext = () => React.useContext(BranchesContext);
export { BranchesProvider, useBranchesContext };
-
-const BrachesPreferencesCard = styled(Card)`
- padding: 0;
-`;
diff --git a/src/containers/Preferences/Warehouses/WarehousesList.js b/src/containers/Preferences/Warehouses/WarehousesList.js
index fc6051b3a..d23f20632 100644
--- a/src/containers/Preferences/Warehouses/WarehousesList.js
+++ b/src/containers/Preferences/Warehouses/WarehousesList.js
@@ -1,5 +1,8 @@
import React from 'react';
+import styled from 'styled-components';
import intl from 'react-intl-universal';
+
+import '../../../style/pages/Preferences/warehousesList.scss';
import Warehouses from './Warehouses';
import WarehousesEmptyStatus from './WarehousesEmptyStatus';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
@@ -18,7 +21,17 @@ function WarehousesList({
// return
+
+ {/* ----------- Save and New ----------- */}
+
+ :
+ }
+ onClick={handleSubmitAndNewClick}
+ />
+ }
+ // onClick={handleSubmitContinueEditingBtnClick}
+ />
+
+ }
+ minimal={true}
+ interactionKind={PopoverInteractionKind.CLICK}
+ position={Position.BOTTOM_LEFT}
+ >
+ }
+ />
+
+
+
+ {/* ----------- Clear & Reset----------- */}
+ :
+ );
+}
diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
index 3487ca548..1d172e6c4 100644
--- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
+++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js
@@ -1,6 +1,7 @@
import React from 'react';
import intl from 'react-intl-universal';
import { Formik, Form } from 'formik';
+import { isEmpty } from 'lodash';
import { Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import { CLASSES } from 'common/classes';
@@ -14,11 +15,18 @@ import {
import WarehouseTransferFormHeader from './WarehouseTransferFormHeader';
import WarehouseTransferEditorField from './WarehouseTransferEditorField';
import WarehouseTransferFormFooter from './WarehouseTransferFormFooter';
+import WarehouseTransferFloatingActions from './WarehouseTransferFloatingActions';
import WarehouseTransferFormDialog from './WarehouseTransferFormDialog';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
+import { AppToaster } from 'components';
+import { useWarehouseTransferFormContext } from './WarehouseTransferFormProvider';
import { compose, orderingLinesIndexes, transactionNumber } from 'utils';
-import { defaultWareTransferEntry, defaultWarehouseTransfer } from './utils';
+import {
+ defaultWarehouseTransfer,
+ transformValueToRequest,
+ transformToEditForm,
+} from './utils';
function WarehouseTransferForm({
// #withSettings
@@ -28,6 +36,14 @@ function WarehouseTransferForm({
}) {
const history = useHistory();
+ const {
+ isNewMode,
+ warehouseTransfer,
+ createWarehouseTransferMutate,
+ editWarehouseTransferMutate,
+ submitPayload,
+ } = useWarehouseTransferFormContext();
+
// WarehouseTransfer number.
const warehouseTransferNumber = transactionNumber(
warehouseTransferNumberPrefix,
@@ -37,18 +53,43 @@ function WarehouseTransferForm({
// Form initial values.
const initialValues = React.useMemo(
() => ({
- ...defaultWarehouseTransfer,
+ ...(!isEmpty(null)
+ ? { ...transformToEditForm(null) }
+ : {
+ ...defaultWarehouseTransfer,
+ entries: orderingLinesIndexes(defaultWarehouseTransfer.entries),
+ }),
}),
[],
);
// Handles form submit.
const handleSubmit = (values, { setSubmitting, setErrors, resetForm }) => {
+ setSubmitting(true);
// Transformes the values of the form to request.
- const form = {};
+ const form = {
+ ...transformValueToRequest(values),
+ };
// Handle the request success.
- const onSuccess = () => {};
+ const onSuccess = () => {
+ AppToaster.show({
+ message: intl.get(
+ isNewMode
+ ? 'warehouse_transfer.success_message'
+ : 'warehouse_transfer.edit_success_message',
+ ),
+ intent: Intent.SUCCESS,
+ });
+ setSubmitting(false);
+
+ if (submitPayload.redirect) {
+ history.push('/warehouses-transfers');
+ }
+ if (submitPayload.resetForm) {
+ resetForm();
+ }
+ };
// Handle the request error.
const onError = ({
@@ -58,6 +99,14 @@ function WarehouseTransferForm({
}) => {
setSubmitting(false);
};
+
+ if (isNewMode) {
+ createWarehouseTransferMutate(form).then(onSuccess).catch(onError);
+ } else {
+ editWarehouseTransferMutate([warehouseTransfer.id, form])
+ .then(onSuccess)
+ .catch(onError);
+ }
};
return (
@@ -70,7 +119,7 @@ function WarehouseTransferForm({
>
+
+
+
+ );
+}
diff --git a/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossHeader.js b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossHeader.js
new file mode 100644
index 000000000..a13c08166
--- /dev/null
+++ b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossHeader.js
@@ -0,0 +1,108 @@
+import React from 'react';
+import moment from 'moment';
+import * as Yup from 'yup';
+import intl from 'react-intl-universal';
+import { Formik, Form } from 'formik';
+import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
+import { FormattedMessage as T } from 'components';
+
+import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
+import RealizedGainOrLossGeneralPanel from './RealizedGainOrLossGeneralPanel';
+
+import withRealizedGainOrLoss from './withRealizedGainOrLoss';
+import withRealizedGainOrLossActions from './withRealizedGainOrLossActions';
+
+import { compose, transformToForm } from 'utils';
+
+/**
+ * Realized Gain or Loss.header.
+ */
+function RealizedGainOrLossHeader({
+ // #ownProps
+ onSubmitFilter,
+ pageFilter,
+
+ //#withRealizedGainOrLoss
+ isFilterDrawerOpen,
+
+ //#withRealizedGainOrLossActions
+ toggleRealizedGainOrLossFilterDrawer,
+}) {
+ // Filter form default values.
+ const defaultValues = {
+ fromDate: moment().toDate(),
+ toDate: moment().toDate(),
+ };
+
+ // Initial form values.
+ const initialValues = transformToForm(
+ {
+ ...pageFilter,
+ fromDate: moment(pageFilter.fromDate).toDate(),
+ toDate: moment(pageFilter.toDate).toDate(),
+ },
+ defaultValues,
+ );
+
+ // Validation schema.
+ const validationSchema = Yup.object().shape({
+ dateRange: Yup.string().optional(),
+ fromDate: Yup.date().required().label(intl.get('fromDate')),
+ toDate: Yup.date()
+ .min(Yup.ref('fromDate'))
+ .required()
+ .label(intl.get('toDate')),
+ displayColumnsType: Yup.string(),
+ });
+
+ // Handle form submit.
+ const handleSubmit = (values, { setSubmitting }) => {
+ onSubmitFilter(values);
+ toggleRealizedGainOrLossFilterDrawer(false);
+ setSubmitting(false);
+ };
+
+ // Handle drawer close action.
+ const handleDrawerClose = () => {
+ toggleRealizedGainOrLossFilterDrawer(false);
+ };
+
+ return (
+
+
+
+
+ );
+}
diff --git a/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossHeader.js b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossHeader.js
new file mode 100644
index 000000000..a17bce086
--- /dev/null
+++ b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossHeader.js
@@ -0,0 +1,108 @@
+import React from 'react';
+import moment from 'moment';
+import * as Yup from 'yup';
+import intl from 'react-intl-universal';
+import { Formik, Form } from 'formik';
+import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
+import { FormattedMessage as T } from 'components';
+
+import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
+import UnrealizedGainOrLossGeneralPanel from './UnrealizedGainOrLossGeneralPanel';
+
+import withUnrealizedGainOrLoss from './withUnrealizedGainOrLoss';
+import withUnrealizedGainOrLossActions from './withUnrealizedGainOrLossActions';
+
+import { compose, transformToForm } from 'utils';
+
+/**
+ * Unrealized Gain or Loss.header.
+ */
+function UnrealizedGainOrLossHeader({
+ // #ownProps
+ onSubmitFilter,
+ pageFilter,
+
+ //#withUnrealizedGainOrLoss
+ isFilterDrawerOpen,
+
+ //#withUnrealizedGainOrLossActions
+ toggleUnrealizedGainOrLossFilterDrawer,
+}) {
+ // Filter form default values.
+ const defaultValues = {
+ fromDate: moment().toDate(),
+ toDate: moment().toDate(),
+ };
+
+ // Initial form values.
+ const initialValues = transformToForm(
+ {
+ ...pageFilter,
+ fromDate: moment(pageFilter.fromDate).toDate(),
+ toDate: moment(pageFilter.toDate).toDate(),
+ },
+ defaultValues,
+ );
+
+ // Validation schema.
+ const validationSchema = Yup.object().shape({
+ dateRange: Yup.string().optional(),
+ fromDate: Yup.date().required().label(intl.get('fromDate')),
+ toDate: Yup.date()
+ .min(Yup.ref('fromDate'))
+ .required()
+ .label(intl.get('toDate')),
+ displayColumnsType: Yup.string(),
+ });
+
+ // Handle form submit.
+ const handleSubmit = (values, { setSubmitting }) => {
+ onSubmitFilter(values);
+ toggleUnrealizedGainOrLossFilterDrawer(false);
+ setSubmitting(false);
+ };
+
+ // Handle drawer close action.
+ const handleDrawerClose = () => {
+ toggleUnrealizedGainOrLossFilterDrawer(false);
+ };
+
+ return (
+
+
-
+
-
+
+
);
}
-export default compose(withDialogActions)(BranchActivateDialogContent);
diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.js
new file mode 100644
index 000000000..d5f154a40
--- /dev/null
+++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.js
@@ -0,0 +1,64 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+
+import { Formik } from 'formik';
+import { Intent } from '@blueprintjs/core';
+
+import { AppToaster } from 'components';
+import { useBranchActivateContext } from './BranchActivateFormProvider';
+import BranchActivateFormContent from './BranchActivateFormContent';
+
+import withDialogActions from 'containers/Dialog/withDialogActions';
+
+import { compose } from 'utils';
+
+/**
+ * Branch activate form.
+ */
+function BranchActivateForm({
+ // #withDialogActions
+ closeDialog,
+}) {
+ const { activateBranches, dialogName } = useBranchActivateContext();
+
+ // Initial form values
+ const initialValues = {};
+
+ // Handles the form submit.
+ const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
+ const form = {
+ ...values,
+ };
+ setSubmitting(true);
+ // Handle request response success.
+ const onSuccess = (response) => {
+ AppToaster.show({
+ message: intl.get('branch_activate.dialog_success_message'),
+ intent: Intent.SUCCESS,
+ });
+ closeDialog(dialogName);
+ };
+
+ // Handle request response errors.
+ const onError = ({
+ response: {
+ data: { errors },
+ },
+ }) => {
+ if (errors) {
+ }
+ setSubmitting(false);
+ };
+ activateBranches(form).then(onSuccess).catch(onError);
+ };
+
+ return (
+
+
+ );
+}
+
+const useBranchActivateContext = () => React.useContext(BranchActivateContext);
+
+export { BranchActivateFormProvider, useBranchActivateContext };
diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js
index c5d481e63..b0950d535 100644
--- a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js
+++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js
@@ -1,48 +1,15 @@
import React from 'react';
-import { Intent, Button, Callout, Classes } from '@blueprintjs/core';
-import { DialogContent, T } from 'components';
-import withDialogActions from 'containers/Dialog/withDialogActions';
-import { compose } from 'utils';
+import WarehouseActivateForm from './WarehouseActivateForm';
+import { WarehouseActivateFormProvider } from './WarehouseActivateFormProvider';
-/**
- * Warehouse activate dialog content.
- * @returns
- */
-function WarehouseActivateDialogContent({
+export default function WarehouseActivateDialogContent({
// #ownProps
dialogName,
- // #withDialogActions
- closeDialog,
}) {
- // Handle close button click.
- const handleCancelBtnClick = () => {
- closeDialog(dialogName);
- };
return (
-
-
+
+
);
}
-
-export default compose(withDialogActions)(WarehouseActivateDialogContent);
diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.js
new file mode 100644
index 000000000..748023d45
--- /dev/null
+++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.js
@@ -0,0 +1,63 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+
+import { Formik } from 'formik';
+import { Intent } from '@blueprintjs/core';
+
+import { AppToaster } from 'components';
+import { useWarehouseActivateContext } from './WarehouseActivateFormProvider';
+import WarehouseActivateFormContent from './WarehouseActivateFormContent';
+
+import withDialogActions from 'containers/Dialog/withDialogActions';
+
+import { compose } from 'utils';
+
+/**
+ * warehouse activate form.
+ */
+function WarehouseActivateForm({
+ // #withDialogActions
+ closeDialog,
+}) {
+ const { activateWarehouses, dialogName } = useWarehouseActivateContext();
+
+ // Initial form values
+ const initialValues = {};
+
+ // Handles the form submit.
+ const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
+ const form = {
+ ...values,
+ };
+ setSubmitting(true);
+ // Handle request response success.
+ const onSuccess = (response) => {
+ AppToaster.show({
+ message: intl.get('warehouse_activate.dialog_success_message'),
+ intent: Intent.SUCCESS,
+ });
+ closeDialog(dialogName);
+ };
+
+ // Handle request response errors.
+ const onError = ({
+ response: {
+ data: { errors },
+ },
+ }) => {
+ if (errors) {
+ }
+ setSubmitting(false);
+ };
+ activateWarehouses(form).then(onSuccess).catch(onError);
+ };
+
+ return (
+
+
+ );
+}
+
+const useWarehouseActivateContext = () =>
+ React.useContext(WarehouseActivateContext);
+
+export { WarehouseActivateFormProvider, useWarehouseActivateContext };
From 49f8cce54b59f29fe16887801249cfef57e93d85 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Tue, 8 Feb 2022 20:31:15 +0200
Subject: [PATCH 28/30] feat(branche & warehouse ) add mark primary alert.
---
.../Alerts/Branches/BranchMarkPrimaryAlert.js | 70 +++++++++++++++++++
.../Warehouses/WarehouseMarkPrimaryAlert.js | 70 +++++++++++++++++++
.../Preferences/Branches/BranchesAlerts.js | 11 ++-
.../Preferences/Branches/BranchesDataTable.js | 16 +++--
.../Preferences/Branches/components.js | 7 +-
.../Warehouses/WarehousesAlerts.js | 11 ++-
.../Warehouses/WarehousesGridItems.js | 6 ++
.../Preferences/Warehouses/WarehousesList.js | 2 +-
.../Warehouses/WarehousesProvider.js | 6 +-
.../Preferences/Warehouses/components.js | 2 +-
src/hooks/query/branches.js | 18 +++++
src/hooks/query/warehouses.js | 18 +++++
src/lang/en/index.json | 32 +++++----
13 files changed, 244 insertions(+), 25 deletions(-)
create mode 100644 src/containers/Alerts/Branches/BranchMarkPrimaryAlert.js
create mode 100644 src/containers/Alerts/Warehouses/WarehouseMarkPrimaryAlert.js
diff --git a/src/containers/Alerts/Branches/BranchMarkPrimaryAlert.js b/src/containers/Alerts/Branches/BranchMarkPrimaryAlert.js
new file mode 100644
index 000000000..e61159587
--- /dev/null
+++ b/src/containers/Alerts/Branches/BranchMarkPrimaryAlert.js
@@ -0,0 +1,70 @@
+import React from 'react';
+import intl from 'react-intl-universal';
+import { Intent, Alert } from '@blueprintjs/core';
+import { FormattedMessage as T } from 'components';
+
+import { useMarkPrimaryBranches } from 'hooks/query';
+import { AppToaster } from 'components';
+
+import withAlertActions from 'containers/Alert/withAlertActions';
+import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
+
+import { compose } from 'utils';
+
+/**
+ * branch mark primary alert.
+ */
+function BranchMarkPrimaryAlert({
+ name,
+
+ // #withAlertStoreConnect
+ isOpen,
+ payload: { branchId },
+
+ // #withAlertActions
+ closeAlert,
+}) {
+ const { mutateAsync: markPrimaryBranchMutate, isLoading } =
+ useMarkPrimaryBranches();
+
+ // Handle cancel mark primary alert.
+ const handleCancelMarkPrimaryAlert = () => {
+ closeAlert(name);
+ };
+
+ // andle cancel mark primary confirm.
+ const handleConfirmMarkPrimaryBranch = () => {
+ markPrimaryBranchMutate(branchId)
+ .then(() => {
+ AppToaster.show({
+ message: intl.get('branch.alert.mark_primary_message'),
+ intent: Intent.SUCCESS,
+ });
+ closeAlert(name);
+ })
+ .catch((error) => {
+ closeAlert(name);
+ });
+ };
+
+ return (
+
@@ -58,6 +63,7 @@ function BranchesDataTable({
payload={{
onEdit: handleEditBranch,
onDelete: handleDeleteBranch,
+ onMarkPrimary: handleMarkPrimaryBranch,
}}
/>
diff --git a/src/containers/Preferences/Branches/components.js b/src/containers/Preferences/Branches/components.js
index 771681fba..defa408d6 100644
--- a/src/containers/Preferences/Branches/components.js
+++ b/src/containers/Preferences/Branches/components.js
@@ -9,7 +9,7 @@ import { Icon } from 'components';
* Context menu of Branches.
*/
export function ActionsMenu({
- payload: { onEdit, onDelete },
+ payload: { onEdit, onDelete, onMarkPrimary },
row: { original },
}) {
return (
@@ -19,6 +19,11 @@ export function ActionsMenu({
text={intl.get('branches.action.edit_branch')}
onClick={safeCallback(onEdit, original)}
/>
+ }
+ text={intl.get('branches.action.mark_as_primary')}
+ onClick={safeCallback(onMarkPrimary, original)}
+ />
- {isWarehouesLoading ? (
+ {/* {isWarehouesLoading ? (
);
diff --git a/src/containers/Preferences/Warehouses/components.js b/src/containers/Preferences/Warehouses/components.js
index 7027343b5..bcaf8f419 100644
--- a/src/containers/Preferences/Warehouses/components.js
+++ b/src/containers/Preferences/Warehouses/components.js
@@ -22,7 +22,7 @@ export function WarehouseContextMenu({
onClick={safeCallback(onEditClick)}
/>
}
+ icon={
+
{isWarehouesLoading ? (
);
}
@@ -37,8 +42,4 @@ const useWarehousesContext = () => React.useContext(WarehousesContext);
export { WarehousesProvider, useWarehousesContext };
-const WarehousePreference = styled.div`
- display: flex;
- flex-wrap: wrap;
- margin: 15px;
-`;
+const WarehousePreference = styled.div``;
diff --git a/src/style/pages/Preferences/branchesList.scss b/src/style/pages/Preferences/branchesList.scss
new file mode 100644
index 000000000..ffdfaa9a0
--- /dev/null
+++ b/src/style/pages/Preferences/branchesList.scss
@@ -0,0 +1,6 @@
+// Branches List.
+// ---------------------------------
+.preferences-page__inside-content--branches {
+ height: 100%;
+
+}
diff --git a/src/style/pages/Preferences/warehousesList.scss b/src/style/pages/Preferences/warehousesList.scss
new file mode 100644
index 000000000..f80a690a1
--- /dev/null
+++ b/src/style/pages/Preferences/warehousesList.scss
@@ -0,0 +1,5 @@
+// warehouses List.
+// ---------------------------------
+.preferences-page__inside-content--warehouses {
+ height: 100%;
+}
From 09d5771481e0c0e01ad825ae0f16f2db56c17e59 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Tue, 8 Feb 2022 20:16:46 +0200
Subject: [PATCH 27/30] feat(branche & warehouse activate) add api.
---
.../BranchActivateDialogContent.js | 40 ++----------
.../BranchActivateForm.js | 64 +++++++++++++++++++
.../BranchActivateFormContent.js | 21 ++++++
.../BranchActivateFormFloatingActions.js | 47 ++++++++++++++
.../BranchActivateFormProvider.js | 29 +++++++++
.../WarehouseActivateDialogContent.js | 45 ++-----------
.../WarehouseActivateForm.js | 63 ++++++++++++++++++
.../WarehouseActivateFormContent.js | 22 +++++++
.../WarehouseActivateFormFloatingActions.js | 46 +++++++++++++
.../WarehouseActivateFormProvider.js | 31 +++++++++
10 files changed, 335 insertions(+), 73 deletions(-)
create mode 100644 src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.js
create mode 100644 src/containers/Dialogs/BranchActivateDialog/BranchActivateFormContent.js
create mode 100644 src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.js
create mode 100644 src/containers/Dialogs/BranchActivateDialog/BranchActivateFormProvider.js
create mode 100644 src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.js
create mode 100644 src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormContent.js
create mode 100644 src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.js
create mode 100644 src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormProvider.js
diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js
index ab0d71c3f..31c1f8a86 100644
--- a/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js
+++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js
@@ -1,43 +1,15 @@
import React from 'react';
-import { Intent, Button, Callout, Classes } from '@blueprintjs/core';
-import { DialogContent, T } from 'components';
-import withDialogActions from 'containers/Dialog/withDialogActions';
-import { compose } from 'utils';
+import BranchActivateForm from './BranchActivateForm';
+import { BranchActivateFormProvider } from './BranchActivateFormProvider';
-function BranchActivateDialogContent({
+export default function BranchActivateDialogContent({
// #ownProps
dialogName,
- // #withDialogActions
- closeDialog,
}) {
- // Handle close button click.
- const handleCancelBtnClick = () => {
- closeDialog(dialogName);
- };
return (
-
-
- Aute esse eiusmod dolore ipsum dolor sint qui proident pariatur
- proident fugiat ea ad aliquip.
-
-
-
-
-
-
-
-
-
+
+ );
+}
+
+export default compose(withDialogActions)(BranchActivateFormFloatingActions);
diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormProvider.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormProvider.js
new file mode 100644
index 000000000..5e0299b6f
--- /dev/null
+++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormProvider.js
@@ -0,0 +1,29 @@
+import React from 'react';
+
+import { DialogContent } from 'components';
+import { useActivateBranches } from 'hooks/query';
+
+const BranchActivateContext = React.createContext();
+
+/**
+ * Branch activate form provider.
+ */
+function BranchActivateFormProvider({ dialogName, ...props }) {
+ const { mutateAsync: activateBranches, isLoading } = useActivateBranches();
+
+ // State provider.
+ const provider = {
+ activateBranches,
+ dialogName,
+ };
+
+ return (
+
+
+
+
+
-
- Aute esse eiusmod dolore ipsum dolor sint qui proident pariatur
- proident fugiat ea ad aliquip.
-
-
-
-
-
-
-
-
-
+
+ );
+}
+export default compose(withDialogActions)(WarehouseActivateFormFloatingActions);
diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormProvider.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormProvider.js
new file mode 100644
index 000000000..5d8b84a40
--- /dev/null
+++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormProvider.js
@@ -0,0 +1,31 @@
+import React from 'react';
+
+import { DialogContent } from 'components';
+import { useActivateWarehouses } from 'hooks/query';
+
+const WarehouseActivateContext = React.createContext();
+
+/**
+ * warehouse activate form provider.
+ */
+function WarehouseActivateFormProvider({ dialogName, ...props }) {
+ const { mutateAsync: activateWarehouses, isLoading } =
+ useActivateWarehouses();
+
+ // State provider.
+ const provider = {
+ activateWarehouses,
+ dialogName,
+ };
+
+ return (
+
+
+
+
+
+
+