PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop

Browse Source
This commit is contained in:
ajat91.sudrajat 2022-01-06 11:39:41 +07:00
commit ae2c7af20f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/Payback/Payback.js
View File

@ -33,6 +33,7 @@ import { ModalLoaderContext } from "../../utils/modal";
import { appConfig } from "../../config/app"; import { appConfig } from "../../config/app";
import { capitalize } from "lodash"; import { capitalize } from "lodash";
import { PAYBACK_STATUS } from "../../constants/payback"; import { PAYBACK_STATUS } from "../../constants/payback";
import moment from "moment";
const { Search } = Input; const { Search } = Input;
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
@ -235,13 +236,11 @@ export const Payback = observer(() => {
const data = form.getFieldsValue(); const data = form.getFieldsValue();
//console.log(data); //console.log(data);
store.payback.filterMembership = filterMembership; store.payback.filterMembership = filterMembership;
store.payback.filterStart = data.start_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; store.payback.filterEnd = data.end_date ? (moment(data.end_date).format('YYYY-MM-DD') + ' 23:59:59') : null;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.payback.getDataConfirmation(); await store.payback.getDataConfirmation();
modalLoader.setLoading(false); modalLoader.setLoading(false);
// form.resetFields();
// setFilterMembership([]);
store.payback.visibleModalFilterPayback = false; store.payback.visibleModalFilterPayback = false;
}; };

6
src/store/payback.js
View File

@ -21,6 +21,10 @@ export class Payback {
filterStart = null; filterStart = null;
filterEnd = null; filterEnd = null;
filterStartConfirmation = null;
filterEndConfirmation = null;
//filter created //filter created
visibleModalFilterCreate = false; visibleModalFilterCreate = false;
constructor(ctx) { constructor(ctx) {
@ -49,7 +53,7 @@ export class Payback {
async getDataConfirmation() { async getDataConfirmation() {
try { try {
const response = await http.get( 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); console.log(response);
this.dataConfirmation = this.dataConfirmation =