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:42 +00:00
commit edf09f0c7b
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 bordered
pagination={{ pagination={{
pageSize: store.membership.pageSize, 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, current: store.membership.page + 1,
showSizeChanger: true, showSizeChanger: true,
simple: false, simple: false,
@ -362,6 +365,7 @@ export const Membership = observer(() => {
store.membership.pageSize = page.pageSize; store.membership.pageSize = page.pageSize;
store.membership.page = pageNumber - 1; store.membership.page = pageNumber - 1;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.membership.getData();
await getData(); await getData();
modalLoader.setLoading(false); modalLoader.setLoading(false);
}} }}
@ -381,7 +385,10 @@ export const Membership = observer(() => {
modalLoader.setLoading(false); modalLoader.setLoading(false);
}, },
pageSize: store.membership.pageSize, 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, current: store.membership.page + 1,
style: { marginBottom: "1rem", marginRight: "1rem" }, style: { marginBottom: "1rem", marginRight: "1rem" },
}} }}
@ -528,7 +535,7 @@ export const Membership = observer(() => {
visible={store.membership.visibleModalFilterMembership} visible={store.membership.visibleModalFilterMembership}
title={"Filter"} title={"Filter"}
footer={footerLayoutFilter} footer={footerLayoutFilter}
onCancel={async() => { onCancel={async () => {
// setFilterMembership([]); // setFilterMembership([]);
// setFilterPartner([]); // setFilterPartner([]);
store.membership.filterMembership = null; store.membership.filterMembership = null;

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

@ -486,12 +486,12 @@ export const Payback = observer(() => {
<Row> <Row>
<Col span={24}> <Col span={24}>
<Title level={5} type={"secondary"} strong> <Title level={5} type={"secondary"} strong>
From Sender
</Title> </Title>
<Form layout="vertical" name="filter" form={form}> <Form layout="vertical" name="filter" form={form}>
<Select <Select
mode={"multiple"} mode={"multiple"}
placeholder="Pilih Anggota" placeholder="Pilih Pengirim"
onChange={(val) => { onChange={(val) => {
setFilterMembership(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 { ModalLoaderContext } from "../../utils/modal";
import { appConfig } from "../../config/app"; import { appConfig } from "../../config/app";
import { PAYBACK_STATUS } from "../../constants/payback"; import { PAYBACK_STATUS } from "../../constants/payback";
import moment from 'moment';
const { Search } = Input; const { Search } = Input;
@ -38,6 +39,7 @@ export const PaybackCreated = observer(() => {
const [initialData, setInitialData] = useState({}); const [initialData, setInitialData] = useState({});
const modalLoader = useContext(ModalLoaderContext); const modalLoader = useContext(ModalLoaderContext);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
@ -126,10 +128,15 @@ export const PaybackCreated = observer(() => {
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
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; // const awal = format(parseISO(data.start_date), "dd-MM-yyyy")
store.payback.filterEnd = data.end_date; // 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); modalLoader.setLoading(true);
await store.payback.getDataCreated(); await store.payback.getDataCreated();
modalLoader.setLoading(false); modalLoader.setLoading(false);

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

@ -74,8 +74,15 @@ export const Profile = observer(() => {
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
const data = form.getFieldsValue(); const data = form.getFieldsValue();
store.transaction.filterStart = data.start_date; console.log(data.start_date)
store.transaction.filterEnd = data.end_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); modalLoader.setLoading(true);
await store.transaction.getDataHistoryTransaction(); await store.transaction.getDataHistoryTransaction();
modalLoader.setLoading(false); modalLoader.setLoading(false);

28
src/store/membership.js
View File

@ -5,7 +5,8 @@ export class Membership {
page = 0; page = 0;
pageSize = 10 pageSize = 10
data = []; data = [];
totalData = 0; total_data = 0;
dataTotal=0;
dataDetail = {}; dataDetail = {};
dataMember=[]; 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}`); 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.filterMembership)
// console.log(this.filterPartner) // console.log(this.filterPartner)
console.log(response) //console.log(response)
this.dataMember = response.body.data.map((item, idx) => { this.dataMember = response.body.data ?? []
item.key = idx; // this.dataMember = response.body.data.map((item, idx) => {
item.name = item?.user_detail?.name; // item.key = idx;
item.phone_number = item?.user_detail?.phone_number; // item.name = item?.user_detail?.name;
item.roleId = item?.roles.id; // item.phone_number = item?.user_detail?.phone_number;
item.roleName = item?.roles.name; // item.roleId = item?.roles.id;
return item // 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) { } catch (e) {
console.error(e); console.error(e);
} }
@ -64,7 +67,8 @@ export class Membership {
return item return item
}) ?? [] }) ?? []
this.totalData = response?.body?.count ?? 0 this.total_data = response?.body?.count ?? 0
//console.log(this.total_data)
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }

36
src/store/payback.js
View File

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