Merge remote-tracking branch 'origin/master'

client/src/containers/Accounting/MakeJournalEntries.schema.js

@@ -1,23 +1,25 @@
 import * as Yup from 'yup';
 import { formatMessage } from 'services/intl';
+import { DATATYPES_LENGTH } from 'common/dataTypes';
 
 const Schema = Yup.object().shape({
   journal_number: Yup.string()
     .required()
     .min(1)
-    .max(255)
+    .max(DATATYPES_LENGTH.STRING)
     .label(formatMessage({ id: 'journal_number_' })),
   journal_type: Yup.string()
     .required()
     .min(1)
-    .max(255)
+    .max(DATATYPES_LENGTH.STRING)
     .label(formatMessage({ id: 'journal_type' })),
   date: Yup.date()
     .required()
     .label(formatMessage({ id: 'date' })),
-  currency_code: Yup.string(),
+  currency_code: Yup.string().max(3),
-  reference: Yup.string().min(1).max(255),
+  status: Yup.boolean(),
-  description: Yup.string().min(1).max(1024),
+  reference: Yup.string().nullable().min(1).max(DATATYPES_LENGTH.STRING),
+  description: Yup.string().min(1).max(DATATYPES_LENGTH.STRING),
   entries: Yup.array().of(
     Yup.object().shape({
       credit: Yup.number().nullable(),
@@ -30,7 +32,7 @@ const Schema = Yup.object().shape({
         }),
       contact_id: Yup.number().nullable(),
       contact_type: Yup.string().nullable(),
-      note: Yup.string().max(255).nullable(),
+      note: Yup.string().max(DATATYPES_LENGTH.TEXT).nullable(),
     }),
   ),
 });

client/src/containers/Accounting/MakeJournalEntriesForm.js

@@ -1,10 +1,11 @@
-import React, { useMemo, useEffect, useCallback } from 'react';
+import React, { useMemo, useState, useEffect, useCallback } from 'react';
 import { Formik, Form } from 'formik';
 import moment from 'moment';
 import { Intent } from '@blueprintjs/core';
 import { useIntl } from 'react-intl';
 import { pick } from 'lodash';
 import classNames from 'classnames';
+import { useHistory } from 'react-router-dom';
 
 import { CLASSES } from 'common/classes';
 import {
@@ -50,6 +51,7 @@ const defaultInitialValues = {
   description: '',
   reference: '',
   currency_code: '',
+  status: '',
   entries: [...repeatValue(defaultEntry, 4)],
 };
 
@@ -84,7 +86,9 @@ function MakeJournalEntriesForm({
   onCancelForm,
 }) {
   const isNewMode = !manualJournalId;
+  const [submitPayload, setSubmitPayload] = useState({});
   const { formatMessage } = useIntl();
+  const history = useHistory();
 
   const journalNumber = isNewMode
     ? `${journalNumberPrefix}-${journalNextNumber}`
@@ -172,7 +176,7 @@ function MakeJournalEntriesForm({
       setSubmitting(false);
       return;
     }
-    const form = { ...values, entries };
+    const form = { ...values, status: submitPayload.publish, entries };
 
     const handleError = (error) => {
       transformErrors(error, { setErrors });
@@ -191,8 +195,15 @@ function MakeJournalEntriesForm({
         ),
         intent: Intent.SUCCESS,
       });
+
       setSubmitting(false);
+
+      if (submitPayload.redirect) {
+        history.push('/manual-journals');
+      }
+      if (submitPayload.resetForm) {
         resetForm();
+      }
     };
 
     if (isNewMode) {
@@ -203,12 +214,24 @@ function MakeJournalEntriesForm({
         .catch(handleError);
     }
   };
+
+  const handleCancelClick = useCallback(() => {
+    history.goBack();
+  }, [history]);
+
+  const handleSubmitClick = useCallback(
+    (event, payload) => {
+      setSubmitPayload({ ...payload });
+    },
+    [setSubmitPayload],
+  );
+  console.log(submitPayload, 'RR');
   return (
     <div
       className={classNames(
         CLASSES.PAGE_FORM,
         CLASSES.PAGE_FORM_STRIP_STYLE,
-        CLASSES.PAGE_FORM_MAKE_JOURNAL
+        CLASSES.PAGE_FORM_MAKE_JOURNAL,
       )}
     >
       <Formik
@@ -228,6 +251,9 @@ function MakeJournalEntriesForm({
             <MakeJournalFormFloatingActions
               isSubmitting={isSubmitting}
               manualJournal={manualJournalId}
+              manualJournalPublished={values.status}
+              onCancelClick={handleCancelClick}
+              onSubmitClick={handleSubmitClick}
             />
           </Form>
         )}

client/src/containers/Accounting/MakeJournalFormFloatingActions.js

@@ -1,63 +1,202 @@
 import React from 'react';
-import { Intent, Button } from '@blueprintjs/core';
+import {
+  Intent,
+  Button,
+  ButtonGroup,
+  Popover,
+  PopoverInteractionKind,
+  Position,
+  Menu,
+  MenuItem,
+} from '@blueprintjs/core';
 import { useFormikContext } from 'formik';
 import classNames from 'classnames';
 import { FormattedMessage as T } from 'react-intl';
 import { saveInvoke } from 'utils';
 import { CLASSES } from 'common/classes';
+import { Icon, If } from 'components';
 
+/**
+ * Make Journal floating actions bar.
+ */
 export default function MakeJournalFloatingAction({
   isSubmitting,
   onSubmitClick,
   onCancelClick,
-  manualJournalId,
+  manualJournal,
+  manualJournalPublished,
 }) {
-  const { submitForm } = useFormikContext();
+  const { submitForm, resetForm } = useFormikContext();
+
+
+
+  const handleSubmitPublishBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: true,
+    });
+  };
+
+  const handleSubmitPublishAndNewBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitPublishContinueEditingBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: true,
+    });
+  };
+
+  const handleSubmitDraftBtnClick = (event) => {
+    saveInvoke(onSubmitClick, event, {
+      redirect: true,
+      publish: false,
+    });
+  };
+
+  const handleSubmitDraftAndNewBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+      resetForm: true,
+    });
+  };
+
+  const handleSubmitDraftContinueEditingBtnClick = (event) => {
+    submitForm();
+    saveInvoke(onSubmitClick, event, {
+      redirect: false,
+      publish: false,
+    });
+  };
+
+  const handleCancelBtnClick = (event) => {
+    saveInvoke(onCancelClick, event);
+  };
+
+  const handleClearBtnClick = (event) => {
+    // saveInvoke(onClearClick, event);
+    resetForm();
+  };
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
+      {/* ----------- Save And Publish ----------- */}
+      <If condition={!manualJournal || !manualJournalPublished}>
+        <ButtonGroup>
           <Button
             disabled={isSubmitting}
             intent={Intent.PRIMARY}
