fix: manual journal.

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

@@ -17,9 +17,9 @@ const Schema = Yup.object().shape({
     .required()
     .label(formatMessage({ id: 'date' })),
   currency_code: Yup.string().max(3),
-  status: Yup.boolean(),
+  publish: Yup.boolean(),
   reference: Yup.string().nullable().min(1).max(DATATYPES_LENGTH.STRING),
-  description: Yup.string().min(1).max(DATATYPES_LENGTH.STRING),
+  description: Yup.string().min(1).max(DATATYPES_LENGTH.STRING).nullable(),
   entries: Yup.array().of(
     Yup.object().shape({
       credit: Yup.number().nullable(),

client/src/containers/Accounting/MakeJournalEntriesForm.js

@@ -51,7 +51,7 @@ const defaultInitialValues = {
   description: '',
   reference: '',
   currency_code: '',
-  status: '',
+  publish: '',
   entries: [...repeatValue(defaultEntry, 4)],
 };
 
@@ -176,7 +176,7 @@ function MakeJournalEntriesForm({
       setSubmitting(false);
       return;
     }
-    const form = { ...values, status: submitPayload.publish, entries };
+    const form = { ...values, publish: submitPayload.publish, entries };
 
     const handleError = (error) => {
       transformErrors(error, { setErrors });
@@ -239,7 +239,7 @@ function MakeJournalEntriesForm({
         validationSchema={isNewMode ? CreateJournalSchema : EditJournalSchema}
         onSubmit={handleSubmit}
       >
-        {({ isSubmitting, values }) => (
+        {({ isSubmitting}) => (
           <Form>
             <MakeJournalEntriesHeader
               manualJournal={manualJournalId}
@@ -250,8 +250,8 @@ function MakeJournalEntriesForm({
             <MakeJournalFormFooter />
             <MakeJournalFormFloatingActions
               isSubmitting={isSubmitting}
-              manualJournal={manualJournalId}
-              manualJournalPublished={values.status}
+              manualJournal={manualJournal}
+              // manualJournalPublished={values.status}
               onCancelClick={handleCancelClick}
               onSubmitClick={handleSubmitClick}
             />

client/src/containers/Accounting/MakeJournalFormFloatingActions.js

@@ -24,12 +24,9 @@ export default function MakeJournalFloatingAction({
   onSubmitClick,
   onCancelClick,
   manualJournal,
-  manualJournalPublished,
 }) {
   const { submitForm, resetForm } = useFormikContext();
 
-
-
   const handleSubmitPublishBtnClick = (event) => {
     saveInvoke(onSubmitClick, event, {
       redirect: true,
@@ -83,14 +80,13 @@ export default function MakeJournalFloatingAction({
   };
 
   const handleClearBtnClick = (event) => {
-    // saveInvoke(onClearClick, event);
     resetForm();
   };
 
   return (
     <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       {/* ----------- Save And Publish ----------- */}
-      <If condition={!manualJournal || !manualJournalPublished}>
+      <If condition={!manualJournal || !manualJournal?.is_published}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}
@@ -155,7 +151,7 @@ export default function MakeJournalFloatingAction({
         </ButtonGroup>
       </If>
       {/* ----------- Save and New ----------- */}
-      <If condition={manualJournal && manualJournalPublished}>
+      <If condition={manualJournal && manualJournal?.is_published}>
         <ButtonGroup>
           <Button
             disabled={isSubmitting}

client/src/containers/Accounting/ManualJournalsDataTable.js

@@ -89,7 +89,7 @@ function ManualJournalsDataTable({
           text={formatMessage({ id: 'view_details' })}
         />
         <MenuDivider />
-        <If condition={!journal.status}>
+        <If condition={!journal.is_published}>
           <MenuItem
             icon={<Icon icon="arrow-to-top" />}
             text={formatMessage({ id: 'publish_journal' })}
@@ -160,11 +160,11 @@ function ManualJournalsDataTable({
         className: 'journal_type',
       },
       {
-        id: 'status',
-        Header: formatMessage({ id: 'status' }),
+        id: 'publish',
+        Header: formatMessage({ id: 'publish' }),
         accessor: (row) => StatusAccessor(row),
         width: 95,
-        className: 'status',
+        className: 'publish',
       },
       {
         id: 'note',

client/src/containers/Accounting/ManualJournalsList.js

@@ -62,10 +62,10 @@ function ManualJournalsTable({
     () => requestFetchResourceViews('manual_journals'),
   );
 
-  const fetchResourceFields = useQuery(
-    ['resource-fields', 'manual-journals'],
-    () => requestFetchResourceFields('manual_journals'),
-  );
+  // const fetchResourceFields = useQuery(
+  //   ['resource-fields', 'manual-journals'],
+  //   () => requestFetchResourceFields('manual_journals'),
+  // );
 
   const fetchManualJournals = useQuery(
     ['manual-journals-table', manualJournalsTableQuery],
@@ -218,7 +218,7 @@ function ManualJournalsTable({
 
   return (
     <DashboardInsider
-      loading={fetchResourceViews.isFetching || fetchResourceFields.isFetching}
+      loading={fetchResourceViews.isFetching}
       name={'manual-journals'}
     >
       <ManualJournalsActionsBar

client/src/containers/Accounting/components.js

@@ -57,12 +57,12 @@ export function AmountPopoverContent({ journalEntries }) {
 }
 
 /**
- * Status column accessor.
+ * publish column accessor.
  */
 export const StatusAccessor = (row) => {
   return (
     <Choose>
-      <Choose.When condition={!!row.status}>
+      <Choose.When condition={!!row.is_published}>
         <Tag minimal={true}>
           <T id={'published'} />
         </Tag>

client/src/store/manualJournals/manualJournals.actions.js

@@ -27,7 +27,7 @@ export const fetchManualJournal = ({ id }) => {
             type: t.MANUAL_JOURNAL_SET,
             payload: {
               id,
-              manualJournal: response.data.manualJournal,
+              manualJournal: response.data.manual_journal,
             },
           });
           resolve(response);
@@ -129,7 +129,7 @@ export const fetchManualJournalsTable = ({ query } = {}) => {
             payload: {
               manualJournals: response.data.manual_journals,
               customViewId:
-              response.data?.filter_meta?.view?.custom_view_id || -1,
+                response.data?.filter_meta?.view?.custom_view_id || -1,
               pagination: response.data.pagination,
             },
           });