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

Perbaikan Project PPOB

Browse Source
This commit is contained in:
ajat91.sudrajat
2022-01-13 15:06:54 +07:00
parent 8857911dcd
commit 38d744ce2f
7 changed files with 305 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,6 +182,13 @@ export const Payback = observer(() => {
},
];
const dataRoute = [
{
route: LINKS.PAYBACK,
name: "Konfirmasi Pembayaran"
},
];
const handleAction = async (id, type) => {
modalLoader.setLoading(true);
try {
@@ -222,7 +229,7 @@ export const Payback = observer(() => {
store.payback.visibleModalFilterPayback = false;
};
const handleCancelFilter = async() => {
const handleCancelFilter = async () => {
//setFilterMembership([]);
//form.resetFields();
store.payback.filterMembership = null;
@@ -236,8 +243,12 @@ export const Payback = observer(() => {
const data = form.getFieldsValue();
//console.log(data);
store.payback.filterMembership = filterMembership;
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;
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);
@@ -281,7 +292,11 @@ export const Payback = observer(() => {
];
return (
<div className={["ppob-container"].join(" ")}>
<BreadcumbComponent data={routeData} />
<BreadcumbComponent
data={
store.authentication.userData.role === "Admin" ? routeData : dataRoute
}
/>
<Card>
<div>
<Row style={{ marginBottom: 20 }}>
@@ -470,7 +485,7 @@ export const Payback = observer(() => {
visible={store.payback.visibleModalFilterPayback}
title={"Filter"}
footer={footerLayoutFilter}
onCancel={async() => {
onCancel={async () => {
//form.resetFields();
//setFilterMembership([]);
store.payback.filterMembership = null;

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

@@ -133,6 +133,14 @@ export const PaybackCreated = observer(() => {
name: <span style={{ fontWeight: "bold" }}>Buat Pembayaran</span>,
},
];
const dataRoute = [
{
route: LINKS.PAYBACK_CREATED,
name: "Buat Pembayaran"
},
];
const handleRemoveFilter = async () => {
store.payback.filterStart = null;
store.payback.filterEnd = null;
@@ -209,7 +217,11 @@ export const PaybackCreated = observer(() => {
return (
<div className={["ppob-container"].join(" ")}>
<BreadcumbComponent data={routeData} />
<BreadcumbComponent
data={
store.authentication.userData.role === "Admin" ? routeData : dataRoute
}
/>
<Card>
<div>
<Row style={{ marginBottom: 20 }}>
@@ -307,36 +319,35 @@ export const PaybackCreated = observer(() => {
className={[""].join(" ")}
title={item.name}
description={
<div style={{marginBottom:10}}>
<div style={{ marginBottom: 10 }}>
<small>Amount: {item.amount}</small>
<br/>
<div style={{marginTop:5}}>
<small>Status : </small>
<Tag
color={
item.status === 0
? "purple"
<br />
<div style={{ marginTop: 5 }}>
<small>Status : </small>
<Tag
color={
item.status === 0
? "purple"
: item.status === 1
? "blue"
: item.status === 2
? "warning"
: item.status === 3
? "success"
: "red"
}
>
{item.status === 0
? "Pending"
: item.status === 1
? "blue"
? "Success"
: item.status === 2
? "warning"
? "Failed"
: item.status === 3
? "success"
: "red"
}
>
{item.status === 0
? "Pending"
: item.status === 1
? "Success"
: item.status === 2
? "Failed"
: item.status === 3
? "Approved"
: "Rejected"}
</Tag>
? "Approved"
: "Rejected"}
</Tag>
</div>
</div>
}
/>