From 0321f29442a3e9a3e2a3a1c99663a9c9ea0e9f97 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@live.com>
Date: Tue, 24 Nov 2020 11:30:27 +0200
Subject: [PATCH] feat: rename item sku to code. feat: fix sidebar current tab
 issue.

---
 client/src/components/MenuItemLabel.js        |  2 +-
 client/src/components/Sidebar/SidebarMenu.js  | 29 ++++++++++++++-----
 client/src/config/sidebarMenu.js              | 14 ++++++---
 .../Entries/EditableItemsEntriesTable.js      |  5 ++++
 .../containers/Entries/ItemsEntriesTable.js   |  4 +++
 client/src/containers/Items/ItemForm.js       |  2 +-
 .../src/containers/Items/ItemForm.schema.js   |  7 +++--
 client/src/containers/Items/ItemFormBody.js   | 12 ++++----
 .../Items/ItemFormPrimarySection.js           |  4 +--
 client/src/containers/Items/ItemsDataTable.js |  4 +--
 .../src/containers/Purchases/Bill/BillForm.js |  7 +++--
 .../Purchases/Bill/BillFormHeader.js          |  1 +
 client/src/index.js                           |  8 -----
 client/src/routes/dashboard.js                | 12 ++++----
 server/src/api/controllers/Items.ts           |  2 +-
 .../20190822214306_create_items_table.js      |  2 +-
 ...715194514_create_payment_receives_table.js |  2 +-
 ...1_create_payment_receives_entries_table.js |  2 +-
 ...00719153909_create_bills_payments_table.js |  2 +-
 server/src/interfaces/Item.ts                 |  4 +--
 20 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/client/src/components/MenuItemLabel.js b/client/src/components/MenuItemLabel.js
index c11b9a2d2..ab0826f73 100644
--- a/client/src/components/MenuItemLabel.js
+++ b/client/src/components/MenuItemLabel.js
@@ -3,5 +3,5 @@ import React from 'react';
 export default function MenuItemLabel({
   text
 }) {
-  return (<span class="bp3-menu-item-label">{ text }</span>);
+  return (<span class="bp3-menu-item-labeler">{ text }</span>);
 }
\ No newline at end of file
diff --git a/client/src/components/Sidebar/SidebarMenu.js b/client/src/components/Sidebar/SidebarMenu.js
index 4354e9e5e..6a41f891d 100644
--- a/client/src/components/Sidebar/SidebarMenu.js
+++ b/client/src/components/Sidebar/SidebarMenu.js
@@ -1,5 +1,5 @@
-import React from 'react';
-import { Menu, MenuDivider } from '@blueprintjs/core';
+import React, { useMemo } from 'react';
+import { Menu, MenuDivider, Button } from '@blueprintjs/core';
 import { useHistory, useLocation } from 'react-router-dom';
 import sidebarMenuList from 'config/sidebarMenu';
 import Icon from 'components/Icon';
