fix bugs.

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

@@ -47,6 +47,22 @@ export const deleteManualJournal = ({ id }) => {
     });
 };
 
+
+export const deleteBulkManualJournals = ({ ids }) => {
+  return (dispatch) => new Promise((resolve, reject) => {
+    ApiService.delete('accounting/manual-journals', { params: { ids } })
+      .then((response) => {
+        dispatch({
+          type: t.MANUAL_JOURNALS_BULK_DELETE,
+          payload: { ids },
+        });
+        resolve(response);
+      }).catch((error) => {
+        reject(error.response.data.errors || []);
+      });
+  });
+};
+
 export const publishManualJournal = ({ id }) => {
   return (dispatch) =>
     new Promise((resolve, reject) => {
@@ -66,6 +82,9 @@ export const fetchManualJournalsTable = ({ query } = {}) => {
   return (dispatch, getState) =>
     new Promise((resolve, reject) => {
       const pageQuery = getState().manualJournals.tableQuery;
+      dispatch({
+        type: t.SET_DASHBOARD_REQUEST_LOADING,
+      });
       dispatch({
         type: t.MANUAL_JOURNALS_TABLE_LOADING,
         loading: true,
@@ -74,20 +93,22 @@ export const fetchManualJournalsTable = ({ query } = {}) => {
         params: { ...pageQuery, ...query },
       })
         .then((response) => {
-          
           dispatch({
             type: t.MANUAL_JOURNALS_PAGE_SET,
-            manual_journals: response.data.manualJournals,
-            customViewId: response.data.customViewId,
+            manual_journals: response.data.manualJournals.results,
+            customViewId: response.data.customViewId ||  -1,
           });
           dispatch({
             type: t.MANUAL_JOURNALS_ITEMS_SET,
-            manual_journals: response.data.manualJournals,
+            manual_journals: response.data.manualJournals.results,
           });
           dispatch({
             type: t.MANUAL_JOURNALS_TABLE_LOADING,
             loading: false,
           });
+          dispatch({
+            type: t.SET_DASHBOARD_REQUEST_COMPLETED,
+          });
           resolve(response);
         })
         .catch((error) => {

client/src/store/manualJournals/manualJournals.reducers.js

@@ -1,5 +1,6 @@
 import t from 'store/types';
 import { createReducer } from '@reduxjs/toolkit';
+import { createTableQueryReducers } from 'store/queryReducers';
 import { omit } from 'lodash';
 
 const initialState = {
@@ -10,7 +11,7 @@ const initialState = {
   tableQuery: {},
 };
 
-export default createReducer(initialState, {
+const reducer = createReducer(initialState, {
   
   [t.MANUAL_JOURNAL_SET]: (state, action) => {
     const { id, manualJournal } = action.payload;
@@ -59,9 +60,22 @@ export default createReducer(initialState, {
   [t.MANUAL_JOURNAL_REMOVE]: (state, action) => {
     const { id } = action.payload;
     state.items = omit(state.items, [id]);
-  }
+  },
+
+  [t.MANUAL_JOURNALS_BULK_DELETE]: (state, action) => {
+    const { ids } = action.payload;
+    const items = { ...state.items };
+
+    ids.forEach((id) => {
+      if (typeof items[id] !== 'undefined') {
+        delete items[id];
+      }
+    });
+    state.items = items;
+  },
 });
 
+export default createTableQueryReducers('manual_journals', reducer);
 
 export const getManualJournal = (state, id) => {
   return state.manualJournals.items[id];

client/src/store/manualJournals/manualJournals.types.js

@@ -10,4 +10,5 @@ export default {
   MANUAL_JOURNAL_REMOVE: 'MANUAL_JOURNAL_REMOVE',
 
   MANUAL_JOURNAL_PUBLISH: 'MANUAL_JOURNAL_PUBLISH',
+  MANUAL_JOURNALS_BULK_DELETE: 'MANUAL_JOURNALS_BULK_DELETE',
 };