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 devops-staging

Browse Source
This commit is contained in:
Fadli 2022-12-20 11:00:48 +07:00
commit 1563ace937
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/Membership/DetailUser.js
View File

@ -380,11 +380,11 @@ export const DetailUser = observer(() => {
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
const data = form.getFieldsValue(); const data = form.getFieldsValue();
store.transaction.filterStart = moment(data.start_date).format( store.transaction.filterStart = moment(data.start_date).format(
"YYYY-MM-DD HH:mm:ss" "YYYY-MM-DD"
); ) + " 00:00:00";
store.transaction.filterEnd = moment(data.end_date).format( store.transaction.filterEnd = moment(data.end_date).format(
"YYYY-MM-DD HH:mm:ss" "YYYY-MM-DD"
); ) + " 23:59:59";
modalLoader.setLoading(true); modalLoader.setLoading(true);
actionFilter === true actionFilter === true
? await store.transaction.getDataHistoryTopUp(id) ? await store.transaction.getDataHistoryTopUp(id)

8
src/pages/Profile/Profile.js
View File

@ -108,11 +108,11 @@ export const Profile = observer(() => {
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
const data = form.getFieldsValue(); const data = form.getFieldsValue();
store.transaction.filterStart = moment(data.start_date).format( store.transaction.filterStart = moment(data.start_date).format(
"YYYY-MM-DD HH:mm:ss" "YYYY-MM-DD"
); ) + " 00:00:00";
store.transaction.filterEnd = moment(data.end_date).format( store.transaction.filterEnd = moment(data.end_date).format(
"YYYY-MM-DD HH:mm:ss" "YYYY-MM-DD"
); ) + " 23:59:59";
modalLoader.setLoading(true); modalLoader.setLoading(true);
// actionFilter === true // actionFilter === true
// ? await store.transaction.getDataHistoryTopUpProfile( // ? await store.transaction.getDataHistoryTopUpProfile(