Merge branch 'develop' into 'devops-staging'

Fixing Tampilan Mobile Menu Detail User

See merge request empatnusabangsa/ppob/ppob-frontend!125
This commit is contained in:
ajat sudrajat 2022-02-03 09:57:44 +00:00
commit 5a03e7c11c

View File

@ -336,7 +336,7 @@ export const DetailUser = observer(() => {
// store.authentication.dataProfit.id // store.authentication.dataProfit.id
// ); // );
store.transaction.visibleModalFilterTransaction = false; store.transaction.visibleModalFilterTransaction = false;
setAction(false) setAction(false);
}; };
const handleCancelFilter = async () => { const handleCancelFilter = async () => {
@ -351,7 +351,7 @@ export const DetailUser = observer(() => {
// await store.transaction.getDetailHistoryTransaction( // await store.transaction.getDetailHistoryTransaction(
// store.authentication.dataProfit.id // store.authentication.dataProfit.id
// ); // );
setAction(false) setAction(false);
}; };
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
@ -372,7 +372,7 @@ export const DetailUser = observer(() => {
store.transaction.filterStart = null; store.transaction.filterStart = null;
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
store.transaction.visibleModalFilterTransaction = false; store.transaction.visibleModalFilterTransaction = false;
setAction(false) setAction(false);
}; };
const footerLayoutFilter = [ const footerLayoutFilter = [
<Button <Button
@ -735,38 +735,121 @@ export const DetailUser = observer(() => {
<Col span={24}> <Col span={24}>
<Tabs defaultActiveKey="1"> <Tabs defaultActiveKey="1">
<TabPane tab="History Top Up" key="1"> <TabPane tab="History Top Up" key="1">
<Button {store.ui.mediaQuery.isDesktop && (
style={{ marginBottom: "1rem", marginLeft: 5 }} <div>
onClick={() => { <Button
store.transaction.visibleModalFilterTransaction = true; style={{ marginBottom: "1rem", marginLeft: 5 }}
setAction(true); onClick={() => {
}} store.transaction.visibleModalFilterTransaction = true;
> setAction(true);
<FilterOutlined /> }}
Filter >
</Button> <FilterOutlined />
<Table Filter
key="1" </Button>
hasEmpty <Table
columns={columns} key="1"
dataSource={store.transaction.dataHistoryTopUp} hasEmpty
bordered columns={columns}
pagination={{ dataSource={store.transaction.dataHistoryTopUp}
pageSize: store.transaction.pageSizeHistoryTransaction, bordered
total: store.transaction.total_dataHistoryTransaction, pagination={{
current: store.transaction.pageHistoryTransaction + 1, pageSize: store.transaction.pageSizeHistoryTransaction,
showSizeChanger: true, total: store.transaction.total_dataHistoryTransaction,
simple: false, current: store.transaction.pageHistoryTransaction + 1,
}} showSizeChanger: true,
onChange={async (page) => { simple: false,
let pageNumber = page.current; }}
store.transaction.pageSize = page.pageSize; onChange={async (page) => {
store.transaction.page = pageNumber - 1; let pageNumber = page.current;
modalLoader.setLoading(true); store.transaction.pageSize = page.pageSize;
await getData(); store.transaction.page = pageNumber - 1;
modalLoader.setLoading(false); modalLoader.setLoading(true);
}} await getData();
/> modalLoader.setLoading(false);
}}
/>
</div>
)}
{store.ui.mediaQuery.isMobile && (
<div>
<Button
style={{ marginBottom: "1rem" }}
onClick={() => {
store.transaction.visibleModalFilterTransaction = true;
setAction(true);
}}
>
<FilterOutlined />
Filter
</Button>
<List
itemLayout="horizontal"
position={"top"}
pagination={{
onChange: async (page, pageSize) => {
store.transaction.pageSize = pageSize;
store.transaction.page = page - 1;
modalLoader.setLoading(true);
await getData();
modalLoader.setLoading(false);
},
pageSize: store.transaction.pageSize,
total: store.transaction.total_data,
current: store.transaction.page + 1,
style: { marginBottom: "1rem", marginRight: "1rem" },
}}
dataSource={store.transaction.dataHistoryTopUp}
style={{ padding: 0 }}
renderItem={(item) => {
return (
<div>
<List.Item
key={item.id}
style={{
backgroundColor: "#ffffff",
paddingTop: 0,
paddingBottom: 0,
display: "flex",
flexDirection: "row",
alignItems: "center",
justifyContent: "center",
}}
>
<List.Item.Meta
className={["cariparkir-container"].join(" ")}
title={item.sender_name}
description={
<div style={{}}>
<p>
<small>
Amount :{" "}
{new Intl.NumberFormat("id-ID", {
style: "currency",
currency: "IDR",
}).format(item.amount || 0)}
</small>{" "}
<br />
<small>
Transaction Date :{" "}
{format(
parseISO(item.transaction_date),
"dd-MM-yyyy hh:mm:ss"
)}
</small>{" "}
<br />
</p>
</div>
}
/>
</List.Item>
<Divider plain style={{ margin: 0 }} />
</div>
);
}}
/>
</div>
)}
</TabPane> </TabPane>
<TabPane tab="History Transaction" key="2"> <TabPane tab="History Transaction" key="2">
{store.ui.mediaQuery.isDesktop && ( {store.ui.mediaQuery.isDesktop && (