Compare commits
6 Commits
v0.10.2
...
@bigcapita
| Author | SHA1 | Date | |
|---|---|---|---|
|
04b16a7d2f | ||
|
|
fd27136274 | ||
|
|
951e360405 | ||
|
|
d2242b7744 | ||
|
|
4e9b0ae24f | ||
|
|
e5ffb5661a |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
|
||||
"useWorkspaces": true,
|
||||
"version": "0.9.6",
|
||||
"npmClient": "npm"
|
||||
"version": "independent",
|
||||
"npmClient": "pnpm",
|
||||
"packages": ["packages/*"]
|
||||
}
|
||||
|
||||
5730
package-lock.json
generated
5730
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -2,7 +2,7 @@
|
||||
"name": "bigcapital-monorepo",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"bootstrap": "lerna exec npm install",
|
||||
"bootstrap": "lerna exec pnpm install",
|
||||
"dev": "lerna run dev",
|
||||
"build": "lerna run build",
|
||||
"dev:webapp": "lerna run dev --scope \"@bigcapital/webapp\"",
|
||||
@@ -13,10 +13,6 @@
|
||||
"test:e2e": "playwright test",
|
||||
"prepare": "husky install"
|
||||
},
|
||||
"workspaces": [
|
||||
"packages/*",
|
||||
"shared/*"
|
||||
],
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "^17.4.2",
|
||||
"@commitlint/config-conventional": "^17.4.2",
|
||||
|
||||
3
packages/server/.gitignore
vendored
3
packages/server/.gitignore
vendored
@@ -1,7 +1,6 @@
|
||||
/node_modules/
|
||||
/.env
|
||||
/storage
|
||||
package-lock.json
|
||||
stdout.log
|
||||
/dist
|
||||
/build
|
||||
/build
|
||||
|
||||
13663
packages/server/package-lock.json
generated
13663
packages/server/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@bigcapital/server",
|
||||
"version": "0.10.2",
|
||||
"version": "0.10.1",
|
||||
"description": "",
|
||||
"main": "src/server.ts",
|
||||
"scripts": {
|
||||
@@ -35,6 +35,7 @@
|
||||
"babel-loader": "^9.1.2",
|
||||
"bcryptjs": "^2.4.3",
|
||||
"bluebird": "^3.7.2",
|
||||
"body-parser": "^1.20.2",
|
||||
"compression": "^1.7.4",
|
||||
"country-codes-list": "^1.6.8",
|
||||
"cpy": "^8.1.2",
|
||||
@@ -72,6 +73,8 @@
|
||||
"memory-cache": "^0.2.0",
|
||||
"moment": "^2.24.0",
|
||||
"moment-range": "^4.0.2",
|
||||
"moment-timezone": "^0.5.43",
|
||||
"mongodb": "^6.1.0",
|
||||
"mongoose": "^5.10.0",
|
||||
"mustache": "^3.0.3",
|
||||
"mysql": "^2.17.1",
|
||||
@@ -131,7 +134,7 @@
|
||||
"rimraf": "^3.0.2",
|
||||
"rtlcss": "^3.3.0",
|
||||
"run-script-webpack-plugin": "^0.1.1",
|
||||
"sass": "^1.37.5",
|
||||
"sass": "^1.58.0",
|
||||
"sinon": "^7.4.2",
|
||||
"start-server-webpack-plugin": "^2.2.5",
|
||||
"ts-loader": "^9.4.2",
|
||||
|
||||
@@ -99,13 +99,6 @@ export default class ItemEntry extends TenantModel {
|
||||
: getExlusiveTaxAmount(this.amount, this.taxRate);
|
||||
}
|
||||
|
||||
static calcAmount(itemEntry) {
|
||||
const { discount, quantity, rate } = itemEntry;
|
||||
const total = quantity * rate;
|
||||
|
||||
return discount ? total - total * discount * 0.01 : total;
|
||||
}
|
||||
|
||||
/**
|
||||
* Item entry relations.
|
||||
*/
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
@bigcapitalhq:registry=https://npm.pkg.github.com
|
||||
17753
packages/webapp/package-lock.json
generated
17753
packages/webapp/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -3,15 +3,16 @@
|
||||
"version": "0.10.2",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@blueprintjs-formik/core": "^0.3.4",
|
||||
"@blueprintjs-formik/datetime": "^0.3.4",
|
||||
"@blueprintjs-formik/select": "^0.3.2",
|
||||
"@blueprintjs/core": "^3.50.2",
|
||||
"@blueprintjs/datetime": "^3.23.12",
|
||||
"@blueprintjs-formik/core": "^0.3.6",
|
||||
"@blueprintjs-formik/datetime": "^0.3.7",
|
||||
"@blueprintjs-formik/select": "^0.3.5",
|
||||
"@blueprintjs/colors": "4.1.19",
|
||||
"@blueprintjs/core": "^4.20.2",
|
||||
"@blueprintjs/datetime": "^4.4.37",
|
||||
"@blueprintjs/popover2": "^0.11.1",
|
||||
"@blueprintjs/select": "^3.11.2",
|
||||
"@blueprintjs/table": "^3.8.3",
|
||||
"@blueprintjs/timezone": "^3.6.2",
|
||||
"@blueprintjs/select": "^4.9.24",
|
||||
"@blueprintjs/table": "^4.10.12",
|
||||
"@blueprintjs/timezone": "^4.5.43",
|
||||
"@casl/ability": "^5.4.3",
|
||||
"@casl/react": "^2.3.0",
|
||||
"@craco/craco": "^5.9.0",
|
||||
@@ -26,6 +27,7 @@
|
||||
"@types/ramda": "^0.28.14",
|
||||
"@types/react": "^16.14.28",
|
||||
"@types/react-body-classname": "^1.1.7",
|
||||
"@types/react-dom": "^16.9.16",
|
||||
"@types/react-redux": "^7.1.24",
|
||||
"@types/react-router-dom": "^5.3.3",
|
||||
"@types/react-transition-group": "^4.4.5",
|
||||
@@ -38,44 +40,49 @@
|
||||
"axios": "^0.21.2",
|
||||
"basscss": "^8.0.2",
|
||||
"camelcase": "^5.3.1",
|
||||
"classnames": "^2.3.2",
|
||||
"cross-env": "^7.0.2",
|
||||
"deep-map-keys": "^2.0.1",
|
||||
"deepdash": "^5.3.9",
|
||||
"dependency-graph": "^0.11.0",
|
||||
"dotenv-webpack": "^8.0.1",
|
||||
"eslint": "^8.33.0",
|
||||
"fast-deep-equal": "^3.1.3",
|
||||
"flat": "^5.0.2",
|
||||
"formik": "^2.2.5",
|
||||
"history": "4.10.1",
|
||||
"http-proxy-middleware": "^1.0.0",
|
||||
"jest": "24.9.0",
|
||||
"jest-environment-jsdom-fourteen": "1.0.1",
|
||||
"jest-resolve": "24.9.0",
|
||||
"jest-watch-typeahead": "0.4.2",
|
||||
"js-cookie": "2.2.1",
|
||||
"js-money": "^0.6.3",
|
||||
"lodash": "^4.17.15",
|
||||
"moment": "^2.24.0",
|
||||
"moment-timezone": "^0.5.33",
|
||||
"node-sass": "^4.14.1",
|
||||
"path-browserify": "^1.0.1",
|
||||
"prop-types": "15.8.1",
|
||||
"query-string": "^7.1.1",
|
||||
"ramda": "^0.27.1",
|
||||
"react": "^16.14.0",
|
||||
"react": "^18.2.0",
|
||||
"react-app-polyfill": "^1.0.6",
|
||||
"react-body-classname": "^1.3.1",
|
||||
"react-content-loader": "^6.0.1",
|
||||
"react-dev-utils": "^11.0.4",
|
||||
"react-dom": "^16.12.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-dropzone": "^11.0.1",
|
||||
"react-error-boundary": "^3.0.2",
|
||||
"react-error-overlay": "^6.0.9",
|
||||
"react-hotkeys-hook": "^3.0.3",
|
||||
"react-intl-universal": "^2.4.7",
|
||||
"react-loadable": "^5.5.0",
|
||||
"react-query": "^3.6.0",
|
||||
"react-query-devtools": "^2.1.1",
|
||||
"react-redux": "^7.1.3",
|
||||
"react-redux": "^7.2.9",
|
||||
"react-router": "5.3.4",
|
||||
"react-router-breadcrumbs-hoc": "^3.2.10",
|
||||
"react-router-dom": "^5.3.3",
|
||||
"react-scripts": "^3.4.4",
|
||||
"react-scripts": "5.0.1",
|
||||
"react-scroll-sync": "^0.7.1",
|
||||
"react-scrollbars-custom": "^4.0.21",
|
||||
"react-sortablejs": "^2.0.11",
|
||||
@@ -86,11 +93,13 @@
|
||||
"react-use": "^13.26.1",
|
||||
"react-use-context-menu": "^0.1.4",
|
||||
"react-virtualized": "^9.22.3",
|
||||
"redux": "^4.0.5",
|
||||
"redux": "^4.2.1",
|
||||
"redux-devtools": "^3.5.0",
|
||||
"redux-persist": "^6.0.0",
|
||||
"redux-thunk": "^2.3.0",
|
||||
"redux-thunk": "^2.4.2",
|
||||
"reselect": "4.1.7",
|
||||
"rtl-detect": "^1.0.3",
|
||||
"sass": "^1.68.0",
|
||||
"semver": "6.3.0",
|
||||
"style-loader": "0.23.1",
|
||||
"styled-components": "^5.3.1",
|
||||
@@ -105,10 +114,6 @@
|
||||
"storybook": "start-storybook -p 6006"
|
||||
},
|
||||
"proxy": "http://localhost:3000/",
|
||||
"devDependencies": {
|
||||
"@types/react-dom": "^16.9.16",
|
||||
"react-error-overlay": "^6.0.9"
|
||||
},
|
||||
"resolutions": {
|
||||
"react-error-overlay": "6.0.9"
|
||||
},
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import { FSelect } from '@/components/Forms';
|
||||
|
||||
export function AccountsTypesSelect({ ...props }) {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
|
||||
// Filters accounts items.
|
||||
export const accountPredicate = (query, account, _index, exactMatch) => {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import { Formik, FastField, FieldArray, useFormikContext } from 'formik';
|
||||
import { Formik, FastField, FieldArray } from 'formik';
|
||||
import {
|
||||
Button,
|
||||
FormGroup,
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import { Router, Switch, Route } from 'react-router';
|
||||
import { createBrowserHistory } from 'history';
|
||||
import { QueryClientProvider, QueryClient } from 'react-query';
|
||||
|
||||
@@ -18,10 +18,10 @@ export const CardFooterActions = styled.div`
|
||||
border-top: 1px solid #e0e7ea;
|
||||
margin-top: 30px;
|
||||
|
||||
.bp3-button {
|
||||
.bp4-button {
|
||||
min-width: 70px;
|
||||
|
||||
+ .bp3-button {
|
||||
+ .bp4-button {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
.menu{
|
||||
:global .bp3-heading{
|
||||
:global .bp4-heading{
|
||||
font-weight: 400;
|
||||
opacity: 0.5;
|
||||
font-size: 12px;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import * as R from 'ramda';
|
||||
import BigcapitalLoading from './BigcapitalLoading';
|
||||
import withDashboard from '@/containers/Dashboard/withDashboard';
|
||||
|
||||
@@ -21,7 +21,7 @@ export function DataTableEditable({
|
||||
}
|
||||
|
||||
const DatatableEditableRoot = styled.div`
|
||||
.bp3-form-group {
|
||||
.bp4-form-group {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.table {
|
||||
@@ -69,17 +69,17 @@ const DatatableEditableRoot = styled.div`
|
||||
}
|
||||
.tr {
|
||||
&:hover .td,
|
||||
.bp3-input {
|
||||
.bp4-input {
|
||||
background-color: transparent;
|
||||
}
|
||||
.bp3-form-group:not(.bp3-intent-danger) .bp3-input,
|
||||
.form-group--select-list .bp3-button {
|
||||
.bp4-form-group:not(.bp4-intent-danger) .bp4-input,
|
||||
.form-group--select-list .bp4-button {
|
||||
border-color: #ffffff;
|
||||
color: #222;
|
||||
border-radius: 3px;
|
||||
text-align: inherit;
|
||||
}
|
||||
.bp3-form-group:not(.bp3-intent-danger) .bp3-input {
|
||||
.bp4-form-group:not(.bp4-intent-danger) .bp4-input {
|
||||
border-radius: 2px;
|
||||
padding-left: 14px;
|
||||
padding-right: 14px;
|
||||
@@ -88,7 +88,7 @@ const DatatableEditableRoot = styled.div`
|
||||
box-shadow: 0 0 0 2px #116cd0;
|
||||
}
|
||||
}
|
||||
.form-group--select-list .bp3-button {
|
||||
.form-group--select-list .bp4-button {
|
||||
padding-left: 6px;
|
||||
padding-right: 6px;
|
||||
|
||||
@@ -97,16 +97,16 @@ const DatatableEditableRoot = styled.div`
|
||||
}
|
||||
}
|
||||
.form-group--select-list,
|
||||
.bp3-form-group {
|
||||
&.bp3-intent-danger {
|
||||
.bp3-button:not(.bp3-minimal),
|
||||
.bp3-input {
|
||||
.bp4-form-group {
|
||||
&.bp4-intent-danger {
|
||||
.bp4-button:not(.bp4-minimal),
|
||||
.bp4-input {
|
||||
border-color: #f7b6b6;
|
||||
}
|
||||
}
|
||||
}
|
||||
.td.actions {
|
||||
.bp3-button {
|
||||
.bp4-button {
|
||||
color: #80858f;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ const DialogFooterActionsRoot = styled.div`
|
||||
${(props) =>
|
||||
props.alignment === 'right' ? 'margin-left: auto;' : 'margin-right: auto;'};
|
||||
|
||||
.bp3-button {
|
||||
.bp4-button {
|
||||
margin-left: 5px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import React from 'react';
|
||||
|
||||
import AccountDialog from '@/containers/Dialogs/AccountDialog';
|
||||
import InviteUserDialog from '@/containers/Dialogs/InviteUserDialog';
|
||||
import UserFormDialog from '@/containers/Dialogs/UserFormDialog';
|
||||
|
||||
@@ -17,8 +17,8 @@ export function DrawerMainTabs({ children, ...restProps }) {
|
||||
}
|
||||
|
||||
const DrawerMainTabsRoot = styled.div`
|
||||
.bp3-tabs {
|
||||
.bp3-tab-list {
|
||||
.bp4-tabs {
|
||||
.bp4-tab-list {
|
||||
position: relative;
|
||||
background-color: #fff;
|
||||
padding: 0 15px;
|
||||
@@ -28,7 +28,7 @@ const DrawerMainTabsRoot = styled.div`
|
||||
margin-right: 25px;
|
||||
}
|
||||
|
||||
&.bp3-large > .bp3-tab {
|
||||
&.bp4-large > .bp4-tab {
|
||||
font-size: 15px;
|
||||
color: #7f8596;
|
||||
margin: 0 1rem;
|
||||
@@ -38,13 +38,13 @@ const DrawerMainTabsRoot = styled.div`
|
||||
color: #0052cc;
|
||||
}
|
||||
}
|
||||
.bp3-tab-indicator-wrapper .bp3-tab-indicator {
|
||||
.bp4-tab-indicator-wrapper .bp4-tab-indicator {
|
||||
height: 2px;
|
||||
bottom: -2px;
|
||||
}
|
||||
}
|
||||
|
||||
.bp3-tab-panel {
|
||||
.bp4-tab-panel {
|
||||
margin-top: 0;
|
||||
|
||||
.card {
|
||||
|
||||
@@ -60,8 +60,8 @@ export function ExchangeRateMutedField({
|
||||
}
|
||||
|
||||
const ExchangeRateFormGroup = styled(FormGroup)`
|
||||
&.bp3-form-group {
|
||||
label.bp3-label {
|
||||
&.bp4-form-group {
|
||||
label.bp4-label {
|
||||
font-size: 12px;
|
||||
opacity: 0.7;
|
||||
line-height: 1;
|
||||
@@ -79,7 +79,7 @@ const ExchangeRateButton = styled.div`
|
||||
position: relative;
|
||||
padding-right: 28px;
|
||||
|
||||
.bp3-button {
|
||||
.bp4-button {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
}
|
||||
@@ -88,7 +88,7 @@ const ExchangeRateButton = styled.div`
|
||||
const ExchangeRateFormGroupContent = styled.div`
|
||||
padding: 5px 0;
|
||||
|
||||
.bp3-form-group {
|
||||
.bp4-form-group {
|
||||
padding: 2px;
|
||||
margin: 2px 4px !important;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ const SelectButton = styled(Button)`
|
||||
position: relative;
|
||||
padding-right: 30px;
|
||||
|
||||
&:not(.is-selected):not([class*='bp3-intent-']):not(.bp3-minimal) {
|
||||
&:not(.is-selected):not([class*='bp4-intent-']):not(.bp4-minimal) {
|
||||
color: #5c7080;
|
||||
}
|
||||
&:after {
|
||||
@@ -46,13 +46,13 @@ const SelectButton = styled(Button)`
|
||||
margin-right: 12px;
|
||||
border-radius: 1px;
|
||||
}
|
||||
&:not([class*='bp3-intent-']):not(.bp3-disabled) {
|
||||
&:not([class*='bp4-intent-']):not(.bp4-disabled) {
|
||||
&,
|
||||
&:hover {
|
||||
background: #fff;
|
||||
}
|
||||
}
|
||||
.bp3-intent-danger & {
|
||||
.bp4-intent-danger & {
|
||||
border-color: #db3737;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
import React from 'react';
|
||||
|
||||
export function MenuItemLabel({ text }) {
|
||||
return <span class="bp3-menu-item-labeler">{text}</span>;
|
||||
return <span class="bp4-menu-item-labeler">{text}</span>;
|
||||
}
|
||||
|
||||
@@ -18,16 +18,16 @@ const FormTopBarRoot = styled(Navbar)`
|
||||
height: 35px;
|
||||
padding: 0 20px;
|
||||
|
||||
.bp3-navbar-group {
|
||||
.bp4-navbar-group {
|
||||
height: 35px;
|
||||
}
|
||||
.bp3-navbar-divider {
|
||||
.bp4-navbar-divider {
|
||||
border-left-color: #d2dce2;
|
||||
}
|
||||
.bp3-skeleton {
|
||||
.bp4-skeleton {
|
||||
max-height: 10px;
|
||||
}
|
||||
.bp3-button {
|
||||
.bp4-button {
|
||||
&:hover {
|
||||
background: rgba(167, 182, 194, 0.12);
|
||||
color: #32304a;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
|
||||
export const For = ({ render, of }) =>
|
||||
|
||||
@@ -22,12 +22,12 @@ export function MakeJournalFormFooterLeft() {
|
||||
}
|
||||
|
||||
const DescriptionFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
.bp3-label {
|
||||
&.bp4-form-group {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import { Formik } from 'formik';
|
||||
import { Link } from 'react-router-dom';
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import styled from 'styled-components';
|
||||
import { Spinner } from '@blueprintjs/core';
|
||||
@@ -39,7 +40,7 @@ export const AuthInsiderCopyright = styled.div`
|
||||
color: #666;
|
||||
margin-top: 1.2rem;
|
||||
|
||||
.bp3-icon-bigcapital {
|
||||
.bp4-icon-bigcapital {
|
||||
svg {
|
||||
path {
|
||||
fill: #a3a3a3;
|
||||
@@ -65,11 +66,11 @@ export const AuthFooterLink = styled.p`
|
||||
export const AuthSubmitButton = styled(Button)`
|
||||
margin-top: 20px;
|
||||
|
||||
&.bp3-intent-primary {
|
||||
&.bp4-intent-primary {
|
||||
background-color: #0052cc;
|
||||
|
||||
&:disabled,
|
||||
&.bp3-disabled {
|
||||
&.bp4-disabled {
|
||||
background-color: rgba(0, 82, 204, 0.4);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -178,7 +178,7 @@ const AccountSwitchItemUpdatedAt = styled.div`
|
||||
`;
|
||||
|
||||
const AccountSwitchButtonBase = styled(Button)`
|
||||
.bp3-button-text {
|
||||
.bp4-button-text {
|
||||
margin-right: 5px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -53,7 +53,7 @@ export const ItemManuTransaction = ({ onChange }) => {
|
||||
};
|
||||
|
||||
const ItemSwitchButton = styled(Button)`
|
||||
.bp3-button-text {
|
||||
.bp4-button-text {
|
||||
display: flex;
|
||||
color: #727983;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import intl from 'react-intl-universal';
|
||||
import { defaultTo } from 'lodash';
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import styled from 'styled-components';
|
||||
|
||||
import { CommercialDocBox } from '@/components';
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import styled from 'styled-components';
|
||||
|
||||
import { Card } from '@/components';
|
||||
|
||||
@@ -17,21 +17,11 @@ import {
|
||||
useItemEntriesTableContext,
|
||||
} from './ItemEntriesTableProvider';
|
||||
import { useUncontrolled } from '@/hooks/useUncontrolled';
|
||||
import { ItemEntry } from '@/interfaces/ItemEntries';
|
||||
|
||||
interface ItemsEntriesTableProps {
|
||||
initialValue?: ItemEntry;
|
||||
value?: ItemEntry[];
|
||||
onChange?: (entries: ItemEntry[]) => void;
|
||||
taxRates?: any[];
|
||||
minLinesNumber?: number;
|
||||
enableTaxRates?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Items entries table.
|
||||
*/
|
||||
function ItemsEntriesTable(props: ItemsEntriesTableProps) {
|
||||
function ItemsEntriesTable(props) {
|
||||
const { value, initialValue, onChange } = props;
|
||||
|
||||
const [localValue, handleChange] = useUncontrolled({
|
||||
@@ -129,11 +119,8 @@ ItemsEntriesTable.defaultProps = {
|
||||
discount: '',
|
||||
},
|
||||
initialEntries: [],
|
||||
taxRates: [],
|
||||
items: [],
|
||||
linesNumber: 1,
|
||||
minLinesNumber: 1,
|
||||
enableTaxRates: true,
|
||||
};
|
||||
|
||||
export default ItemsEntriesTable;
|
||||
|
||||
@@ -92,7 +92,7 @@ const LandedCostHeaderCell = () => {
|
||||
*/
|
||||
export function useEditableItemsEntriesColumns() {
|
||||
const { featureCan } = useFeatureCan();
|
||||
const { landedCost, enableTaxRates } = useItemEntriesTableContext();
|
||||
const { landedCost } = useItemEntriesTableContext();
|
||||
|
||||
const isProjectsFeatureEnabled = featureCan(Features.Projects);
|
||||
|
||||
@@ -132,17 +132,13 @@ export function useEditableItemsEntriesColumns() {
|
||||
width: 70,
|
||||
align: Align.Right,
|
||||
},
|
||||
...(enableTaxRates
|
||||
? [
|
||||
{
|
||||
Header: 'Tax rate',
|
||||
accessor: 'tax_rate_id',
|
||||
Cell: TaxRatesSuggestInputCell,
|
||||
disableSortBy: true,
|
||||
width: 110,
|
||||
},
|
||||
]
|
||||
: []),
|
||||
{
|
||||
Header: 'Tax rate',
|
||||
accessor: 'tax_rate_id',
|
||||
Cell: TaxRatesSuggestInputCell,
|
||||
disableSortBy: true,
|
||||
width: 110,
|
||||
},
|
||||
{
|
||||
Header: intl.get('discount'),
|
||||
accessor: 'discount',
|
||||
|
||||
@@ -20,12 +20,12 @@ export function ExpenseFormFooterLeft() {
|
||||
);
|
||||
}
|
||||
const DescriptionFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
.bp3-label {
|
||||
&.bp4-form-group {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ export default compose(
|
||||
)(APAgingSummaryHeader);
|
||||
|
||||
const APAgingDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 520px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -14,12 +14,11 @@ import classNames from 'classnames';
|
||||
|
||||
import NumberFormatDropdown from '@/components/NumberFormatDropdown';
|
||||
|
||||
import { safeInvoke } from '@blueprintjs/core/lib/esm/common/utils';
|
||||
import { useARAgingSummaryContext } from './ARAgingSummaryProvider';
|
||||
import withARAgingSummaryActions from './withARAgingSummaryActions';
|
||||
import withARAgingSummary from './withARAgingSummary';
|
||||
|
||||
import { compose } from '@/utils';
|
||||
import { compose, safeInvoke } from '@/utils';
|
||||
|
||||
/**
|
||||
* A/R Aging summary sheet - Actions bar.
|
||||
|
||||
@@ -116,7 +116,7 @@ export default compose(
|
||||
)(ARAgingSummaryHeader);
|
||||
|
||||
const ARAgingDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 520px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -125,7 +125,7 @@ export default compose(
|
||||
)(BalanceSheetHeader);
|
||||
|
||||
const BalanceSheetFinancialHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 520px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -159,7 +159,7 @@ export default function BalanceSheetHeaderComparisonPanal() {
|
||||
}
|
||||
|
||||
const BalanceSheetComparisonWrap = styled.div`
|
||||
.bp3-form-group {
|
||||
.bp4-form-group {
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
|
||||
import { Row, Col } from '@/components';
|
||||
import FinancialStatementDateRange from '../FinancialStatementDateRange';
|
||||
import FinancialStatementsFilter from '../FinancialStatementsFilter';
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import {
|
||||
NavbarGroup,
|
||||
Button,
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import { FastField } from 'formik';
|
||||
import { DateInput } from '@blueprintjs/datetime';
|
||||
import { FormGroup, Position, Checkbox } from '@blueprintjs/core';
|
||||
|
||||
@@ -100,7 +100,7 @@ export default compose(
|
||||
)(CustomersBalanceSummaryHeader);
|
||||
|
||||
const CustomerBalanceDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 450px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -101,7 +101,7 @@ export default compose(
|
||||
)(CustomersTransactionsHeader);
|
||||
|
||||
const CustomerTransactionsDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 450px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -47,7 +47,7 @@ export default function FinancialStatementsFilter({
|
||||
{({ form: { setFieldValue }, field: { value } }) => (
|
||||
<FormGroup
|
||||
label={label}
|
||||
className="form-group--select-list bp3-fill"
|
||||
className="form-group--select-list bp4-fill"
|
||||
inline={false}
|
||||
>
|
||||
<ListSelect
|
||||
|
||||
@@ -120,7 +120,7 @@ export default compose(
|
||||
)(GeneralLedgerHeader);
|
||||
|
||||
const GeneralLedgerDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 520px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -119,7 +119,7 @@ export default compose(
|
||||
)(InventoryItemDetailsHeader);
|
||||
|
||||
const InventoryItemDetailsDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 400px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -117,7 +117,7 @@ export default compose(
|
||||
)(InventoryValuationHeader);
|
||||
|
||||
const InventoryValuationDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 450px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -98,7 +98,7 @@ export default compose(
|
||||
)(JournalHeader);
|
||||
|
||||
const JournalDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 350px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -114,7 +114,7 @@ export default R.compose(
|
||||
)(ProfitLossHeader);
|
||||
|
||||
const ProfitLossSheetHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 520px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -191,7 +191,7 @@ export default function ProfitLossSheetHeaderComparisonPanel() {
|
||||
}
|
||||
|
||||
const ProfitLossSheetComparisonWrap = styled.div`
|
||||
.bp3-form-group {
|
||||
.bp4-form-group {
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -109,7 +109,7 @@ export default compose(
|
||||
)(ProjectProfitabilitySummaryHeader);
|
||||
|
||||
const ProjectProfitabilityDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 520px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -98,7 +98,7 @@ export default compose(
|
||||
)(PurchasesByItemsHeader);
|
||||
|
||||
const PurchasesByItemsDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 450px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -105,7 +105,7 @@ export default compose(
|
||||
)(SalesByItemsHeader);
|
||||
|
||||
const SalesByItemsDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 450px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -108,7 +108,7 @@ export default compose(
|
||||
)(SalesTaxLiabilitySummaryHeader);
|
||||
|
||||
const SalesTaxSummaryFinancialHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 320px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -18,7 +18,7 @@ export default function SelectsListColumnsBy(props) {
|
||||
{({ form, field: { value }, meta: { error, touched } }) => (
|
||||
<FormGroup
|
||||
label={<T id={'display_report_columns'} />}
|
||||
className="form-group-display-columns-by form-group--select-list bp3-fill"
|
||||
className="form-group-display-columns-by form-group--select-list bp4-fill"
|
||||
inline={false}
|
||||
{...formGroupProps}
|
||||
>
|
||||
|
||||
@@ -127,7 +127,7 @@ export default compose(
|
||||
)(TrialBalanceSheetHeader);
|
||||
|
||||
const TrialBalanceSheetDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 450px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -102,7 +102,7 @@ export default compose(
|
||||
)(VendorsBalanceSummaryHeader);
|
||||
|
||||
const VendorBalanceDrawerHeader = styled(FinancialStatementHeader)`
|
||||
.bp3-drawer {
|
||||
.bp4-drawer {
|
||||
max-height: 450px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import {
|
||||
NavbarGroup,
|
||||
NavbarDivider,
|
||||
|
||||
@@ -87,7 +87,7 @@ const BranchesTable = styled(DataTable)`
|
||||
min-height: 38px;
|
||||
|
||||
.td.td-name {
|
||||
.bp3-icon {
|
||||
.bp4-icon {
|
||||
margin: 0;
|
||||
margin-left: 2px;
|
||||
vertical-align: top;
|
||||
|
||||
@@ -221,10 +221,10 @@ const CardFooterActions = styled.div`
|
||||
border-top: 1px solid #e0e7ea;
|
||||
margin-top: 30px;
|
||||
|
||||
.bp3-button {
|
||||
.bp4-button {
|
||||
min-width: 70px;
|
||||
|
||||
+ .bp3-button {
|
||||
+ .bp4-button {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
// @ts-nocheck
|
||||
import React from 'react';
|
||||
import ContentLoader from 'react-content-loader';
|
||||
|
||||
export default function PreferencesPageLoader(props) {
|
||||
|
||||
@@ -49,7 +49,7 @@ const RoleFormFloatingActionsRoot = styled.div`
|
||||
border-top: 1px solid #d2dde2;
|
||||
box-shadow: 0px -1px 4px 0px rgb(0 0 0 / 5%);
|
||||
|
||||
.bp3-button {
|
||||
.bp4-button {
|
||||
margin-right: 10px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -374,7 +374,7 @@ export const RolesPermissionList = () => {
|
||||
};
|
||||
|
||||
const PermissionCheckbox = styled(Checkbox)`
|
||||
&.bp3-control.bp3-checkbox .bp3-control-indicator {
|
||||
&.bp4-control.bp4-checkbox .bp4-control-indicator {
|
||||
border-radius: 2px;
|
||||
border-color: #555;
|
||||
|
||||
@@ -454,7 +454,7 @@ const ModulePermissionsTableRoot = styled.table`
|
||||
}
|
||||
|
||||
tr td {
|
||||
.bp3-control.bp3-inline {
|
||||
.bp4-control.bp4-inline {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ export const WarehouseTitle = styled.div`
|
||||
font-weight: 500;
|
||||
line-height: 1;
|
||||
|
||||
.bp3-icon {
|
||||
.bp4-icon {
|
||||
margin: 0;
|
||||
margin-left: 2px;
|
||||
vertical-align: top;
|
||||
|
||||
@@ -40,17 +40,17 @@ function EstimatedExpenseFormDialog({
|
||||
export default compose(withDialogRedux())(EstimatedExpenseFormDialog);
|
||||
|
||||
const EstimateExpenseFormDialogRoot = styled(Dialog)`
|
||||
.bp3-dialog-body {
|
||||
.bp3-form-group {
|
||||
.bp4-dialog-body {
|
||||
.bp4-form-group {
|
||||
margin-bottom: 15px;
|
||||
|
||||
label.bp3-label {
|
||||
label.bp4-label {
|
||||
margin-bottom: 3px;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.bp3-dialog-footer {
|
||||
.bp4-dialog-footer {
|
||||
padding-top: 10px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -48,7 +48,7 @@ function ProjectEntriesFormFloatingActions({
|
||||
export default compose(withDialogActions)(ProjectEntriesFormFloatingActions);
|
||||
|
||||
const SaveButton = styled(Button)`
|
||||
&.bp3-button {
|
||||
&.bp4-button {
|
||||
margin-left: 0px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -102,8 +102,8 @@ const BillableEntryFooter = styled.div`
|
||||
`;
|
||||
|
||||
const BillableEntryButton = styled(Button)`
|
||||
&.bp3-button.bp3-small,
|
||||
&.bp3-button:not([class*='bp3-intent-']):not(.bp3-minimal).bp3-small {
|
||||
&.bp4-button.bp4-small,
|
||||
&.bp4-button:not([class*='bp4-intent-']):not(.bp4-minimal).bp4-small {
|
||||
font-size: 12px;
|
||||
color: #2172ed;
|
||||
background: transparent;
|
||||
|
||||
@@ -41,18 +41,18 @@ function ProjectBillableEntriesFormDialog({
|
||||
export default compose(withDialogRedux())(ProjectBillableEntriesFormDialog);
|
||||
|
||||
const ProjectBillableEntriesFormDialogRoot = styled(Dialog)`
|
||||
.bp3-dialog-body {
|
||||
.bp3-form-group {
|
||||
.bp4-dialog-body {
|
||||
.bp4-form-group {
|
||||
margin-bottom: 15px;
|
||||
|
||||
label.bp3-label {
|
||||
label.bp4-label {
|
||||
margin-bottom: 3px;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.bp3-dialog-footer {
|
||||
.bp3-dialog-footer-actions {
|
||||
.bp4-dialog-footer {
|
||||
.bp4-dialog-footer-actions {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
@@ -48,8 +48,8 @@ export default function ProjectDetailTabs() {
|
||||
}
|
||||
|
||||
const ProjectTabsContent = styled.div`
|
||||
.bp3-tabs {
|
||||
.bp3-tab-list {
|
||||
.bp4-tabs {
|
||||
.bp4-tab-list {
|
||||
padding: 0 20px;
|
||||
background-color: #fff;
|
||||
border-bottom: 1px solid #d2dce2;
|
||||
@@ -58,7 +58,7 @@ const ProjectTabsContent = styled.div`
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
&.bp3-large > .bp3-tab {
|
||||
&.bp4-large > .bp4-tab {
|
||||
font-size: 15px;
|
||||
font-weight: 400;
|
||||
color: #7f8596;
|
||||
@@ -69,12 +69,12 @@ const ProjectTabsContent = styled.div`
|
||||
color: #0052cc;
|
||||
}
|
||||
}
|
||||
.bp3-tab-indicator-wrapper .bp3-tab-indicator {
|
||||
.bp4-tab-indicator-wrapper .bp4-tab-indicator {
|
||||
height: 2px;
|
||||
bottom: -2px;
|
||||
}
|
||||
}
|
||||
.bp3-tab-panel {
|
||||
.bp4-tab-panel {
|
||||
/* margin: 20px 32px; */
|
||||
/* margin: 20px; */
|
||||
/* margin-top: 20px;
|
||||
|
||||
@@ -109,13 +109,13 @@ const TaskTimeFull = styled.div`
|
||||
`;
|
||||
|
||||
const TaskProgressBar = styled(ProgressBar)`
|
||||
&.bp3-progress-bar {
|
||||
&.bp4-progress-bar {
|
||||
display: block;
|
||||
flex-shrink: 0;
|
||||
height: 4px;
|
||||
max-width: 150px;
|
||||
&,
|
||||
.bp3-progress-meter {
|
||||
.bp4-progress-meter {
|
||||
border-radius: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,10 +76,10 @@ export const FinancialCardText = styled.div`
|
||||
color: #7b8195;
|
||||
`;
|
||||
export const FinancialCardProgressBar = styled(ProgressBar)`
|
||||
&.bp3-progress-bar {
|
||||
&.bp4-progress-bar {
|
||||
height: 3px;
|
||||
&,
|
||||
.bp3-progress-meter {
|
||||
.bp4-progress-meter {
|
||||
border-radius: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,17 +40,17 @@ function ProjectExpenseFormDialog({
|
||||
export default compose(withDialogRedux())(ProjectExpenseFormDialog);
|
||||
|
||||
const ProjectExpenseFormDialogRoot = styled(Dialog)`
|
||||
.bp3-dialog-body {
|
||||
.bp3-form-group {
|
||||
.bp4-dialog-body {
|
||||
.bp4-form-group {
|
||||
margin-bottom: 15px;
|
||||
|
||||
label.bp3-label {
|
||||
label.bp4-label {
|
||||
margin-bottom: 3px;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.bp3-dialog-footer {
|
||||
.bp4-dialog-footer {
|
||||
padding-top: 10px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -43,17 +43,17 @@ function ProjectFormDialog({
|
||||
export default compose(withDialogRedux())(ProjectFormDialog);
|
||||
|
||||
const ProjectFormDialogRoot = styled(Dialog)`
|
||||
.bp3-dialog-body {
|
||||
.bp3-form-group {
|
||||
.bp4-dialog-body {
|
||||
.bp4-form-group {
|
||||
margin-bottom: 0;
|
||||
|
||||
label.bp3-label {
|
||||
label.bp4-label {
|
||||
margin-bottom: 3px;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.bp3-dialog-footer {
|
||||
.bp4-dialog-footer {
|
||||
padding-top: 10px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -34,22 +34,22 @@ function ProjectInvoicingFormDialog({ dialogName, payload: {}, isOpen }) {
|
||||
export default compose(withDialogRedux())(ProjectInvoicingFormDialog);
|
||||
|
||||
const ProjectInvoicingFormDialogRoot = styled(Dialog)`
|
||||
.bp3-dialog-body {
|
||||
.bp3-form-group {
|
||||
.bp4-dialog-body {
|
||||
.bp4-form-group {
|
||||
margin-bottom: 15px;
|
||||
margin-top: 15px;
|
||||
|
||||
label.bp3-label {
|
||||
label.bp4-label {
|
||||
margin-bottom: 3px;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
|
||||
label.bp3-control.bp3-checkbox {
|
||||
label.bp4-control.bp4-checkbox {
|
||||
margin-top: 15px;
|
||||
}
|
||||
}
|
||||
.bp3-dialog-footer {
|
||||
.bp4-dialog-footer {
|
||||
padding-top: 10px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -113,7 +113,7 @@ function ProjectTimeEntryFormFields() {
|
||||
export default ProjectTimeEntryFormFields;
|
||||
|
||||
const DurationInputGroup = styled(FInputGroup)`
|
||||
.bp3-input {
|
||||
.bp4-input {
|
||||
width: 150px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -47,18 +47,18 @@ function ProjectTimeEntryFormDialog({
|
||||
export default compose(withDialogRedux())(ProjectTimeEntryFormDialog);
|
||||
|
||||
const ProjectTimeEntryFormDialogRoot = styled(Dialog)`
|
||||
.bp3-dialog-body {
|
||||
.bp3-form-group {
|
||||
.bp4-dialog-body {
|
||||
.bp4-form-group {
|
||||
margin-bottom: 0;
|
||||
|
||||
label.bp3-label {
|
||||
label.bp4-label {
|
||||
margin-bottom: 3px;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
.form-group {
|
||||
&--description {
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
textarea {
|
||||
width: 100%;
|
||||
min-width: 100%;
|
||||
@@ -68,7 +68,7 @@ const ProjectTimeEntryFormDialogRoot = styled(Dialog)`
|
||||
}
|
||||
}
|
||||
}
|
||||
.bp3-dialog-footer {
|
||||
.bp4-dialog-footer {
|
||||
padding-top: 10px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -195,13 +195,13 @@ const ProjectStatusTaskAmount = styled.div`
|
||||
`;
|
||||
|
||||
const ProjectProgressBar = styled(ProgressBar)`
|
||||
&.bp3-progress-bar {
|
||||
&.bp4-progress-bar {
|
||||
display: block;
|
||||
flex-shrink: 0;
|
||||
height: 3px;
|
||||
max-width: 110px;
|
||||
&,
|
||||
.bp3-progress-meter {
|
||||
.bp4-progress-meter {
|
||||
border-radius: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,12 +22,12 @@ export function BillFormFooterLeft() {
|
||||
}
|
||||
|
||||
const TermsConditsFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
.bp3-label {
|
||||
&.bp4-form-group {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,8 +27,8 @@ export default function BillFormBody({ defaultBill }) {
|
||||
meta: { error, touched },
|
||||
}) => (
|
||||
<ItemsEntriesTable
|
||||
value={value}
|
||||
onChange={(entries) => {
|
||||
entries={value}
|
||||
onUpdateData={(entries) => {
|
||||
setFieldValue('entries', entries);
|
||||
}}
|
||||
items={items}
|
||||
@@ -37,7 +37,6 @@ export default function BillFormBody({ defaultBill }) {
|
||||
currencyCode={values.currency_code}
|
||||
itemType={ITEM_TYPE.PURCHASABLE}
|
||||
landedCost={true}
|
||||
enableTaxRates={false}
|
||||
/>
|
||||
)}
|
||||
</FastField>
|
||||
|
||||
@@ -88,7 +88,7 @@ export function BillUniversalSearchItem(
|
||||
text={
|
||||
<div>
|
||||
<div>{item.text}</div>
|
||||
<span class="bp3-text-muted">
|
||||
<span class="bp4-text-muted">
|
||||
{item.reference.bill_number}{' '}
|
||||
<Icon icon={'caret-right-16'} iconSize={16} />
|
||||
{item.reference.formatted_bill_date}
|
||||
|
||||
@@ -22,12 +22,12 @@ export function VendorCreditNoteFormFooterLeft() {
|
||||
}
|
||||
|
||||
const TermsConditsFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
.bp3-label {
|
||||
&.bp4-form-group {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,15 +22,14 @@ export default function VendorCreditNoteItemsEntriesEditor() {
|
||||
meta: { error, touched },
|
||||
}) => (
|
||||
<ItemsEntriesTable
|
||||
value={value}
|
||||
onChange={(entries) => {
|
||||
entries={value}
|
||||
onUpdateData={(entries) => {
|
||||
setFieldValue('entries', entries);
|
||||
}}
|
||||
items={items}
|
||||
errors={error}
|
||||
linesNumber={4}
|
||||
currencyCode={values.currency_code}
|
||||
enableTaxRates={false}
|
||||
/>
|
||||
)}
|
||||
</FastField>
|
||||
|
||||
@@ -74,7 +74,7 @@ export function VendorCreditUniversalSearchItem(
|
||||
text={
|
||||
<div>
|
||||
<div>{item.text}</div>
|
||||
<span class="bp3-text-muted">
|
||||
<span class="bp4-text-muted">
|
||||
{item.reference.vendor_credit_number}{' '}
|
||||
<Icon icon={'caret-right-16'} iconSize={16} />
|
||||
{item.reference.formatted_vendor_credit_date}
|
||||
|
||||
@@ -28,14 +28,14 @@ export function PaymentMadeFormFooterLeft() {
|
||||
}
|
||||
|
||||
const InternalNoteFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
&.bp4-form-group {
|
||||
margin-bottom: 40px;
|
||||
|
||||
.bp3-label {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ export function PaymentMadeUniversalSearchItem(
|
||||
<div>
|
||||
<div>{highlightText(text, query)}</div>
|
||||
|
||||
<span class="bp3-text-muted">
|
||||
<span class="bp4-text-muted">
|
||||
{reference.payment_number && (
|
||||
<>
|
||||
{highlightText(reference.payment_number, query)}
|
||||
|
||||
@@ -34,26 +34,26 @@ export function CreditNoteFormFooterLeft() {
|
||||
}
|
||||
|
||||
const CreditNoteMsgFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
&.bp4-form-group {
|
||||
margin-bottom: 40px;
|
||||
|
||||
.bp3-label {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
const TermsConditsFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
.bp3-label {
|
||||
&.bp4-form-group {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,15 +26,14 @@ export default function CreditNoteItemsEntriesEditorField() {
|
||||
meta: { error, touched },
|
||||
}) => (
|
||||
<ItemsEntriesTable
|
||||
value={value}
|
||||
onChange={(entries) => {
|
||||
entries={value}
|
||||
onUpdateData={(entries) => {
|
||||
setFieldValue('entries', entries);
|
||||
}}
|
||||
items={items}
|
||||
errors={error}
|
||||
linesNumber={4}
|
||||
currencyCode={values.currency_code}
|
||||
enableTaxRates={false}
|
||||
/>
|
||||
)}
|
||||
</FastField>
|
||||
|
||||
@@ -73,7 +73,7 @@ export function CreditNoteUniversalSearchItem(
|
||||
text={
|
||||
<div>
|
||||
<div>{item.text}</div>
|
||||
<span class="bp3-text-muted">
|
||||
<span class="bp4-text-muted">
|
||||
{item.reference.credit_note_number}{' '}
|
||||
<Icon icon={'caret-right-16'} iconSize={16} />
|
||||
{item.reference.formatted_credit_note_date}
|
||||
|
||||
@@ -34,26 +34,26 @@ export function EstimateFormFooterLeft() {
|
||||
}
|
||||
|
||||
const EstimateMsgFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
&.bp4-form-group {
|
||||
margin-bottom: 40px;
|
||||
|
||||
.bp3-label {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
const TermsConditsFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
.bp3-label {
|
||||
&.bp4-form-group {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,15 +26,14 @@ export default function EstimateFormItemsEntriesField() {
|
||||
meta: { error, touched },
|
||||
}) => (
|
||||
<ItemsEntriesTable
|
||||
value={value}
|
||||
onChange={(entries) => {
|
||||
entries={value}
|
||||
onUpdateData={(entries) => {
|
||||
setFieldValue('entries', entries);
|
||||
}}
|
||||
items={items}
|
||||
errors={error}
|
||||
linesNumber={4}
|
||||
currencyCode={values.currency_code}
|
||||
enableTaxRates={false}
|
||||
/>
|
||||
)}
|
||||
</FastField>
|
||||
|
||||
@@ -31,15 +31,6 @@ export const defaultEstimateEntry = {
|
||||
amount: '',
|
||||
};
|
||||
|
||||
const defaultEstimateEntryReq = {
|
||||
index: 0,
|
||||
item_id: '',
|
||||
rate: '',
|
||||
discount: '',
|
||||
quantity: '',
|
||||
description: '',
|
||||
};
|
||||
|
||||
export const defaultEstimate = {
|
||||
customer_id: '',
|
||||
estimate_date: moment(new Date()).format('YYYY-MM-DD'),
|
||||
@@ -157,9 +148,7 @@ export const transfromsFormValuesToRequest = (values) => {
|
||||
...(values.estimate_number_manually && {
|
||||
estimate_number: values.estimate_number,
|
||||
}),
|
||||
entries: entries.map((entry) => ({
|
||||
...transformToForm(entry, defaultEstimateEntryReq),
|
||||
})),
|
||||
entries: entries.map((entry) => ({ ...omit(entry, ['amount']) })),
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ export function EstimateUniversalSearchItem(
|
||||
text={
|
||||
<div>
|
||||
<div>{item.text}</div>
|
||||
<span class="bp3-text-muted">
|
||||
<span class="bp4-text-muted">
|
||||
{item.reference.estimate_number}{' '}
|
||||
<Icon icon={'caret-right-16'} iconSize={16} />
|
||||
{item.reference.formatted_estimate_date}
|
||||
|
||||
@@ -60,7 +60,7 @@ const InclusiveFormGroup = styled(FFormGroup)`
|
||||
margin-bottom: 0;
|
||||
margin-left: auto;
|
||||
|
||||
&.bp3-form-group.bp3-inline label.bp3-label {
|
||||
&.bp4-form-group.bp4-inline label.bp4-label {
|
||||
line-height: 1.25;
|
||||
opacity: 0.6;
|
||||
margin-right: 8px;
|
||||
@@ -68,7 +68,7 @@ const InclusiveFormGroup = styled(FFormGroup)`
|
||||
`;
|
||||
|
||||
const InclusiveSelect = styled(FSelect)`
|
||||
.bp3-button {
|
||||
.bp4-button {
|
||||
padding-right: 24px;
|
||||
}
|
||||
`;
|
||||
|
||||
@@ -35,26 +35,26 @@ export function InvoiceFormFooterLeft() {
|
||||
}
|
||||
|
||||
const InvoiceMsgFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
&.bp4-form-group {
|
||||
margin-bottom: 40px;
|
||||
|
||||
.bp3-label {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
const TermsConditsFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
.bp3-label {
|
||||
&.bp4-form-group {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ export function InvoiceUniversalSearchItem(
|
||||
text={
|
||||
<div>
|
||||
<div>{highlightText(item.text, query)}</div>
|
||||
<span class="bp3-text-muted">
|
||||
<span class="bp4-text-muted">
|
||||
{highlightText(item.reference.invoice_no, query)}{' '}
|
||||
<Icon icon={'caret-right-16'} iconSize={16} />
|
||||
{item.reference.formatted_invoice_date}
|
||||
|
||||
@@ -26,12 +26,12 @@ export function PaymentReceiveFormFootetLeft() {
|
||||
}
|
||||
|
||||
const TermsConditsFormGroup = styled(FFormGroup)`
|
||||
&.bp3-form-group {
|
||||
.bp3-label {
|
||||
&.bp4-form-group {
|
||||
.bp4-label {
|
||||
font-size: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.bp3-form-content {
|
||||
.bp4-form-content {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user