@@ -16,16 +16,31 @@ export default function SidebarMenu() {
       const children = Array.isArray(item.children)
         ? menuItemsMapper(item.children)
         : null;
-      const isActive =
-        (item.href && item.href === location.pathname) ||
-        (item.children &&
-          item.children.some((c) => c.href === location.pathname));
+
+      const matchPath = (pathname, path) => {
+        return item.matchExact ? pathname === path : pathname.indexOf(path) !== -1;
+      };
+      const isActive = (item.children) ?
+        item.children.some((c) => matchPath(location.pathname, c.href)) :
+        (item.href && matchPath(location.pathname, item.href));
 
       const handleItemClick = () => {
         if (item.href) {
           history.push(item.href);
         }
       };
+
+      const maybeRenderLabel = (item) => item.newTabHref ? (
+        <Button
+          className="menu-item__add-btn"
+          icon={<Icon icon={'plus'} iconSize={16} />}
+          onClick={(event) => {
+            history.push(item.newTabHref);
+            event.stopPropagation();
+          }}
+        />
+      ) : null;
+
       return item.spacer ? (
         <div class="bp3-menu-spacer"></div>
       ) : item.divider ? (
@@ -38,7 +53,7 @@ export default function SidebarMenu() {
           active={isActive}
           icon={<Icon icon={item.icon} iconSize={item.iconSize} />}
           text={item.text}
-          label={item.label}
+          label={maybeRenderLabel(item)}
           disabled={item.disabled}
           children={children}
           dropdownType={item.dropdownType || 'collapse'}
diff --git a/client/src/config/sidebarMenu.js b/client/src/config/sidebarMenu.js
index a7bfc0332..5efbe8664 100644
--- a/client/src/config/sidebarMenu.js
+++ b/client/src/config/sidebarMenu.js
@@ -1,4 +1,4 @@
-import React from 'react';
+  import React from 'react';
 import { FormattedMessage as T } from 'react-intl';
 
 export default [
@@ -13,7 +13,6 @@ export default [
   {
     divider: true,
   },
-
   {
     text: 'Sales & inventory',
     label: true,
@@ -41,16 +40,18 @@ export default [
       {
         text: <T id={'estimates'} />,
         href: '/estimates',
+        newTabHref: '/estimates/new',
       },
-
       {
         text: <T id={'invocies'} />,
         href: '/invoices',
+        newTabHref: '/invoices/new',
       },
 
       {
         text: <T id={'payment_receives'} />,
         href: '/payment-receives',
+        newTabHref: '/payment-receives/new',
       },
       {
         divider: true,
@@ -58,6 +59,7 @@ export default [
       {
         text: <T id={'receipts'} />,
         href: '/receipts',
+        newTabHref: '/receipts/new',
       },
     ],
   },
@@ -67,11 +69,12 @@ export default [
       {
         text: <T id={'bills'} />,
         href: '/bills',
+        newTabHref: '/bills/new',
       },
-
       {
         text: <T id={'payment_made'} />,
         href: '/payment-mades',
+        newTabHref: '/payment-mades/new',
       },
     ],
   },
@@ -81,10 +84,12 @@ export default [
       {
         text: <T id={'customers'} />,
         href: '/customers',
+        newTabHref: '/customers/new',
       },
       {
         text: <T id={'vendors'} />,
         href: '/vendors',
+        newTabHref: '/vendors/new',
       },
     ],
   },
@@ -139,6 +144,7 @@ export default [
       {
         text: <T id={'all_reports'} />,
         href: '/financial-reports',
+        matchExact: true,
       },
       {
         divider: true,
diff --git a/client/src/containers/Entries/EditableItemsEntriesTable.js b/client/src/containers/Entries/EditableItemsEntriesTable.js
index 052ec7d39..ebf109bf1 100644
--- a/client/src/containers/Entries/EditableItemsEntriesTable.js
+++ b/client/src/containers/Entries/EditableItemsEntriesTable.js
@@ -9,6 +9,9 @@ export default function EditableItemsEntriesTable({
   defaultEntry,
   minLinesNumber = 2,
   linesNumber = 5,
+
+  filterSellableItems = false,
+  filterPurchasableItems = false,
 }) {
   const { setFieldValue, values } = useFormikContext();
   const [clearLinesAlert, setClearLinesAlert] = useState(false);
@@ -58,6 +61,8 @@ export default function EditableItemsEntriesTable({
             }}
             entries={value}
             errors={error}
+            filterPurchasableItems={filterPurchasableItems}
+            filterSellableItems={filterSellableItems}
             onClickAddNewRow={handleClickAddNewRow}
             onClickClearAllLines={handleClearAllLines}
             onClickRemoveRow={handleClickRemoveLine}
diff --git a/client/src/containers/Entries/ItemsEntriesTable.js b/client/src/containers/Entries/ItemsEntriesTable.js
index e5c5c9c07..c15435a1c 100644
--- a/client/src/containers/Entries/ItemsEntriesTable.js
+++ b/client/src/containers/Entries/ItemsEntriesTable.js
@@ -91,6 +91,8 @@ function ItemsEntriesTable({
   onClickRemoveRow,
   onClickAddNewRow,
   onClickClearAllLines,
+  filterPurchasableItems = false,
+  filterSellableItems = false,
 }) {
   const [rows, setRows] = useState([]);
   const { formatMessage } = useIntl();
@@ -117,6 +119,8 @@ function ItemsEntriesTable({
         Cell: ItemsListCell,
         disableSortBy: true,
         width: 180,
+        filterPurchasable: filterPurchasableItems,
+        filterSellable: filterSellableItems,
       },
       {
         Header: formatMessage({ id: 'description' }),
diff --git a/client/src/containers/Items/ItemForm.js b/client/src/containers/Items/ItemForm.js
index 125b3d4ca..90b8af793 100644
--- a/client/src/containers/Items/ItemForm.js
+++ b/client/src/containers/Items/ItemForm.js
@@ -33,7 +33,7 @@ const defaultInitialValues = {
   active: true,
   name: '',
   type: 'service',
-  sku: '',
+  code: '',
   cost_price: '',
   sell_price: '',
   cost_account_id: '',
diff --git a/client/src/containers/Items/ItemForm.schema.js b/client/src/containers/Items/ItemForm.schema.js
index b535acb76..3d7b7a6aa 100644
--- a/client/src/containers/Items/ItemForm.schema.js
+++ b/client/src/containers/Items/ItemForm.schema.js
@@ -1,4 +1,5 @@
 import * as Yup from 'yup';
+import { defaultTo } from 'lodash';
 import { formatMessage } from 'services/intl';
 import { DATATYPES_LENGTH } from 'common/dataTypes';
 
@@ -15,7 +16,7 @@ const Schema = Yup.object().shape({
     .min(0)
     .max(DATATYPES_LENGTH.STRING)
     .label(formatMessage({ id: 'item_type_' })),
-  sku: Yup.string().trim().min(0).max(DATATYPES_LENGTH.STRING),
+  code: Yup.string().trim().min(0).max(DATATYPES_LENGTH.STRING),
   cost_price: Yup.number().when(['purchasable'], {
     is: true,
     then: Yup.number()
@@ -61,8 +62,8 @@ const Schema = Yup.object().shape({
 export const transformItemFormData = (item, defaultValue) => {
   return {
     ...item,
-    sellable: item?.sellable ? Boolean(item.sellable) : defaultValue.sellable,
-    purchasable: item?.purchasable ? Boolean(item.purchasable) : defaultValue.purchasable,
+    sellable: !!defaultTo(item?.sellable, defaultValue.sellable),
+    purchasable: !!defaultTo(item?.purchasable, defaultValue.purchasable),
   };
 }
 
diff --git a/client/src/containers/Items/ItemFormBody.js b/client/src/containers/Items/ItemFormBody.js
index 274930060..c346aac17 100644
--- a/client/src/containers/Items/ItemFormBody.js
+++ b/client/src/containers/Items/ItemFormBody.js
@@ -27,7 +27,7 @@ function ItemFormBody({ accountsList, baseCurrency }) {
         <Col xs={6}>
           {/*------------- Purchasable checbox ------------- */}
           <FastField name={'sellable'} type="checkbox">
-            {({ field }) => (
+            {({ form, field }) => (
               <FormGroup inline={true} className={'form-group--sellable'}>
                 <Checkbox
                   inline={true}
@@ -44,7 +44,7 @@ function ItemFormBody({ accountsList, baseCurrency }) {
           </FastField>
 
           {/*------------- Selling price ------------- */}
-          <Field name={'sell_price'}>
+          <FastField name={'sell_price'}>
             {({ form, field: { value }, meta: { error, touched } }) => (
               <FormGroup
                 label={<T id={'selling_price'} />}
@@ -67,7 +67,7 @@ function ItemFormBody({ accountsList, baseCurrency }) {
                 </ControlGroup>
               </FormGroup>
             )}
-          </Field>
+          </FastField>
 
           {/*------------- Selling account ------------- */}
           <FastField name={'sell_account_id'}>
@@ -93,6 +93,7 @@ function ItemFormBody({ accountsList, baseCurrency }) {
                   selectedAccountId={value}
                   disabled={!form.values.sellable}
                   filterByTypes={['income']}
+                  popoverFill={true}
                 />
               </FormGroup>
             )}
@@ -118,7 +119,7 @@ function ItemFormBody({ accountsList, baseCurrency }) {
           </FastField>
 
           {/*------------- Cost price ------------- */}
-          <Field name={'cost_price'}>
+          <FastField name={'cost_price'}>
             {({ field, form, field: { value }, meta: { error, touched } }) => (
               <FormGroup
                 label={<T id={'cost_price'} />}
@@ -141,7 +142,7 @@ function ItemFormBody({ accountsList, baseCurrency }) {
                 </ControlGroup>
               </FormGroup>
             )}
-          </Field>
+          </FastField>
 
           {/*------------- Cost account ------------- */}
           <FastField name={'cost_account_id'}>
@@ -167,6 +168,7 @@ function ItemFormBody({ accountsList, baseCurrency }) {
                   selectedAccountId={value}
                   disabled={!form.values.purchasable}
                   filterByTypes={['cost_of_goods_sold']}
+                  popoverFill={true}
                 />
               </FormGroup>
             )}
diff --git a/client/src/containers/Items/ItemFormPrimarySection.js b/client/src/containers/Items/ItemFormPrimarySection.js
index abe955387..ab318e55f 100644
--- a/client/src/containers/Items/ItemFormPrimarySection.js
+++ b/client/src/containers/Items/ItemFormPrimarySection.js
@@ -135,7 +135,7 @@ function ItemFormPrimarySection({
           </FastField>
 
           {/*----------- Item category ----------*/}
-          <FastField name={'type'}>
+          <FastField name={'category_id'}>
             {({ form, field: { value }, meta: { error, touched } }) => (
               <FormGroup
                 label={<T id={'category'} />}
@@ -143,7 +143,6 @@ function ItemFormPrimarySection({
                 intent={inputIntent({ error, touched })}
                 helperText={<ErrorMessage name="category_id" />}
                 className={classNames(
-                  'form-group--select-list',
                   'form-group--category',
                   Classes.FILL,
                 )}
@@ -154,7 +153,6 @@ function ItemFormPrimarySection({
                   onCategorySelected={(category) => {
                     form.setFieldValue('category_id', category.id);
                   }}
-                  popoverProps={{ minimal: true }}
                 />
               </FormGroup>
             )}
diff --git a/client/src/containers/Items/ItemsDataTable.js b/client/src/containers/Items/ItemsDataTable.js
index 03eba0f8d..0afec335e 100644
--- a/client/src/containers/Items/ItemsDataTable.js
+++ b/client/src/containers/Items/ItemsDataTable.js
@@ -111,8 +111,8 @@ function ItemsDataTable({
       },
       {
         Header: formatMessage({ id: 'item_code' }),
-        accessor: 'sku',
-        className: 'sku',
+        accessor: 'code',
+        className: 'code',
         width: 120,
       },
       {
diff --git a/client/src/containers/Purchases/Bill/BillForm.js b/client/src/containers/Purchases/Bill/BillForm.js
index 7b591ab2b..e9488d242 100644
--- a/client/src/containers/Purchases/Bill/BillForm.js
+++ b/client/src/containers/Purchases/Bill/BillForm.js
@@ -22,7 +22,7 @@ import withBillDetail from './withBillDetail';
 import { AppToaster } from 'components';
 
 import { ERROR } from 'common/errors';
-import { compose, repeatValue, orderingLinesIndexes } from 'utils';
+import { compose, repeatValue, defaultToTransform, orderingLinesIndexes } from 'utils';
 
 const MIN_LINES_NUMBER = 5;
 
@@ -207,7 +207,10 @@ function BillForm({
         {({ isSubmitting, values }) => (
           <Form>
             <BillFormHeader onBillNumberChanged={handleBillNumberChanged} />
-            <EditableItemsEntriesTable defaultEntry={defaultBill} />
+            <EditableItemsEntriesTable
+              defaultEntry={defaultBill}
+              filterPurchasableItems={true}
+            />
             <BillFormFooter
               oninitialFiles={[]}
               // onDropFiles={handleDeleteFile}
diff --git a/client/src/containers/Purchases/Bill/BillFormHeader.js b/client/src/containers/Purchases/Bill/BillFormHeader.js
index 2e2175365..4d1a9fcf1 100644
--- a/client/src/containers/Purchases/Bill/BillFormHeader.js
+++ b/client/src/containers/Purchases/Bill/BillFormHeader.js
@@ -54,6 +54,7 @@ function BillFormHeader({
                 onContactSelected={(contact) => {
                   form.setFieldValue('vendor_id', contact.id);
                 }}
+                popoverFill={true}
               />
             </FormGroup>
           )}
diff --git a/client/src/index.js b/client/src/index.js
index 259b6683a..24053eb30 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -9,14 +9,6 @@ import * as serviceWorker from 'serviceWorker';
 import { store, persistor } from 'store/createStore';
 import AppProgress from 'components/NProgress/AppProgress';
 
-import whyDidYouRender from '@welldone-software/why-did-you-render';
-
-whyDidYouRender(React, {
-  onlyLogs: true,
-  titleColor: 'green',
-  diffNameColor: 'aqua',
-});
-
 ReactDOM.render(
   <Provider store={store}>
     <PersistGate loading={null} persistor={persistor}>
diff --git a/client/src/routes/dashboard.js b/client/src/routes/dashboard.js
index 8b2fb8ef6..aacfb4ddf 100644
--- a/client/src/routes/dashboard.js
+++ b/client/src/routes/dashboard.js
@@ -259,7 +259,6 @@ export default [
     }),
     breadcrumb: 'Edit',
   },
-
   {
     path: `/invoices/new`,
     component: LazyLoader({
@@ -298,10 +297,9 @@ export default [
     breadcrumb: 'Receipt List',
   },
 
-  // Payment Receives
-
+  // Payment receives
   {
-    path: `/payment-receive/:id/edit`,
+    path: `/payment-receives/:id/edit`,
     component: LazyLoader({
       loader: () =>
         import('containers/Sales/PaymentReceive/PaymentReceiveFormPage'),
@@ -309,7 +307,7 @@ export default [
     breadcrumb: 'Edit',
   },
   {
-    path: `/payment-receive/new`,
+    path: `/payment-receives/new`,
     component: LazyLoader({
       loader: () =>
         import('containers/Sales/PaymentReceive/PaymentReceiveFormPage'),
@@ -364,14 +362,14 @@ export default [
   },
   // Payment mades.
   {
-    path: `/payment-made/:id/edit`,
+    path: `/payment-mades/:id/edit`,
     component: LazyLoader({
       loader: () => import('containers/Purchases/PaymentMades/PaymentMade'),
     }),
     breadcrumb: 'Edit',
   },
   {
-    path: `/payment-made/new`,
+    path: `/payment-mades/new`,
     component: LazyLoader({
       loader: () => import('containers/Purchases/PaymentMades/PaymentMade'),
     }),
diff --git a/server/src/api/controllers/Items.ts b/server/src/api/controllers/Items.ts
index a2d9a64f9..804f37684 100644
--- a/server/src/api/controllers/Items.ts
+++ b/server/src/api/controllers/Items.ts
@@ -81,7 +81,7 @@ export default class ItemsController extends BaseController {
       check('name').exists(),
       check('type').exists().trim().escape()
         .isIn(['service', 'non-inventory', 'inventory']),
-      check('sku').optional({ nullable: true }).trim().escape(),
+      check('code').optional({ nullable: true }).trim().escape(),
       // Purchase attributes.
       check('purchasable').optional().isBoolean().toBoolean(),
       check('cost_price')
diff --git a/server/src/database/migrations/20190822214306_create_items_table.js b/server/src/database/migrations/20190822214306_create_items_table.js
index ff79afd56..b85d66e7d 100644
--- a/server/src/database/migrations/20190822214306_create_items_table.js
+++ b/server/src/database/migrations/20190822214306_create_items_table.js
@@ -4,7 +4,7 @@ exports.up = function (knex) {
     table.increments();
     table.string('name').index();
     table.string('type').index();
-    table.string('sku');
+    table.string('code');
     table.boolean('sellable').index();
     table.boolean('purchasable').index();
     table.decimal('sell_price', 13, 3).unsigned();
diff --git a/server/src/database/migrations/20200715194514_create_payment_receives_table.js b/server/src/database/migrations/20200715194514_create_payment_receives_table.js
index 758b32869..7dc739e57 100644
--- a/server/src/database/migrations/20200715194514_create_payment_receives_table.js
+++ b/server/src/database/migrations/20200715194514_create_payment_receives_table.js
@@ -8,7 +8,7 @@ exports.up = function(knex) {
     table.decimal('amount', 13, 3).defaultTo(0);
     table.string('reference_no').index();
     table.integer('deposit_account_id').unsigned().references('id').inTable('accounts');
-    table.string('payment_receive_no');
+    table.string('payment_receive_no').nullable();
     table.text('description');
     table.integer('user_id').unsigned().index();
     table.timestamps();
diff --git a/server/src/database/migrations/20200718161031_create_payment_receives_entries_table.js b/server/src/database/migrations/20200718161031_create_payment_receives_entries_table.js
index ffc9c665e..0e396550c 100644
--- a/server/src/database/migrations/20200718161031_create_payment_receives_entries_table.js
+++ b/server/src/database/migrations/20200718161031_create_payment_receives_entries_table.js
@@ -4,7 +4,7 @@ exports.up = function(knex) {
     table.increments();
     table.integer('payment_receive_id').unsigned().index().references('id').inTable('payment_receives');
     table.integer('invoice_id').unsigned().index().references('id').inTable('sales_invoices');
-    table.decimal('payment_amount').unsigned();
+    table.decimal('payment_amount', 13, 3).unsigned();
   })  
 };
 
diff --git a/server/src/database/migrations/20200719153909_create_bills_payments_table.js b/server/src/database/migrations/20200719153909_create_bills_payments_table.js
index 065f2bae6..e61b93e5c 100644
--- a/server/src/database/migrations/20200719153909_create_bills_payments_table.js
+++ b/server/src/database/migrations/20200719153909_create_bills_payments_table.js
@@ -5,7 +5,7 @@ exports.up = function(knex) {
     table.integer('vendor_id').unsigned().index().references('id').inTable('contacts');
     table.decimal('amount', 13, 3).defaultTo(0);
     table.integer('payment_account_id').unsigned().references('id').inTable('accounts');
-    table.string('payment_number').index();
+    table.string('payment_number').nullable().index();
     table.date('payment_date').index();
     table.string('payment_method');
     table.string('reference');
diff --git a/server/src/interfaces/Item.ts b/server/src/interfaces/Item.ts
index 2887481ec..2726fbae0 100644
--- a/server/src/interfaces/Item.ts
+++ b/server/src/interfaces/Item.ts
@@ -4,7 +4,7 @@ export interface IItem{
   id: number,
   name: string,
   type: string,
-  sku: string,
+  code: string,
 
   sellable: boolean,
   purchasable: boolean,
@@ -33,7 +33,7 @@ export interface IItem{
 export interface IItemDTO {
   name: string,
   type: string,
-  sku: string,
+  code: string,
 
   sellable: boolean,
   purchasable: boolean,