-        name={'save'}
+            type="submit"
-        onClick={() => {
+            onClick={handleSubmitPublishBtnClick}
-          submitForm();
+            text={<T id={'save_publish'} />}
-          saveInvoke(onSubmitClick, { publish: true, redirect: true });
+          />
-        }}
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'publish_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'publish_continue_editing'} />}
+                  onClick={handleSubmitPublishContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
           >
-        {manualJournalId ? <T id={'edit'} /> : <T id={'save'} />}
+            <Button
-      </Button>
+              intent={Intent.PRIMARY}
-
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
+            />
+          </Popover>
+        </ButtonGroup>
+        {/* ----------- Save As Draft ----------- */}
+        <ButtonGroup>
           <Button
             disabled={isSubmitting}
-        intent={Intent.PRIMARY}
             className={'ml1'}
-        name={'save_and_new'}
+            type="submit"
-        onClick={() => {
+            onClick={handleSubmitDraftBtnClick}
-          saveInvoke(onSubmitClick, { publish: true, redirect: false });
+            text={<T id={'save_as_draft'} />}
-        }}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitDraftAndNewBtnClick}
+                />
+                <MenuItem
+                  text={<T id={'save_continue_editing'} />}
+                  onClick={handleSubmitDraftContinueEditingBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
           >
-        <T id={'save_new'} />
+            <Button
-      </Button>
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
-
+            />
+          </Popover>
+        </ButtonGroup>
+      </If>
+      {/* ----------- Save and New ----------- */}
+      <If condition={manualJournal && manualJournalPublished}>
+        <ButtonGroup>
           <Button
             disabled={isSubmitting}
-        className={'button-secondary ml1'}
+            intent={Intent.PRIMARY}
-        onClick={() => {
+            type="submit"
-          saveInvoke(onSubmitClick, { publish: false, redirect: true });
+            onClick={handleSubmitPublishBtnClick}
-        }}
+            text={<T id={'save'} />}
+          />
+          <Popover
+            content={
+              <Menu>
+                <MenuItem
+                  text={<T id={'save_and_new'} />}
+                  onClick={handleSubmitPublishAndNewBtnClick}
+                />
+              </Menu>
+            }
+            minimal={true}
+            interactionKind={PopoverInteractionKind.CLICK}
+            position={Position.BOTTOM_LEFT}
           >
-        <T id={'save_as_draft'} />
-      </Button>
-
             <Button
-        className={'button-secondary ml1'}
+              intent={Intent.PRIMARY}
-        onClick={() => {
+              rightIcon={<Icon icon="arrow-drop-up-16" iconSize={20} />}
-          saveInvoke(onCancelClick);
+            />
-        }}
+          </Popover>
-      >
+        </ButtonGroup>
-        <T id={'cancel'} />
+      </If>
-      </Button>
+      {/* ----------- Clear & Reset----------- */}
+      <Button
+        className={'ml1'}
+        disabled={isSubmitting}
+        onClick={handleClearBtnClick}
+        text={manualJournal ? <T id={'reset'} /> : <T id={'clear'} />}
+      />
+      {/* ----------- Cancel ----------- */}
+      <Button
+        className={'ml1'}
+        onClick={handleCancelBtnClick}
+        text={<T id={'cancel'} />}
+      />
     </div>
   );
 }

