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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!48
This commit is contained in:
ajat sudrajat 2022-01-05 09:27:35 +00:00
commit 89a52451fe
6 changed files with 77 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pages/Membership/Membership.js
View File

@ -352,7 +352,10 @@ export const Membership = observer(() => {
bordered
pagination={{
pageSize: store.membership.pageSize,
total: store.membership.totalData,
total:
store.authentication.userData.role === "Admin"
? store.membership.dataTotal
: store.membership.total_data,
current: store.membership.page + 1,
showSizeChanger: true,
simple: false,
@ -362,6 +365,7 @@ export const Membership = observer(() => {
store.membership.pageSize = page.pageSize;
store.membership.page = pageNumber - 1;
modalLoader.setLoading(true);
await store.membership.getData();
await getData();
modalLoader.setLoading(false);
}}
@ -381,7 +385,10 @@ export const Membership = observer(() => {
modalLoader.setLoading(false);
},
pageSize: store.membership.pageSize,
total: store.membership.totalData,
total:
store.authentication.userData.role === "Admin"
? store.membership.dataTotal
: store.membership.total_data,
current: store.membership.page + 1,
style: { marginBottom: "1rem", marginRight: "1rem" },
}}
@ -528,7 +535,7 @@ export const Membership = observer(() => {
visible={store.membership.visibleModalFilterMembership}
title={"Filter"}
footer={footerLayoutFilter}
onCancel={async() => {
onCancel={async () => {
// setFilterMembership([]);
// setFilterPartner([]);
store.membership.filterMembership = null;

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

@ -486,12 +486,12 @@ export const Payback = observer(() => {
<Row>
<Col span={24}>
<Title level={5} type={"secondary"} strong>
From
Sender
</Title>
<Form layout="vertical" name="filter" form={form}>
<Select
mode={"multiple"}
placeholder="Pilih Anggota"
placeholder="Pilih Pengirim"
onChange={(val) => {
setFilterMembership(val);
}}

13
src/pages/Payback/PaybackCreated.js
View File

@ -26,6 +26,7 @@ import { LINKS } from "../../routes/app";
import { ModalLoaderContext } from "../../utils/modal";
import { appConfig } from "../../config/app";
import { PAYBACK_STATUS } from "../../constants/payback";
import moment from 'moment';
const { Search } = Input;
@ -37,6 +38,7 @@ export const PaybackCreated = observer(() => {
const [filterMembership, setFilterMembership] = useState([]);
const [initialData, setInitialData] = useState({});
const modalLoader = useContext(ModalLoaderContext);
useEffect(() => {
const init = async () => {
@ -126,10 +128,15 @@ export const PaybackCreated = observer(() => {
const handleSubmitFilter = async () => {
const data = form.getFieldsValue();
//console.log(data);
console.log(data);
//store.payback.filterMembership = filterMembership;
store.payback.filterStart = data.start_date;
store.payback.filterEnd = data.end_date;
// const awal = format(parseISO(data.start_date), "dd-MM-yyyy")
// const akhir = format(parseISO(data.start_date), "dd-MM-yyyy")
//const awal= format(startOfDay(date.start_date()), 'yyyy-MM-dd 00:00')
const awal=store.payback.filterStart = moment(data.start_date).format('YYYY-MM-DD HH:mm:ss');
const akhir=store.payback.filterEnd = moment(data.end_date).format('YYYY-MM-DD HH:mm:ss');
console.log(awal)
console.log(akhir)
modalLoader.setLoading(true);
await store.payback.getDataCreated();
modalLoader.setLoading(false);

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

@ -74,8 +74,15 @@ export const Profile = observer(() => {
const handleSubmitFilter = async () => {
const data = form.getFieldsValue();
store.transaction.filterStart = data.start_date;
store.transaction.filterEnd = data.end_date;
console.log(data.start_date)
console.log(data.end_date)
const awal=store.transaction.filterStart = moment(data.start_date).format('YYYY-MM-DD HH:mm:ss');
const akhir=store.transaction.filterEnd = moment(data.end_date).format('YYYY-MM-DD HH:mm:ss');
console.log(awal)
console.log(akhir)
// store.transaction.filterStart = data.start_date;
// store.transaction.filterEnd = data.end_date;
modalLoader.setLoading(true);
await store.transaction.getDataHistoryTransaction();
modalLoader.setLoading(false);

28
src/store/membership.js
View File

@ -5,7 +5,8 @@ export class Membership {
page = 0;
pageSize = 10
data = [];
totalData = 0;
total_data = 0;
dataTotal=0;
dataDetail = {};
dataMember=[];
@ -25,17 +26,19 @@ export class Membership {
const response = await http.get(`/users?page=${this.page}&pageSize=${this.pageSize}&superior=${this.filterMembership}&type=${this.filterPartner}`);
console.log(this.filterMembership)
// console.log(this.filterPartner)
console.log(response)
this.dataMember = response.body.data.map((item, idx) => {
item.key = idx;
item.name = item?.user_detail?.name;
item.phone_number = item?.user_detail?.phone_number;
item.roleId = item?.roles.id;
item.roleName = item?.roles.name;
return item
}) ?? []
//console.log(response)
this.dataMember = response.body.data ?? []
// this.dataMember = response.body.data.map((item, idx) => {
// item.key = idx;
// item.name = item?.user_detail?.name;
// item.phone_number = item?.user_detail?.phone_number;
// item.roleId = item?.roles.id;
// item.roleName = item?.roles.name;
// return item
// }) ?? []
this.totalData = response?.body?.count ?? 0
this.dataTotal = response?.body?.count ?? 0
//console.log(this.dataTotal)
} catch (e) {
console.error(e);
}
@ -64,7 +67,8 @@ export class Membership {
return item
}) ?? []
this.totalData = response?.body?.count ?? 0
this.total_data = response?.body?.count ?? 0
//console.log(this.total_data)
} catch (e) {
console.error(e);
}

56
src/store/payback.js
View File

@ -1,5 +1,5 @@
import {makeAutoObservable} from "mobx";
import {http} from "../utils/http";
import { makeAutoObservable } from "mobx";
import { http } from "../utils/http";
export class Payback {
pageCreated = 0;
@ -15,14 +15,14 @@ export class Payback {
totalDataConfirmation = 0;
//data=[]
//filter
visibleModalFilterPayback = false;
filterMembership=null;
filterStart=null;
filterEnd=null;
//filter
visibleModalFilterPayback = false;
filterMembership = null;
filterStart = null;
filterEnd = null;
//filter created
visibleModalFilterCreate=false
//filter created
visibleModalFilterCreate = false;
constructor(ctx) {
this.ctx = ctx;
makeAutoObservable(this);
@ -30,12 +30,14 @@ export class Payback {
async getDataCreated() {
try {
const response = await http.get(`/transaction/deposit-return?page=${this.pageCreated}&pageSize=${this.pageSizeCreated}`
const response = await http.get(
`/transaction/deposit-return?page=${this.pageCreated}&pageSize=${this.pageSizeCreated}&start=${this.filterStart}&end=${this.filterEnd}`
);
this.dataCreated = response.body.data.map((item, idx) => {
item.key = idx;
return item;
}) ?? [];
this.dataCreated =
response.body.data.map((item, idx) => {
item.key = idx;
return item;
}) ?? [];
this.totalDataCreated = response.body.count ?? 0;
} catch (e) {
@ -46,13 +48,14 @@ 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}`
);
console.log(response)
this.dataConfirmation = response.body.data.map((item, idx) => {
item.key = idx;
return item;
}) ?? [];
console.log(response);
this.dataConfirmation =
response.body.data.map((item, idx) => {
item.key = idx;
return item;
}) ?? [];
this.totalDataConfirmation = response.body.count ?? 0;
} catch (e) {
@ -82,7 +85,9 @@ export class Payback {
async create(data) {
try {
const response = await http.post("/transaction/deposit-return").send(data);
const response = await http
.post("/transaction/deposit-return")
.send(data);
await this.getDataCreated();
return response;
} catch (e) {
@ -92,13 +97,12 @@ export class Payback {
async confirmPayback(id, data) {
try {
const response = await http.put(`/transaction/deposit-return/confirmation/${id}/${data}`);
const response = await http.put(
`/transaction/deposit-return/confirmation/${id}/${data}`
);
// console.log(response)
// this.data=response.body.data
await Promise.all([
this.getDataConfirmation(),
this.getDataCreated()
])
await Promise.all([this.getDataConfirmation(), this.getDataCreated()]);
return response;
} catch (e) {
console.error(e);