QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-15 20:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-11-07 22:02:21 +02:00
parent 1ff2d924d0 435e4c3b99
commit 08f1a8136b
6 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/store/PaymentReceive/paymentReceive.actions.js
View File

@@ -111,21 +111,21 @@ export const fetchPaymentReceivesTable = ({ query = {} }) => {
dispatch({
type: t.PAYMENT_RECEIVES_PAGE_SET,
payload: {
payment_receives: response.data.payment_receives.results,
pagination: response.data.payment_receives.pagination,
payment_receives: response.data.payment_receives,
pagination: response.data.pagination,
customViewId: response.data.customViewId || -1,
},
});
dispatch({
type: t.PAYMENT_RECEIVES_ITEMS_SET,
payload: {
payment_receives: response.data.payment_receives.results,
payment_receives: response.data.payment_receives,
},
});
dispatch({
type: t.PAYMENT_RECEIVES_PAGINATION_SET,
payload: {
pagination: response.data.payment_receives.pagination,
pagination: response.data.pagination,
customViewId: response.data.customViewId || -1,
},
});

4
client/src/store/PaymentReceive/paymentReceive.reducer.js
View File

@@ -71,9 +71,8 @@ const reducer = createReducer(initialState, {
[t.PAYMENT_RECEIVES_PAGINATION_SET]: (state, action) => {
const { pagination, customViewId } = action.payload;
const mapped = {
pageSize: parseInt(pagination.pageSize, 10),
pageSize: parseInt(pagination.page_size, 10),
page: parseInt(pagination.page, 10),
total: parseInt(pagination.total, 10),
};
@@ -96,7 +95,6 @@ const reducer = createReducer(initialState, {
const viewId = customViewId || -1;
const view = state.views[viewId] || {};
state.views[viewId] = {
...view,
pages: {