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

Merge branch 'develop' into 'devops-staging'

Browse Source 
Tambah Fitur

See merge request empatnusabangsa/ppob/ppob-frontend!87
This commit is contained in:
ajat sudrajat 2022-01-26 07:33:46 +00:00
commit 85c1058f0d
2 changed files with 114 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,19 +341,12 @@ export const DetailUser = observer(() => {
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
const data = form.getFieldsValue(); const data = form.getFieldsValue();
console.log(data.start_date); store.transaction.filterStart = moment(data.start_date).format(
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" "YYYY-MM-DD HH:mm:ss"
)); );
console.log(awal); store.transaction.filterEnd = moment(data.end_date).format(
console.log(akhir); "YYYY-MM-DD HH:mm:ss"
console.log(store.authentication.dataProfit.id, "id auth"); );
console.log(store.membership.dataDetail.id, "id member");
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.transaction.getDetailHistoryTransaction( await store.transaction.getDetailHistoryTransaction(
store.authentication.dataProfit.id store.authentication.dataProfit.id
@ -773,104 +766,115 @@ export const DetailUser = observer(() => {
)} )}
{store.ui.mediaQuery.isMobile && ( {store.ui.mediaQuery.isMobile && (
<List <div>
itemLayout="horizontal" <Button
position={"top"} style={{ marginBottom: "1rem" }}
pagination={{ onClick={() => {
onChange: async (page, pageSize) => { store.transaction.visibleModalFilterTransaction = true;
store.transaction.pageSize = pageSize; }}
store.transaction.page = page - 1; >
modalLoader.setLoading(true); <FilterOutlined />
await getData(); Filter
modalLoader.setLoading(false); </Button>
}, <List
pageSize: store.transaction.pageSize, itemLayout="horizontal"
total: store.transaction.total_data, position={"top"}
current: store.transaction.page + 1, pagination={{
style: { marginBottom: "1rem", marginRight: "1rem" }, onChange: async (page, pageSize) => {
}} store.transaction.pageSize = pageSize;
dataSource={ store.transaction.page = page - 1;
store.transaction.dataDetailHistoryTransactionDetailUser modalLoader.setLoading(true);
} await getData();
style={{ padding: 0 }} modalLoader.setLoading(false);
renderItem={(item) => { },
return ( pageSize: store.transaction.pageSize,
<div> total: store.transaction.total_data,
<List.Item current: store.transaction.page + 1,
key={item.id} style: { marginBottom: "1rem", marginRight: "1rem" },
style={{ }}
backgroundColor: "#ffffff", dataSource={
paddingTop: 0, store.transaction.dataDetailHistoryTransactionDetailUser
paddingBottom: 0, }
display: "flex", style={{ padding: 0 }}
flexDirection: "row", renderItem={(item) => {
alignItems: "center", return (
justifyContent: "center", <div>
}} <List.Item
> key={item.id}
<List.Item.Meta style={{
className={["cariparkir-container"].join(" ")} backgroundColor: "#ffffff",
title={item.buyer} paddingTop: 0,
description={ paddingBottom: 0,
<div style={{}}> display: "flex",
<p> flexDirection: "row",
<small>Price : {item.price}</small> <br /> alignItems: "center",
<small> justifyContent: "center",
Tujuan : {item.transaction_destination} }}
</small>{" "} >
<br /> <List.Item.Meta
<small> className={["cariparkir-container"].join(" ")}
Kode Transaksi : {item.transaction_code} title={item.buyer}
</small>{" "} description={
<br /> <div style={{}}>
<small> <p>
Status :{" "} <small>Price : {item.price}</small> <br />
{ <small>
<Tag Tujuan : {item.transaction_destination}
color={ </small>{" "}
item.status === 1 <br />
? "success" <small>
Kode Transaksi : {item.transaction_code}
</small>{" "}
<br />
<small>
Status :{" "}
{
<Tag
color={
item.status === 1
? "success"
: item.status === 0
? "warning"
: "processing"
}
>
{item.status === 1
? "Success"
: item.status === 0 : item.status === 0
? "warning" ? "Pending"
: "processing" : "Failed"}
} </Tag>
> }
{item.status === 1 </small>{" "}
? "Success" <br />
: item.status === 0 <small>
? "Pending" No.Seri : {item.seri_number}
: "Failed"} </small>{" "}
</Tag> <br />
} <small>
</small>{" "} IDTrx Mitra :{" "}
<br /> {item.partner_transaction_code}
<small> </small>{" "}
No.Seri : {item.seri_number} <br />
</small>{" "} <small>
<br /> Transaction Date :{" "}
<small> {format(
IDTrx Mitra :{" "} parseISO(item.created_at),
{item.partner_transaction_code} "dd-MM-yyyy hh:mm:ss"
</small>{" "} )}
<br /> </small>{" "}
<small> <br />
Transaction Date :{" "} </p>
{format( </div>
parseISO(item.created_at), }
"dd-MM-yyyy" />
)} </List.Item>
</small>{" "} <Divider plain style={{ margin: 0 }} />
<br /> </div>
</p> );
</div> }}
} />
/> </div>
</List.Item>
<Divider plain style={{ margin: 0 }} />
</div>
);
}}
/>
)} )}
</TabPane> </TabPane>
</Tabs> </Tabs>

2
src/pages/Membership/Konfirmasi.js
View File

@ -463,7 +463,7 @@ export const Konfirmasi = observer(() => {
style={ style={
store.ui.mediaQuery.isDesktop store.ui.mediaQuery.isDesktop
? { ? {
width: "22vw", width: "20vw",
borderColor: "salmon", borderColor: "salmon",
marginLeft: "10px", marginLeft: "10px",
} }