diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index 869d550..7a70fc2 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -33,6 +33,7 @@ import { ModalLoaderContext } from "../../utils/modal"; import { appConfig } from "../../config/app"; import { capitalize } from "lodash"; import { PAYBACK_STATUS } from "../../constants/payback"; +import moment from "moment"; const { Search } = Input; const { RangePicker } = DatePicker; @@ -235,13 +236,11 @@ export const Payback = observer(() => { const data = form.getFieldsValue(); //console.log(data); store.payback.filterMembership = filterMembership; - store.payback.filterStart = data.start_date; - store.payback.filterEnd = data.end_date; + store.payback.filterStart = data.start_date ? (moment(data.start_date).format('YYYY-MM-DD') + ' 00:00:00') : null; + store.payback.filterEnd = data.end_date ? (moment(data.end_date).format('YYYY-MM-DD') + ' 23:59:59') : null; modalLoader.setLoading(true); await store.payback.getDataConfirmation(); modalLoader.setLoading(false); - // form.resetFields(); - // setFilterMembership([]); store.payback.visibleModalFilterPayback = false; }; diff --git a/src/store/payback.js b/src/store/payback.js index 0306423..a75675e 100644 --- a/src/store/payback.js +++ b/src/store/payback.js @@ -21,6 +21,10 @@ export class Payback { filterStart = null; filterEnd = null; + filterStartConfirmation = null; + filterEndConfirmation = null; + + //filter created visibleModalFilterCreate = false; constructor(ctx) { @@ -49,7 +53,7 @@ export class Payback { async getDataConfirmation() { try { const response = await http.get( - `/transaction/deposit-return/confirmation?page=${this.pageConfirmation}&pageSize=${this.pageSizeConfirmation}` + `/transaction/deposit-return/confirmation?page=${this.pageConfirmation}&pageSize=${this.pageSizeConfirmation}&start=${this.filterStart}&end=${this.filterEnd}&sender=${this.filterMembership}` ); console.log(response); this.dataConfirmation =