From e8929561e80a18a8896eef38381c4536f3822aa2 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Fri, 6 Nov 2020 01:02:36 +0200 Subject: [PATCH] Fix : FetchReceipt --- .../containers/Sales/Receipt/ReceiptsDataTable.js | 14 +++++++------- client/src/store/receipt/receipt.actions.js | 3 +-- client/src/store/receipt/receipt.reducer.js | 6 ++++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/client/src/containers/Sales/Receipt/ReceiptsDataTable.js b/client/src/containers/Sales/Receipt/ReceiptsDataTable.js index 45ad5c793..819a87988 100644 --- a/client/src/containers/Sales/Receipt/ReceiptsDataTable.js +++ b/client/src/containers/Sales/Receipt/ReceiptsDataTable.js @@ -152,13 +152,13 @@ function ReceiptsDataTable({ width: 140, className: 'deposit_account', }, - { - id: 'send_to_email', - Header: formatMessage({ id: 'email' }), - accessor: 'send_to_email', - width: 140, - className: 'send_to_email', - }, + // { + // id: 'send_to_email', + // Header: formatMessage({ id: 'email' }), + // accessor: 'send_to_email', + // width: 140, + // className: 'send_to_email', + // }, { id: 'amount', Header: formatMessage({ id: 'amount' }), diff --git a/client/src/store/receipt/receipt.actions.js b/client/src/store/receipt/receipt.actions.js index 61f712d32..815458d5a 100644 --- a/client/src/store/receipt/receipt.actions.js +++ b/client/src/store/receipt/receipt.actions.js @@ -54,10 +54,9 @@ export const fetchReceipt = ({ id }) => { new Promise((resovle, reject) => { ApiService.get(`sales/receipts/${id}`) .then((response) => { - const { receipt } = response.data; dispatch({ type: t.RECEIPT_SET, - payload: { id, receipt }, + payload: { id, sale_receipt: response.data.sale_receipt }, }); resovle(response); }) diff --git a/client/src/store/receipt/receipt.reducer.js b/client/src/store/receipt/receipt.reducer.js index d463afcd0..7f6a67015 100644 --- a/client/src/store/receipt/receipt.reducer.js +++ b/client/src/store/receipt/receipt.reducer.js @@ -18,12 +18,14 @@ const defaultReceipt = { }; const reducer = createReducer(initialState, { + [t.RECEIPT_SET]: (state, action) => { - const { id, receipt } = action.payload; + const { id, sale_receipt } = action.payload; const _receipt = state.items[id] || {}; - state.items[id] = { ...defaultReceipt, ..._receipt, ...receipt }; + state.items[id] = { ...defaultReceipt, ..._receipt, ...sale_receipt }; }, + [t.RECEIPTS_ITEMS_SET]: (state, action) => { const { sales_receipts } = action.payload; const _receipts = {};