client/src/containers/Items/ItemForm.js

@@ -232,7 +232,7 @@ function ItemForm({
         {({ isSubmitting, handleSubmit }) => (
           <Form>
             <div class={classNames(CLASSES.PAGE_FORM_BODY)}>
-              <ItemFormPrimarySection itemId={itemId} />
+              <ItemFormPrimarySection itemType={itemDetail?.type}/>
               <ItemFormBody />
               <ItemFormInventorySection />
             </div>

client/src/containers/Items/ItemFormBody.js

@@ -183,7 +183,7 @@ export default compose(
   withAccounts(({ accountsList }) => ({
     accountsList,
   })),
-  withSettings(({ organization }) => ({
+  withSettings(({ organizationSettings }) => ({
-    baseCurrency: 'USD',
+    baseCurrency: organizationSettings?.baseCurrency,
   })),
 )(ItemFormBody);

client/src/containers/Items/ItemFormPrimarySection.js

@@ -38,10 +38,8 @@ function ItemFormPrimarySection({
   changePageSubtitle,
 
   // #ownProps
-  itemId,
+  itemType,
 }) {
-  const { formatMessage } = useIntl();
-  const isNewMode = !itemId;
 
   const itemTypeHintContent = (
     <>
@@ -91,7 +89,7 @@ function ItemFormPrimarySection({
                 changePageSubtitle(transitionItemTypeKeyToLabel(_value));
               })}
               selectedValue={value}
-              disabled={value === 'inventory' && !isNewMode}
+              disabled={itemType === 'inventory'}
             >
               <Radio label={<T id={'service'} />} value="service" />
               <Radio label={<T id={'non_inventory'} />} value="non-inventory" />
@@ -142,10 +140,7 @@ function ItemFormPrimarySection({
                 inline={true}
                 intent={inputIntent({ error, touched })}
                 helperText={<ErrorMessage name="category_id" />}
-                className={classNames(
+                className={classNames('form-group--category', Classes.FILL)}
-                  'form-group--category',
-                  Classes.FILL,
-                )}
               >
                 <CategoriesSelectList
                   categoriesList={categoriesList}

client/src/containers/Items/ItemsDataTable.js

@@ -19,7 +19,7 @@ import { CLASSES } from 'common/classes';
 
 import withItems from 'containers/Items/withItems';
 import withItemsActions from 'containers/Items/withItemsActions';
-import { compose, saveInvoke } from 'utils';
+import { compose, saveInvoke, isBlank, defaultToTransform } from 'utils';
 
 // Items datatable.
 function ItemsDataTable({
@@ -122,7 +122,9 @@ function ItemsDataTable({
             <Tag minimal={true} round={true} intent={Intent.NONE}>
               {formatMessage({ id: row.type })}
             </Tag>
-          ) : (''),
+          ) : (
+            ''
+          ),
         className: 'item_type',
         width: 120,
       },
@@ -134,13 +136,23 @@ function ItemsDataTable({
       },
       {
         Header: formatMessage({ id: 'sell_price' }),
-        accessor: (row) => <Money amount={row.sell_price} currency={'USD'} />,
+        accessor: (row) =>
+          !isBlank(row.sell_price) ? (
+            <Money amount={row.sell_price} currency={'USD'} />
+          ) : (
+            ''
+          ),
         className: 'sell-price',
         width: 150,
       },
       {
         Header: formatMessage({ id: 'cost_price' }),
-        accessor: (row) => <Money amount={row.cost_price} currency={'USD'} />,
+        accessor: (row) =>
+        !isBlank(row.sell_price) ? (
+          <Money amount={row.cost_price} currency={'USD'} />
+        ) : (
+          ''
+        ),
         className: 'cost-price',
         width: 150,
       },
@@ -230,13 +242,13 @@ export default compose(
       itemsTableLoading,
       itemsTableQuery,
       itemsCurrentViewId,
-      itemsPagination
+      itemsPagination,
     }) => ({
       itemsCurrentPage,
       itemsTableLoading,
       itemsTableQuery,
       itemsCurrentViewId,
-      itemsPagination
+      itemsPagination,
     }),
   ),
   withItemsActions,