diff --git a/CHANGELOG.md b/CHANGELOG.md index 03f5da752..8b1592013 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,47 @@ All notable changes to Bigcapital server-side will be in this file. +## [1.7.1-rc.2] - 30-03-2022 + +## Added + - `BIG-141` Add inactive status to item drawer details. + - `BIG-278` Add created at date on expense details. + - `BIG-350` Add empty status content of warehouse transfers service. + - `BIG-344` Add branch details to manual journal and expense details. +## Fixed + - `BIG-221` Remove Non-inventory radio choice on item form. + - `BIG-236` Validate estimate expiration date should be equal or bigger than estimate date. + - `BIG-237` Validate invoice due date should be equal or bigger than invoice date. + - `BIG-238` Validate bill due date should be equal or bigger than bill date. + - `BIG-280` Optimize style of multi-select accounts menu. + - `BIG-284` Cashflow statement loading bar. + - `BIG-296` Creating a new child account from accounts list. + - `BIG-301` Navigation bar divider on actions bar hide with permissions control. + - `BIG-304` Adding cash or bank account from cash flow service. + - `BIG-351` Invalid date in the inventory adjustment detail. + - `BIG-352` Fix terms and notes fields on footer of all services. + - `BIG-354` Validate the warehouse transfer quantity should be above zero. + +## [1.7.0-rc.1] - 24-03-2022 + +## Added + - Multiply currencies with foreign currencies. + - Multiply warehouses to track inventory items. + - Multiply branches to track organization transactions. + - Transfer orders between warehouses. + - Integrate financial reports with multiply branches. + - Integrate inventory reports with multiply warehouses. + +## Changes + - Optimize style of sale invoice form. + - Optimize style of sale receipt form. + - Optimize style of credit note form. + - Optimize style of payment receive form. + - Optimize style of bill form. + - Optimize style of payment made form. + - Optimize style of manual journal form. + - Optimize style of expense form. + ## [1.6.3] - 21-02-2022 ### Fixed diff --git a/package.json b/package.json index d4a827375..cf7f8a161 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bigcapital-client", - "version": "1.6.3", + "version": "1.7.1", "private": true, "dependencies": { "@babel/core": "7.8.4", diff --git a/src/components/Accounts/AccountMultiSelect.js b/src/components/Accounts/AccountMultiSelect.js new file mode 100644 index 000000000..8e9d54882 --- /dev/null +++ b/src/components/Accounts/AccountMultiSelect.js @@ -0,0 +1,73 @@ +import React from 'react'; +import styled from 'styled-components'; +import { MenuItem } from '@blueprintjs/core'; +import { FMultiSelect } from '../Forms'; +import classNames from 'classnames'; +import { Classes } from '@blueprintjs/popover2'; + +/** + * + * @param {*} query + * @param {*} account + * @param {*} _index + * @param {*} exactMatch + * @returns + */ +const accountItemPredicate = (query, account, _index, exactMatch) => { + const normalizedTitle = account.name.toLowerCase(); + const normalizedQuery = query.toLowerCase(); + + if (exactMatch) { + return normalizedTitle === normalizedQuery; + } else { + return `${account.code}. ${normalizedTitle}`.indexOf(normalizedQuery) >= 0; + } +}; + +/** + * + * @param {*} account + * @param {*} param1 + * @returns + */ +const accountItemRenderer = ( + account, + { handleClick, modifiers, query }, + { isSelected }, +) => { + return ( + + ); +}; + +const accountSelectProps = { + itemPredicate: accountItemPredicate, + itemRenderer: accountItemRenderer, + valueAccessor: (item) => item.id, + labelAccessor: (item) => item.code, + tagRenderer: (item) => item.name, +}; + +/** + * branches mulit select. + * @param {*} param0 + * @returns {JSX.Element} + */ +export function AccountMultiSelect({ accounts, ...rest }) { + return ( + + ); +} diff --git a/src/components/Accounts/index.js b/src/components/Accounts/index.js new file mode 100644 index 000000000..791394be9 --- /dev/null +++ b/src/components/Accounts/index.js @@ -0,0 +1 @@ +export * from './AccountMultiSelect'; diff --git a/src/components/index.js b/src/components/index.js index 16e1003b6..c91a4f1a1 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -104,6 +104,7 @@ export * from './Warehouses'; export * from './Currencies'; export * from './FormTopbar' export * from './Paper'; +export * from './Accounts' const Hint = FieldHint; diff --git a/src/containers/Accounting/MakeJournal/components.js b/src/containers/Accounting/MakeJournal/components.js index cec39f28c..260adddd4 100644 --- a/src/containers/Accounting/MakeJournal/components.js +++ b/src/containers/Accounting/MakeJournal/components.js @@ -4,7 +4,12 @@ import { Popover2 } from '@blueprintjs/popover2'; import { useFormikContext } from 'formik'; import intl from 'react-intl-universal'; -import { ExchangeRateInputGroup, Icon, Hint, FormattedMessage as T } from 'components'; +import { + ExchangeRateInputGroup, + Icon, + Hint, + FormattedMessage as T, +} from 'components'; import { AccountsListFieldCell, MoneyFieldCell, @@ -63,7 +68,10 @@ export const ActionsCellRenderer = ({ }; const exampleMenu = ( - + ); return ( diff --git a/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js b/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js index 7f78410b5..833b156d9 100644 --- a/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js +++ b/src/containers/Drawers/BillDrawer/BillDetailActionsBar.js @@ -95,9 +95,9 @@ function BillDetailActionsBar({ onClick={handleQuickBillPayment} /> - +