QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-15 12:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop

Browse Source
This commit is contained in:
a.bouhuolia
2021-11-11 17:20:57 +02:00
parent 4c58e49169 376a16fd65
commit b6f0f6c2d5
13 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/components/DisplayNameList.js
View File

@@ -1,5 +1,6 @@
import React from 'react';
import ListSelect from "./ListSelect";
import intl from 'react-intl-universal';
import ListSelect from './ListSelect';
export default function DisplayNameList({
salutation,
@@ -9,25 +10,32 @@ export default function DisplayNameList({
...restProps
}) {
const formats = [
{ format: '{1} {2} {3}', values: [salutation, firstName, lastName], required: [1] },
{
format: '{1} {2} {3}',
values: [salutation, firstName, lastName],
required: [1],
},
{ format: '{1} {2}', values: [firstName, lastName], required: [] },
{ format: '{1}, {2}', values: [firstName, lastName], required: [1, 2] },
{ format: '{1}', values: [company], required: [1] }
{ format: '{1}', values: [company], required: [1] },
];
const formatOptions = formats
.filter((format) => !format.values.some((value, index) => {
return !value && format.required.indexOf(index + 1) !== -1;
}))
.filter(
(format) =>
!format.values.some((value, index) => {
return !value && format.required.indexOf(index + 1) !== -1;
}),
)
.map((formatOption) => {
const { format, values } = formatOption;
let label = format;
values.forEach((value, index) => {
const replaceWith = (value || '');
const replaceWith = value || '';
label = label.replace(`{${index + 1}}`, replaceWith).trim();
});
return { label: label.replace(/\s+/g, " ") };
return { label: label.replace(/\s+/g, ' ') };
});
return (
@@ -35,9 +43,9 @@ export default function DisplayNameList({
items={formatOptions}
selectedItemProp={'label'}
textProp={'label'}
defaultText={'Select display name as'}
defaultText={intl.get('select_display_name_as')}
filterable={false}
{ ...restProps }
{...restProps}
/>
);
}
}

2
src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.js
View File

@@ -25,7 +25,7 @@ export default function CustomersBalanceSummaryTable({
const columns = useCustomersSummaryColumns();
const rowClassNames = (row) => {
return [`row-type--${row.original.rowTypes}`];
return [`row-type--${row.original.row_types}`];
};
return (

2
src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsTable.js
View File

@@ -31,7 +31,7 @@ export default function CustomersTransactionsTable({
]);
const rowClassNames = (row) => {
return [`row-type--${row.original.rowTypes}`];
return [`row-type--${row.original.row_types}`];
};
return (

4
src/containers/FinancialStatements/CustomersTransactions/components.js
View File

@@ -22,14 +22,14 @@ export const useCustomersTransactionsColumns = () => {
return (
<span
className={'force-width'}
style={{ minWidth: getForceWidth(cells[0].key) }}
style={{ minWidth: getForceWidth(cells[0].value) }}
>
{cells[0].value}
</span>
);
},
className: 'customer_name',
textOverview: true,
// textOverview: true,
},
{
Header: intl.get('account_name'),

2
src/containers/FinancialStatements/GeneralLedger/components.js
View File

@@ -35,7 +35,7 @@ export function useGeneralLedgerTableColumns() {
return row.date;
},
className: 'date',
textOverview: true,
// textOverview: true,
width: 120,
},
{

2
src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.js
View File

@@ -29,7 +29,7 @@ export default function InventoryItemDetailsTable({
);
const rowClassNames = (row) => {
return [`row-type--${row.original.rowTypes}`];
return [`row-type--${row.original.row_types}`];
};
return (

2
src/containers/FinancialStatements/InventoryItemDetails/utils.js
View File

@@ -9,7 +9,7 @@ const columnsMapper = (data, index, column) => ({
id: column.key,
key: column.key,
Header: column.label,
// Cell: CellForceWidth,
Cell: CellForceWidth,
accessor: `cells[${index}].value`,
forceWidthAccess: `cells[0].value`,
className: column.key,

2
src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js
View File

@@ -25,7 +25,7 @@ export default function VendorsBalanceSummaryTable({
const columns = useVendorsBalanceColumns();
const rowClassNames = (row) => {
return [`row-type--${row.original.rowTypes}`];
return [`row-type--${row.original.row_types}`];
};
return (

2
src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js
View File

@@ -32,7 +32,7 @@ export default function VendorsTransactionsTable({
]);
const rowClassNames = (row) => {
return [`row-type--${row.original.rowTypes}`];
return [`row-type--${row.original.row_types}`];
};
return (

4
src/containers/FinancialStatements/VendorsTransactions/components.js
View File

@@ -21,14 +21,14 @@ export const useVendorsTransactionsColumns = () => {
return (
<span
className={'force-width'}
style={{ minWidth: getForceWidth(cells[0].key) }}
style={{ minWidth: getForceWidth(cells[0].value) }}
>
{cells[0].value}
</span>
);
},
className: 'vendor_name',
textOverview: true,
// textOverview: true,
// width: 240,
},
{

8
src/style/pages/FinancialStatements/CashFlowStatement.scss
View File

@@ -10,7 +10,11 @@
}
.tbody {
.tr:not(.no-results) {
&.row-type--CASH_END_PERIOD{
// &.row-type--AGGREGATE,
&.row-type--ACCOUNTS {
border-top: 1px solid #bbb;
}
&.row-type--CASH_END_PERIOD {
border-bottom: 3px double #333;
}
.td {
@@ -30,7 +34,7 @@
.tr.is-expanded {
.td.total,
.td.date-period{
.td.date-period {
.cell-inner {
display: none;
}

4
src/style/pages/FinancialStatements/ContactsBalanceSummary.scss
View File

@@ -11,6 +11,10 @@
}
.tbody {
.tr:not(.no-results) {
&.row-type--CUSTOMER,
&.row-type--VENDOR {
border-top: 1px solid #BBB
}
.td {
border-bottom: 0;
padding-top: 0.4rem;

7
src/style/pages/FinancialStatements/ContactsTransactions.scss
View File

@@ -64,12 +64,11 @@
display: none;
}
}
}
&--CUSTOMER:last-child {
.td {
border-bottom: 1px solid #ddd;
&:not(:first-child).is-expanded .td {
border-top: 1px solid #ddd;
}
}
&--CUSTOMER:last-child,
&--VENDOR:last-child {
.td {
border-bottom: 1px solid #ddd;