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

src/components/DisplayNameList.js

@@ -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) => {
+    .filter(
-      return !value && format.required.indexOf(index + 1) !== -1;
+      (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}
     />
   );
 }

src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.js

@@ -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 (

src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsTable.js

@@ -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 (

src/containers/FinancialStatements/CustomersTransactions/components.js

@@ -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'),

src/containers/FinancialStatements/GeneralLedger/components.js

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

src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.js

@@ -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 (

src/containers/FinancialStatements/InventoryItemDetails/utils.js

@@ -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,

src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js

@@ -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 (

src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js

@@ -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 (

src/containers/FinancialStatements/VendorsTransactions/components.js

@@ -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,
       },
       {

src/style/pages/FinancialStatements/CashFlowStatement.scss

@@ -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;
             }

src/style/pages/FinancialStatements/ContactsBalanceSummary.scss

@@ -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;

src/style/pages/FinancialStatements/ContactsTransactions.scss

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