Merge branch 'develop' into 'devops-staging'
Develop See merge request empatnusabangsa/ppob/ppob-frontend!27
This commit is contained in:
ilham dwi pratama
commit
602ad403a8
|
|
@ -210,16 +210,16 @@ export const ProductComponent = observer((props) => {
|
|||
store.product.filterSupplier = null;
|
||||
store.product.filterSubCategory = null;
|
||||
setFilterSupplier([]);
|
||||
store.product.filterCategory = null;
|
||||
setFilterSubCategories([]);
|
||||
await store.product.getData();
|
||||
store.product.visibleModalFilterProduct = false;
|
||||
};
|
||||
|
||||
const handleCancelFilter = () => {
|
||||
setFilterSupplier([]);
|
||||
store.product.filterCategory = null;
|
||||
store.product.filterSubCategory = null;
|
||||
store.product.filterSupplier = null;
|
||||
setFilterSubCategories([]);
|
||||
setFilterSupplier([]);
|
||||
store.product.visibleModalFilterProduct = false;
|
||||
};
|
||||
|
||||
|
|
@ -229,18 +229,20 @@ export const ProductComponent = observer((props) => {
|
|||
modalLoader.setLoading(true);
|
||||
await store.product.getData();
|
||||
modalLoader.setLoading(false);
|
||||
setFilterSupplier([]);
|
||||
setFilterSubCategories([]);
|
||||
store.product.visibleModalFilterProduct = false;
|
||||
};
|
||||
|
||||
const handleFilterCategory = async (value) => {
|
||||
if (value) {
|
||||
store.product.filterCategory = value;
|
||||
await store.product.getDataSubCategories();
|
||||
} else {
|
||||
store.product.filterCategory = null;
|
||||
await store.product.getDataSubCategories();
|
||||
}
|
||||
};
|
||||
// const handleFilterCategory = async (value) => {
|
||||
// if (value) {
|
||||
// store.product.filterCategory = value;
|
||||
// await store.product.getDataSubCategories();
|
||||
// } else {
|
||||
// store.product.filterCategory = null;
|
||||
// await store.product.getDataSubCategories();
|
||||
// }
|
||||
// };
|
||||
|
||||
const footerLayoutFilter = [
|
||||
<Button
|
||||
|
|
@ -465,11 +467,15 @@ export const ProductComponent = observer((props) => {
|
|||
</Form.Item>
|
||||
</Form>
|
||||
</Modal>
|
||||
|
||||
<Modal
|
||||
visible={store.product.visibleModalFilterProduct}
|
||||
title={"Filter"}
|
||||
footer={footerLayoutFilter}
|
||||
onCancel={() => {
|
||||
setFilterSupplier([]);
|
||||
setFilterSubCategories([]);
|
||||
store.product.visibleModalFilterProduct = false;
|
||||
}}
|
||||
>
|
||||
<Row>
|
||||
<Col span={24}>
|
||||
|
|
@ -492,24 +498,6 @@ export const ProductComponent = observer((props) => {
|
|||
))}
|
||||
</Select>
|
||||
</Col>
|
||||
{/* <Col span={24}>
|
||||
<Title level={5} type={"secondary"} strong>
|
||||
Filter Categories
|
||||
</Title>
|
||||
<Select
|
||||
mode={"multiple"}
|
||||
placeholder="Choose Category"
|
||||
onChange={async (val) => handleFilterCategory(val)}
|
||||
style={{ marginBottom: "20px", width: "100%" }}
|
||||
value={store.product.filterCategory || []}
|
||||
>
|
||||
{store.category.data.map((item) => (
|
||||
<Option value={item.id} key={item.id}>
|
||||
{item.name}
|
||||
</Option>
|
||||
))}
|
||||
</Select>
|
||||
</Col> */}
|
||||
<Col span={24}>
|
||||
<Title level={5} type={"secondary"} strong>
|
||||
Filter Sub-Categories
|
||||
|
|
|
|||
|
|
@ -20,7 +20,13 @@ export const Home = observer(() => {
|
|||
await getData();
|
||||
await store.membership.getDataBySuperior();
|
||||
await store.partner.getData();
|
||||
if(isAdmin){
|
||||
await store.transaction.getDataTransaction();
|
||||
await store.transaction.getDataTransactionB2B();
|
||||
} else {
|
||||
await store.transaction.getDataTransactionPartner();
|
||||
}
|
||||
|
||||
await store.role.getData(isAdmin);
|
||||
modalLoader.setLoading(false);
|
||||
} catch (e) {
|
||||
|
|
@ -93,7 +99,7 @@ export const Home = observer(() => {
|
|||
];
|
||||
return (
|
||||
<div>
|
||||
{store.ui.mediaQuery.isDesktop && (
|
||||
{store.ui.mediaQuery.isDesktop && store.authentication.userData.role === "Admin" && (
|
||||
<Row
|
||||
style={{
|
||||
marginTop: 30,
|
||||
|
|
@ -108,14 +114,33 @@ export const Home = observer(() => {
|
|||
height: 200,
|
||||
marginBottom: 10,
|
||||
borderColor: "salmon",
|
||||
width: "30%",
|
||||
width: "45%",
|
||||
}}
|
||||
>
|
||||
<Row>
|
||||
<BarChartOutlined style={{ fontSize: 30 }} />
|
||||
<PageHeader title={<span>Total Transaksi</span>}>
|
||||
{/*<BarChartOutlined style={{ fontSize: 25 ,marginRight:80}} />*/}
|
||||
|
||||
<PageHeader title={<span>{store.transaction.dataTransaction.total_transaction} Transaksi B2C</span>}>
|
||||
<p>
|
||||
<h4>{store.transaction.dataTransaction} Transaksi</h4>
|
||||
<h4>Total Penjualan : { new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(store.transaction.dataTransaction.total_amount)}</h4>
|
||||
|
||||
<h4>Total Modal : { new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(store.transaction.dataTransaction.total_modal)}</h4>
|
||||
|
||||
<h4>Total Profit : { new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(store.transaction.dataTransaction.total_profit)}</h4>
|
||||
|
||||
<h4>Total Komisi : { new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(store.transaction.dataTransaction.total_commission)}</h4>
|
||||
</p>
|
||||
</PageHeader>
|
||||
</Row>
|
||||
|
|
@ -128,21 +153,61 @@ export const Home = observer(() => {
|
|||
height: 200,
|
||||
marginBottom: 10,
|
||||
borderColor: "salmon",
|
||||
width: "30%",
|
||||
width: "45%",
|
||||
}}
|
||||
>
|
||||
<Row>
|
||||
<DropboxOutlined style={{ fontSize: 30 }} />
|
||||
<PageHeader title={<span>Total Keuntungan</span>}>
|
||||
<span>
|
||||
{new Intl.NumberFormat("id-ID", {
|
||||
<PageHeader title={<span>{store.transaction.dataTransaction.total_transaction} Transaksi B2B</span>}>
|
||||
<p>
|
||||
<h4>Total Penjualan : { new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(store.authentication.profileData?.wallet || 0)}
|
||||
</span>
|
||||
}).format(store.transaction.dataTransactionB2B.total_amount)}</h4>
|
||||
|
||||
<h4>Total Modal : { new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(store.transaction.dataTransactionB2B.total_modal)}</h4>
|
||||
|
||||
<h4>Total Profit : { new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(store.transaction.dataTransactionB2B.total_profit)}</h4>
|
||||
</p>
|
||||
</PageHeader>
|
||||
</Row>
|
||||
</Card>
|
||||
{/*<Card*/}
|
||||
{/* className={"shadow"}*/}
|
||||
{/* hoverable*/}
|
||||
{/* style={{*/}
|
||||
{/* marginLeft: 20,*/}
|
||||
{/* height: 200,*/}
|
||||
{/* marginBottom: 10,*/}
|
||||
{/* borderColor: "salmon",*/}
|
||||
{/* width: "30%",*/}
|
||||
{/* }}*/}
|
||||
{/*>*/}
|
||||
{/* <Row>*/}
|
||||
{/* <PageHeader title={<span>Total Keuntungan B2C</span>}>*/}
|
||||
{/* <span>*/}
|
||||
{/* {new Intl.NumberFormat("id-ID", {*/}
|
||||
{/* style: "currency",*/}
|
||||
{/* currency: "IDR",*/}
|
||||
{/* }).format(store.authentication.profileData?.wallet || 0)}*/}
|
||||
{/* </span>*/}
|
||||
{/* </PageHeader>*/}
|
||||
{/* </Row>*/}
|
||||
{/*</Card>*/}
|
||||
</Row>
|
||||
)}
|
||||
{store.ui.mediaQuery.isDesktop && store.authentication.userData.role === "Admin Partner" && (
|
||||
<Row
|
||||
style={{
|
||||
marginTop: 30,
|
||||
marginLeft: 30,
|
||||
}}
|
||||
>
|
||||
<Card
|
||||
className={"shadow"}
|
||||
hoverable
|
||||
|
|
@ -151,113 +216,13 @@ export const Home = observer(() => {
|
|||
height: 200,
|
||||
marginBottom: 10,
|
||||
borderColor: "salmon",
|
||||
width: "30%",
|
||||
width: "45%",
|
||||
}}
|
||||
>
|
||||
<Row>
|
||||
<DollarCircleOutlined style={{ fontSize: 30 }} />
|
||||
<PageHeader title={<span>Saldo</span>}>
|
||||
<span>
|
||||
{new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(store.authentication.profileData?.wallet || 0)}
|
||||
</span>
|
||||
</PageHeader>
|
||||
</Row>
|
||||
</Card>
|
||||
</Row>
|
||||
)}
|
||||
{store.authentication.userData.role === "Admin" &&
|
||||
store.ui.mediaQuery.isDesktop && (
|
||||
<Row style={{ marginLeft: 50, marginTop: 10 }}>
|
||||
<Card
|
||||
className={"shadow"}
|
||||
title="Card title"
|
||||
style={{
|
||||
marginBottom: 30,
|
||||
marginRight: 20,
|
||||
borderColor: "salmon",
|
||||
width: "47%",
|
||||
}}
|
||||
>
|
||||
<Table
|
||||
key="1"
|
||||
hasEmpty
|
||||
size="large"
|
||||
columns={columns}
|
||||
dataSource={store.membership.data}
|
||||
bordered
|
||||
pagination={{
|
||||
pageSize: store.membership.pageSize,
|
||||
total: store.membership.totalData,
|
||||
current: store.membership.page + 1,
|
||||
showSizeChanger: true,
|
||||
simple: false,
|
||||
}}
|
||||
onChange={async (page) => {
|
||||
let pageNumber = page.current;
|
||||
store.membership.pageSize = page.pageSize;
|
||||
store.membership.page = pageNumber - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await getData();
|
||||
modalLoader.setLoading(false);
|
||||
}}
|
||||
/>
|
||||
</Card>
|
||||
<Card
|
||||
className={"shadow"}
|
||||
title="Card title"
|
||||
style={{
|
||||
marginBottom: 30,
|
||||
borderColor: "salmon",
|
||||
width: "47%",
|
||||
}}
|
||||
>
|
||||
<Table
|
||||
key="1"
|
||||
hasEmpty
|
||||
size="large"
|
||||
columns={columns}
|
||||
dataSource={store.membership.data}
|
||||
bordered
|
||||
pagination={{
|
||||
pageSize: store.membership.pageSize,
|
||||
total: store.membership.totalData,
|
||||
current: store.membership.page + 1,
|
||||
showSizeChanger: true,
|
||||
simple: false,
|
||||
}}
|
||||
onChange={async (page) => {
|
||||
let pageNumber = page.current;
|
||||
store.membership.pageSize = page.pageSize;
|
||||
store.membership.page = pageNumber - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await getData();
|
||||
modalLoader.setLoading(false);
|
||||
}}
|
||||
/>
|
||||
</Card>
|
||||
</Row>
|
||||
)}
|
||||
{store.ui.mediaQuery.isMobile && (
|
||||
<div style={{ marginTop: 10 }}>
|
||||
<Card
|
||||
className={"shadow"}
|
||||
hoverable
|
||||
style={{
|
||||
marginLeft: 20,
|
||||
height: 200,
|
||||
marginBottom: 10,
|
||||
marginRight: 20,
|
||||
borderColor: "salmon",
|
||||
}}
|
||||
>
|
||||
<Row>
|
||||
<BarChartOutlined style={{ fontSize: 30 }} />
|
||||
<PageHeader title={<span>Total Transaksi</span>}>
|
||||
<p>
|
||||
<h4>{store.transaction.dataTransaction} Transaksi</h4>
|
||||
<h4>{store.transaction.dataTransactionPartner.total_transaction}</h4>
|
||||
</p>
|
||||
</PageHeader>
|
||||
</Row>
|
||||
|
|
@ -269,116 +234,256 @@ export const Home = observer(() => {
|
|||
marginLeft: 20,
|
||||
height: 200,
|
||||
marginBottom: 10,
|
||||
marginRight: 20,
|
||||
borderColor: "salmon",
|
||||
width: "45%",
|
||||
}}
|
||||
>
|
||||
<Row>
|
||||
<DropboxOutlined style={{ fontSize: 30 }} />
|
||||
<PageHeader title={<span>Total Keuntungan</span>}>
|
||||
<span>
|
||||
{new Intl.NumberFormat("id-ID", {
|
||||
<PageHeader title={<span>Total Penjualan</span>}>
|
||||
<p>
|
||||
<h4>{ new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(store.authentication.profileData?.wallet || 0)}
|
||||
</span>
|
||||
}).format(store.transaction.dataTransactionPartner.total_amount)}</h4>
|
||||
</p>
|
||||
</PageHeader>
|
||||
</Row>
|
||||
</Card>
|
||||
<Card
|
||||
className={"shadow"}
|
||||
hoverable
|
||||
style={{
|
||||
marginLeft: 20,
|
||||
height: 200,
|
||||
marginBottom: 10,
|
||||
marginRight: 20,
|
||||
borderColor: "salmon",
|
||||
}}
|
||||
>
|
||||
<Row>
|
||||
<DollarCircleOutlined style={{ fontSize: 30 }} />
|
||||
<PageHeader title={<span>Saldo</span>}>
|
||||
<span>
|
||||
{new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(store.authentication.profileData?.wallet || 0)}
|
||||
</span>
|
||||
</PageHeader>
|
||||
</Row>
|
||||
</Card>
|
||||
</div>
|
||||
)}
|
||||
{store.authentication.userData.role === "Admin" &&
|
||||
store.ui.mediaQuery.isMobile && (
|
||||
<Row style={{ marginLeft: 20, marginRight: 20, marginTop: 10 }}>
|
||||
<Card
|
||||
className={"shadow"}
|
||||
title="Card title"
|
||||
style={{
|
||||
marginBottom: 10,
|
||||
borderColor: "salmon",
|
||||
}}
|
||||
>
|
||||
<Table
|
||||
key="1"
|
||||
hasEmpty
|
||||
size="small"
|
||||
columns={columns}
|
||||
dataSource={store.membership.data}
|
||||
bordered
|
||||
pagination={{
|
||||
pageSize: store.membership.pageSize,
|
||||
total: store.membership.totalData,
|
||||
current: store.membership.page + 1,
|
||||
showSizeChanger: true,
|
||||
simple: false,
|
||||
}}
|
||||
onChange={async (page) => {
|
||||
let pageNumber = page.current;
|
||||
store.membership.pageSize = page.pageSize;
|
||||
store.membership.page = pageNumber - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await getData();
|
||||
modalLoader.setLoading(false);
|
||||
}}
|
||||
/>
|
||||
</Card>
|
||||
<Card
|
||||
className={"shadow"}
|
||||
title="Card title"
|
||||
style={{
|
||||
marginBottom: 30,
|
||||
borderColor: "salmon",
|
||||
}}
|
||||
>
|
||||
<Table
|
||||
key="1"
|
||||
hasEmpty
|
||||
size="small"
|
||||
columns={columns}
|
||||
dataSource={store.membership.data}
|
||||
bordered
|
||||
pagination={{
|
||||
pageSize: store.membership.pageSize,
|
||||
total: store.membership.totalData,
|
||||
current: store.membership.page + 1,
|
||||
showSizeChanger: true,
|
||||
simple: false,
|
||||
}}
|
||||
onChange={async (page) => {
|
||||
let pageNumber = page.current;
|
||||
store.membership.pageSize = page.pageSize;
|
||||
store.membership.page = pageNumber - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await getData();
|
||||
modalLoader.setLoading(false);
|
||||
}}
|
||||
/>
|
||||
</Card>
|
||||
{/*<Card*/}
|
||||
{/* className={"shadow"}*/}
|
||||
{/* hoverable*/}
|
||||
{/* style={{*/}
|
||||
{/* marginLeft: 20,*/}
|
||||
{/* height: 200,*/}
|
||||
{/* marginBottom: 10,*/}
|
||||
{/* borderColor: "salmon",*/}
|
||||
{/* width: "30%",*/}
|
||||
{/* }}*/}
|
||||
{/*>*/}
|
||||
{/* <Row>*/}
|
||||
{/* <PageHeader title={<span>Total Keuntungan B2C</span>}>*/}
|
||||
{/* <span>*/}
|
||||
{/* {new Intl.NumberFormat("id-ID", {*/}
|
||||
{/* style: "currency",*/}
|
||||
{/* currency: "IDR",*/}
|
||||
{/* }).format(store.authentication.profileData?.wallet || 0)}*/}
|
||||
{/* </span>*/}
|
||||
{/* </PageHeader>*/}
|
||||
{/* </Row>*/}
|
||||
{/*</Card>*/}
|
||||
</Row>
|
||||
)}
|
||||
{/*{store.authentication.userData.role === "Admin" &&*/}
|
||||
{/* store.ui.mediaQuery.isDesktop && (*/}
|
||||
{/* <Row style={{ marginLeft: 50, marginTop: 10 }}>*/}
|
||||
{/* <Card*/}
|
||||
{/* className={"shadow"}*/}
|
||||
{/* title="List Transaksi B2B"*/}
|
||||
{/* style={{*/}
|
||||
{/* marginBottom: 30,*/}
|
||||
{/* marginRight: 20,*/}
|
||||
{/* borderColor: "salmon",*/}
|
||||
{/* width: "47%",*/}
|
||||
{/* }}*/}
|
||||
{/* >*/}
|
||||
{/* <Table*/}
|
||||
{/* key="1"*/}
|
||||
{/* hasEmpty*/}
|
||||
{/* size="large"*/}
|
||||
{/* columns={columns}*/}
|
||||
{/* dataSource={store.membership.data}*/}
|
||||
{/* bordered*/}
|
||||
{/* pagination={{*/}
|
||||
{/* pageSize: store.membership.pageSize,*/}
|
||||
{/* total: store.membership.totalData,*/}
|
||||
{/* current: store.membership.page + 1,*/}
|
||||
{/* showSizeChanger: true,*/}
|
||||
{/* simple: false,*/}
|
||||
{/* }}*/}
|
||||
{/* onChange={async (page) => {*/}
|
||||
{/* let pageNumber = page.current;*/}
|
||||
{/* store.membership.pageSize = page.pageSize;*/}
|
||||
{/* store.membership.page = pageNumber - 1;*/}
|
||||
{/* modalLoader.setLoading(true);*/}
|
||||
{/* await getData();*/}
|
||||
{/* modalLoader.setLoading(false);*/}
|
||||
{/* }}*/}
|
||||
{/* />*/}
|
||||
{/* </Card>*/}
|
||||
{/* <Card*/}
|
||||
{/* className={"shadow"}*/}
|
||||
{/* title="List Transaksi B2C"*/}
|
||||
{/* style={{*/}
|
||||
{/* marginBottom: 30,*/}
|
||||
{/* borderColor: "salmon",*/}
|
||||
{/* width: "47%",*/}
|
||||
{/* }}*/}
|
||||
{/* >*/}
|
||||
{/* <Table*/}
|
||||
{/* key="1"*/}
|
||||
{/* hasEmpty*/}
|
||||
{/* size="large"*/}
|
||||
{/* columns={columns}*/}
|
||||
{/* dataSource={store.membership.data}*/}
|
||||
{/* bordered*/}
|
||||
{/* pagination={{*/}
|
||||
{/* pageSize: store.membership.pageSize,*/}
|
||||
{/* total: store.membership.totalData,*/}
|
||||
{/* current: store.membership.page + 1,*/}
|
||||
{/* showSizeChanger: true,*/}
|
||||
{/* simple: false,*/}
|
||||
{/* }}*/}
|
||||
{/* onChange={async (page) => {*/}
|
||||
{/* let pageNumber = page.current;*/}
|
||||
{/* store.membership.pageSize = page.pageSize;*/}
|
||||
{/* store.membership.page = pageNumber - 1;*/}
|
||||
{/* modalLoader.setLoading(true);*/}
|
||||
{/* await getData();*/}
|
||||
{/* modalLoader.setLoading(false);*/}
|
||||
{/* }}*/}
|
||||
{/* />*/}
|
||||
{/* </Card>*/}
|
||||
{/* </Row>*/}
|
||||
{/* )}*/}
|
||||
{/*{store.ui.mediaQuery.isMobile && (*/}
|
||||
{/* <div style={{ marginTop: 10 }}>*/}
|
||||
{/* <Card*/}
|
||||
{/* className={"shadow"}*/}
|
||||
{/* hoverable*/}
|
||||
{/* style={{*/}
|
||||
{/* marginLeft: 20,*/}
|
||||
{/* height: 200,*/}
|
||||
{/* marginBottom: 10,*/}
|
||||
{/* marginRight: 20,*/}
|
||||
{/* borderColor: "salmon",*/}
|
||||
{/* }}*/}
|
||||
{/* >*/}
|
||||
{/* <Row>*/}
|
||||
{/* <BarChartOutlined style={{ fontSize: 25,marginRight:80 }} />*/}
|
||||
{/* <PageHeader title={<span>Total Transaksi</span>}>*/}
|
||||
{/* <p>*/}
|
||||
{/* <h4>{store.transaction.dataTransaction} Transaksi</h4>*/}
|
||||
{/* </p>*/}
|
||||
{/* </PageHeader>*/}
|
||||
{/* </Row>*/}
|
||||
{/* </Card>*/}
|
||||
{/* <Card*/}
|
||||
{/* className={"shadow"}*/}
|
||||
{/* hoverable*/}
|
||||
{/* style={{*/}
|
||||
{/* marginLeft: 20,*/}
|
||||
{/* height: 200,*/}
|
||||
{/* marginBottom: 10,*/}
|
||||
{/* marginRight: 20,*/}
|
||||
{/* borderColor: "salmon",*/}
|
||||
{/* }}*/}
|
||||
{/* >*/}
|
||||
{/* <Row>*/}
|
||||
{/* <DropboxOutlined style={{ fontSize: 25 }} />*/}
|
||||
{/* <PageHeader title={<span>Total Keuntungan B2B</span>}>*/}
|
||||
{/* <span>*/}
|
||||
{/* {new Intl.NumberFormat("id-ID", {*/}
|
||||
{/* style: "currency",*/}
|
||||
{/* currency: "IDR",*/}
|
||||
{/* }).format(store.authentication.profileData?.wallet || 0)}*/}
|
||||
{/* </span>*/}
|
||||
{/* </PageHeader>*/}
|
||||
{/* </Row>*/}
|
||||
{/* </Card>*/}
|
||||
{/* <Card*/}
|
||||
{/* className={"shadow"}*/}
|
||||
{/* hoverable*/}
|
||||
{/* style={{*/}
|
||||
{/* marginLeft: 20,*/}
|
||||
{/* height: 200,*/}
|
||||
{/* marginBottom: 10,*/}
|
||||
{/* marginRight: 20,*/}
|
||||
{/* borderColor: "salmon",*/}
|
||||
{/* }}*/}
|
||||
{/* >*/}
|
||||
{/* <Row>*/}
|
||||
{/* <DollarCircleOutlined style={{ fontSize: 25 }} />*/}
|
||||
{/* <PageHeader title={<span>Total Keuntungan B2C</span>}>*/}
|
||||
{/* <span>*/}
|
||||
{/* {new Intl.NumberFormat("id-ID", {*/}
|
||||
{/* style: "currency",*/}
|
||||
{/* currency: "IDR",*/}
|
||||
{/* }).format(store.authentication.profileData?.wallet || 0)}*/}
|
||||
{/* </span>*/}
|
||||
{/* </PageHeader>*/}
|
||||
{/* </Row>*/}
|
||||
{/* </Card>*/}
|
||||
{/* </div>*/}
|
||||
{/*)}*/}
|
||||
{/*{store.authentication.userData.role === "Admin" &&*/}
|
||||
{/* store.ui.mediaQuery.isMobile && (*/}
|
||||
{/* <Row style={{ marginLeft: 20, marginRight: 20, marginTop: 10 }}>*/}
|
||||
{/* <Card*/}
|
||||
{/* className={"shadow"}*/}
|
||||
{/* title="List Transaksi B2B"*/}
|
||||
{/* style={{*/}
|
||||
{/* marginBottom: 10,*/}
|
||||
{/* borderColor: "salmon",*/}
|
||||
{/* }}*/}
|
||||
{/* >*/}
|
||||
{/* <Table*/}
|
||||
{/* key="1"*/}
|
||||
{/* hasEmpty*/}
|
||||
{/* size="small"*/}
|
||||
{/* columns={columns}*/}
|
||||
{/* dataSource={store.membership.data}*/}
|
||||
{/* bordered*/}
|
||||
{/* pagination={{*/}
|
||||
{/* pageSize: store.membership.pageSize,*/}
|
||||
{/* total: store.membership.totalData,*/}
|
||||
{/* current: store.membership.page + 1,*/}
|
||||
{/* showSizeChanger: true,*/}
|
||||
{/* simple: false,*/}
|
||||
{/* }}*/}
|
||||
{/* onChange={async (page) => {*/}
|
||||
{/* let pageNumber = page.current;*/}
|
||||
{/* store.membership.pageSize = page.pageSize;*/}
|
||||
{/* store.membership.page = pageNumber - 1;*/}
|
||||
{/* modalLoader.setLoading(true);*/}
|
||||
{/* await getData();*/}
|
||||
{/* modalLoader.setLoading(false);*/}
|
||||
{/* }}*/}
|
||||
{/* />*/}
|
||||
{/* </Card>*/}
|
||||
{/* <Card*/}
|
||||
{/* className={"shadow"}*/}
|
||||
{/* title="List Transaksi B2C"*/}
|
||||
{/* style={{*/}
|
||||
{/* marginBottom: 30,*/}
|
||||
{/* borderColor: "salmon",*/}
|
||||
{/* }}*/}
|
||||
{/* >*/}
|
||||
{/* <Table*/}
|
||||
{/* key="1"*/}
|
||||
{/* hasEmpty*/}
|
||||
{/* size="small"*/}
|
||||
{/* columns={columns}*/}
|
||||
{/* dataSource={store.membership.data}*/}
|
||||
{/* bordered*/}
|
||||
{/* pagination={{*/}
|
||||
{/* pageSize: store.membership.pageSize,*/}
|
||||
{/* total: store.membership.totalData,*/}
|
||||
{/* current: store.membership.page + 1,*/}
|
||||
{/* showSizeChanger: true,*/}
|
||||
{/* simple: false,*/}
|
||||
{/* }}*/}
|
||||
{/* onChange={async (page) => {*/}
|
||||
{/* let pageNumber = page.current;*/}
|
||||
{/* store.membership.pageSize = page.pageSize;*/}
|
||||
{/* store.membership.page = pageNumber - 1;*/}
|
||||
{/* modalLoader.setLoading(true);*/}
|
||||
{/* await getData();*/}
|
||||
{/* modalLoader.setLoading(false);*/}
|
||||
{/* }}*/}
|
||||
{/* />*/}
|
||||
{/* </Card>*/}
|
||||
{/* </Row>*/}
|
||||
{/* )}*/}
|
||||
</div>
|
||||
);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,20 +1,32 @@
|
|||
import React, {useContext, useEffect, useState} from "react";
|
||||
import {Button, Card, Col, message, Row, Space, Table, Typography,} from "antd";
|
||||
import {BreadcumbComponent} from "../../component/BreadcumbComponent";
|
||||
import {LINKS} from "../../routes/app";
|
||||
import {useStore} from "../../utils/useStore";
|
||||
import {observer} from "mobx-react-lite";
|
||||
import {format, parseISO} from "date-fns";
|
||||
import {ModalLoaderContext} from "../../utils/modal";
|
||||
import {useParams} from "react-router-dom";
|
||||
import {MembershipModal} from "./MembershipModal";
|
||||
|
||||
const {Title, Text} = Typography;
|
||||
import React, { useContext, useEffect, useState } from "react";
|
||||
import {
|
||||
Button,
|
||||
Card,
|
||||
Col,
|
||||
message,
|
||||
Row,
|
||||
Space,
|
||||
Table,
|
||||
Typography,
|
||||
Tabs,
|
||||
List,
|
||||
Divider
|
||||
} from "antd";
|
||||
import { BreadcumbComponent } from "../../component/BreadcumbComponent";
|
||||
import { LINKS } from "../../routes/app";
|
||||
import { useStore } from "../../utils/useStore";
|
||||
import { observer } from "mobx-react-lite";
|
||||
import { format, parseISO } from "date-fns";
|
||||
import { ModalLoaderContext } from "../../utils/modal";
|
||||
import { useParams } from "react-router-dom";
|
||||
import { MembershipModal } from "./MembershipModal";
|
||||
|
||||
const { Title, Text } = Typography;
|
||||
const { TabPane } = Tabs;
|
||||
export const DetailUser = observer(() => {
|
||||
const store = useStore();
|
||||
const modalLoader = useContext(ModalLoaderContext);
|
||||
const {id} = useParams();
|
||||
const { id } = useParams();
|
||||
const [visibleModal, setVisibleModal] = useState(false);
|
||||
const [isVisibleTopUpModal, setIsVisibleTopUpModal] = useState(false);
|
||||
const [destination, setDestination] = useState(null);
|
||||
|
|
@ -24,6 +36,8 @@ export const DetailUser = observer(() => {
|
|||
useEffect(() => {
|
||||
(async () => {
|
||||
modalLoader.setLoading(true);
|
||||
store.transaction.getDataHistoryTransaction();
|
||||
store.transaction.getDetailHistoryTransaction();
|
||||
await getData();
|
||||
modalLoader.setLoading(false);
|
||||
})();
|
||||
|
|
@ -31,6 +45,7 @@ export const DetailUser = observer(() => {
|
|||
return () => {
|
||||
store.membership.dataDetail = {};
|
||||
store.transaction.dataHistoryTopUp = [];
|
||||
store.transaction.dataDetailHistoryTransaction = [];
|
||||
};
|
||||
}, []);
|
||||
|
||||
|
|
@ -38,8 +53,9 @@ export const DetailUser = observer(() => {
|
|||
const isAdmin = store.authentication.userData.role === "Admin";
|
||||
await Promise.allSettled([
|
||||
store.transaction.getDataHistoryTopUp(id),
|
||||
store.transaction.getDetailHistoryTransaction(id),
|
||||
store.membership.getDetail(id),
|
||||
store.role.getData(isAdmin)
|
||||
store.role.getData(isAdmin),
|
||||
]);
|
||||
};
|
||||
|
||||
|
|
@ -79,12 +95,14 @@ export const DetailUser = observer(() => {
|
|||
message.success(
|
||||
initialData.isChangePassword
|
||||
? "Success Change Member Password"
|
||||
: "Success Update Data Member");
|
||||
: "Success Update Data Member"
|
||||
);
|
||||
} else {
|
||||
message.error(
|
||||
initialData.isChangePassword
|
||||
? "Failed Change Member Password"
|
||||
: "Failed Update Data Member");
|
||||
: "Failed Update Data Member"
|
||||
);
|
||||
}
|
||||
await getData();
|
||||
} catch (e) {
|
||||
|
|
@ -124,6 +142,57 @@ export const DetailUser = observer(() => {
|
|||
},
|
||||
];
|
||||
|
||||
const column = [
|
||||
{
|
||||
title: "Price",
|
||||
dataIndex: "price",
|
||||
key: "price",
|
||||
|
||||
render: (text) =>
|
||||
new Intl.NumberFormat("id-ID", {
|
||||
style: "currency",
|
||||
currency: "IDR",
|
||||
}).format(text),
|
||||
},
|
||||
{
|
||||
title: "Pembeli",
|
||||
dataIndex: "buyer",
|
||||
key: "buyer",
|
||||
},
|
||||
{
|
||||
title: "Tujuan",
|
||||
dataIndex: "transaction_destination",
|
||||
key: "transaction_destination",
|
||||
},
|
||||
{
|
||||
title: "Kode Transaksi",
|
||||
dataIndex: "transaction_code",
|
||||
key: "transaction_code",
|
||||
},
|
||||
{
|
||||
title: "Status",
|
||||
dataIndex: "status",
|
||||
key: "status",
|
||||
},
|
||||
{
|
||||
title: "No Seri",
|
||||
dataIndex: "seri_number",
|
||||
key: "seri_number",
|
||||
},
|
||||
{
|
||||
title: "IDTrx Mitra",
|
||||
dataIndex: "partner_transaction_code",
|
||||
key: "partner_transaction_code",
|
||||
},
|
||||
{
|
||||
title: "Transaction Date",
|
||||
dataIndex: "created_at",
|
||||
key: "created_at",
|
||||
render: (text, record) => {
|
||||
return <Text>{format(parseISO(record.created_at), "dd-MM-yyyy")}</Text>;
|
||||
},
|
||||
},
|
||||
];
|
||||
const routeData = [
|
||||
{
|
||||
route: LINKS.HOME,
|
||||
|
|
@ -135,7 +204,7 @@ export const DetailUser = observer(() => {
|
|||
},
|
||||
{
|
||||
route: LINKS.USER_DETAIL.replace(":id", id),
|
||||
name: <span style={{fontWeight: "bold"}}>Detail User</span>,
|
||||
name: <span style={{ fontWeight: "bold" }}>Detail User</span>,
|
||||
},
|
||||
];
|
||||
|
||||
|
|
@ -186,18 +255,34 @@ export const DetailUser = observer(() => {
|
|||
</Row>
|
||||
</Col>
|
||||
<Col lg={12} xs={24}>
|
||||
{store.authentication.userData.role === "Admin" && <Title strong level={3}>Action User Detail</Title>}
|
||||
{store.authentication.userData.role === "Admin" && <Space
|
||||
{store.authentication.userData.role === "Admin" && (
|
||||
<Title strong level={3}>
|
||||
Action User Detail
|
||||
</Title>
|
||||
)}
|
||||
{store.authentication.userData.role === "Admin" && (
|
||||
<Space
|
||||
size="middle"
|
||||
align={"center"}
|
||||
wrap={true}
|
||||
style={{textAlign: 'center'}}
|
||||
style={{ textAlign: "center" }}
|
||||
>
|
||||
<Button
|
||||
type={store.membership.dataDetail.isActive === true ? "danger" : "primary"}
|
||||
onClick={() => changeStatus(store.membership.dataDetail.id, store.membership.dataDetail.isActive)}
|
||||
type={
|
||||
store.membership.dataDetail.isActive === true
|
||||
? "danger"
|
||||
: "primary"
|
||||
}
|
||||
onClick={() =>
|
||||
changeStatus(
|
||||
store.membership.dataDetail.id,
|
||||
store.membership.dataDetail.isActive
|
||||
)
|
||||
}
|
||||
>
|
||||
{store.membership.dataDetail.isActive === true ? "Inactive" : "Active"}
|
||||
{store.membership.dataDetail.isActive === true
|
||||
? "Inactive"
|
||||
: "Active"}
|
||||
</Button>
|
||||
<Button
|
||||
onClick={() => {
|
||||
|
|
@ -205,7 +290,8 @@ export const DetailUser = observer(() => {
|
|||
id: store.membership.dataDetail.id,
|
||||
name: store.membership.dataDetail.userDetail.name,
|
||||
username: store.membership.dataDetail.username,
|
||||
phone_number: store.membership.dataDetail.userDetail.phone_number,
|
||||
phone_number:
|
||||
store.membership.dataDetail.userDetail.phone_number,
|
||||
roleId: store.membership.dataDetail.roles.id,
|
||||
isChangePassword: false,
|
||||
});
|
||||
|
|
@ -220,7 +306,8 @@ export const DetailUser = observer(() => {
|
|||
id: store.membership.dataDetail.id,
|
||||
name: store.membership.dataDetail.userDetail.name,
|
||||
username: store.membership.dataDetail.username,
|
||||
phone_number: store.membership.dataDetail.userDetail.phone_number,
|
||||
phone_number:
|
||||
store.membership.dataDetail.userDetail.phone_number,
|
||||
roleId: store.membership.dataDetail.roles.id,
|
||||
isChangePassword: true,
|
||||
});
|
||||
|
|
@ -229,21 +316,195 @@ export const DetailUser = observer(() => {
|
|||
>
|
||||
Ganti Password
|
||||
</Button>
|
||||
</Space>}
|
||||
<Button
|
||||
type={
|
||||
store.membership.dataDetail.isActive === true
|
||||
? "danger"
|
||||
: "primary"
|
||||
}
|
||||
onClick={() =>
|
||||
changeStatus(
|
||||
store.membership.dataDetail.id,
|
||||
store.membership.dataDetail.isActive
|
||||
)
|
||||
}
|
||||
>
|
||||
Withdraw Profit
|
||||
</Button>
|
||||
</Space>
|
||||
)}
|
||||
</Col>
|
||||
</Row>
|
||||
<Row>
|
||||
<Col span={24}>
|
||||
<div>
|
||||
<Title strong level={3}>
|
||||
History Top Up
|
||||
</Title>
|
||||
<Tabs defaultActiveKey="1">
|
||||
<TabPane tab="History Top Up" key="1">
|
||||
{/* {store.ui.mediaQuery.isDesktop && ( */}
|
||||
<Table
|
||||
key="1"
|
||||
hasEmpty
|
||||
columns={columns}
|
||||
dataSource={store.transaction.dataHistoryTopUp}
|
||||
bordered
|
||||
pagination={{
|
||||
pageSize: store.transaction.pageSize,
|
||||
total: store.transaction.total_data,
|
||||
current: store.transaction.page + 1,
|
||||
showSizeChanger: true,
|
||||
simple: false,
|
||||
}}
|
||||
onChange={async (page) => {
|
||||
let pageNumber = page.current;
|
||||
store.transaction.pageSize = page.pageSize;
|
||||
store.transaction.page = pageNumber - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await getData();
|
||||
modalLoader.setLoading(false);
|
||||
}}
|
||||
/>
|
||||
{/* )} */}
|
||||
{/* <Table
|
||||
columns={columns}
|
||||
dataSource={store.transaction.dataHistoryTopUp}
|
||||
bordered
|
||||
/> */}
|
||||
</TabPane>
|
||||
<TabPane tab="History Transaction" key="2">
|
||||
{store.ui.mediaQuery.isDesktop && (
|
||||
<Table
|
||||
key="1"
|
||||
hasEmpty
|
||||
columns={column}
|
||||
dataSource={store.transaction.dataDetailHistoryTransaction}
|
||||
bordered
|
||||
pagination={{
|
||||
pageSize: store.transaction.pageSize,
|
||||
total: store.transaction.total_data,
|
||||
current: store.transaction.page + 1,
|
||||
showSizeChanger: true,
|
||||
simple: false,
|
||||
}}
|
||||
onChange={async (page) => {
|
||||
let pageNumber = page.current;
|
||||
store.transaction.pageSize = page.pageSize;
|
||||
store.transaction.page = pageNumber - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await getData();
|
||||
modalLoader.setLoading(false);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
|
||||
{store.ui.mediaQuery.isMobile && (
|
||||
<List
|
||||
itemLayout="horizontal"
|
||||
position={"top"}
|
||||
pagination={{
|
||||
onChange: async (page) => {
|
||||
store.transaction.pageSize = page.pageSize;
|
||||
store.transaction.page = page.current - 1;
|
||||
modalLoader.setLoading(true);
|
||||
await getData();
|
||||
modalLoader.setLoading(false);
|
||||
},
|
||||
pageSize: store.transaction.pageSize,
|
||||
total: store.transaction.totalData,
|
||||
current: store.transaction.page + 1,
|
||||
style: { marginBottom: "1rem", marginRight: "1rem" },
|
||||
}}
|
||||
dataSource={store.membership.data}
|
||||
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.name}
|
||||
description={
|
||||
<div style={{}}>
|
||||
<p>
|
||||
<small>Saldo System : {item.name}</small>{" "}
|
||||
<br />
|
||||
<small>Role : {item.roleName}</small> <br />
|
||||
<small>
|
||||
Saldo Supplier : {item.coa?.amount}
|
||||
</small>{" "}
|
||||
<br />
|
||||
{/* <Button
|
||||
style={{ marginRight: 10 }}
|
||||
onClick={() => {
|
||||
setDestination(item?.id);
|
||||
console.log(item?.id);
|
||||
setIsVisibleTopUpModal(true);
|
||||
}}
|
||||
>
|
||||
<DownloadOutlined /> Top Up Saldo
|
||||
</Button>
|
||||
<Button
|
||||
onClick={async () => {
|
||||
await store.transaction.getDataHistoryTopUp(
|
||||
item.id
|
||||
);
|
||||
history.push(
|
||||
LINKS.USER_DETAIL.replace(
|
||||
":id",
|
||||
item.id
|
||||
)
|
||||
);
|
||||
console.log(item.id);
|
||||
}}
|
||||
>
|
||||
Detail
|
||||
</Button> */}
|
||||
</p>
|
||||
</div>
|
||||
}
|
||||
/>
|
||||
<div style={{ marginRight: 16 }}>
|
||||
<p
|
||||
style={{
|
||||
fontSize: 9,
|
||||
margin: 0,
|
||||
}}
|
||||
>
|
||||
{/* <Button
|
||||
type={
|
||||
item?.isActive === true ? "danger" : "primary"
|
||||
}
|
||||
onClick={() =>
|
||||
changeStatus(item?.id, item?.isActive)
|
||||
}
|
||||
>
|
||||
{item?.isActive === true ? "Inactive" : "Active"}
|
||||
</Button> */}
|
||||
</p>
|
||||
</div>
|
||||
</List.Item>
|
||||
<Divider plain style={{ margin: 0 }} />
|
||||
</div>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{/* <Table
|
||||
columns={column}
|
||||
dataSource={store.transaction.dataDetailHistoryTransaction}
|
||||
bordered
|
||||
/> */}
|
||||
</TabPane>
|
||||
</Tabs>
|
||||
</Col>
|
||||
</Row>
|
||||
<div />
|
||||
|
|
|
|||
|
|
@ -94,20 +94,14 @@ export const Membership = observer(() => {
|
|||
};
|
||||
|
||||
const handleRemoveFilter = async () => {
|
||||
store.membership.filterMembership = null;
|
||||
store.membership.filterPartner = null;
|
||||
setFilterMembership([]);
|
||||
setFilterPartner([]);
|
||||
//store.product.filterCategory = null;
|
||||
//setFilterSubCategories([]);
|
||||
store.membership.visibleModalFilterMembership = false;
|
||||
await store.membership.getData();
|
||||
store.membership.visibleModalFiltermembership = false;
|
||||
};
|
||||
const handleCancelFilter = () => {
|
||||
setFilterMembership([]);
|
||||
setFilterPartner([]);
|
||||
//store.product.filterCategory = null;
|
||||
//setFilterSubCategories([]);
|
||||
store.membership.visibleModalFilterMembership = false;
|
||||
};
|
||||
|
||||
|
|
@ -116,8 +110,9 @@ export const Membership = observer(() => {
|
|||
store.membership.filterPartner = filterPartner;
|
||||
modalLoader.setLoading(true);
|
||||
await store.membership.getData();
|
||||
//await store.product.getData();
|
||||
modalLoader.setLoading(false);
|
||||
setFilterMembership([]);
|
||||
setFilterPartner([]);
|
||||
store.membership.visibleModalFilterMembership = false;
|
||||
};
|
||||
|
||||
|
|
@ -225,6 +220,8 @@ export const Membership = observer(() => {
|
|||
<Button
|
||||
onClick={async () => {
|
||||
await store.transaction.getDataHistoryTopUp(record.id);
|
||||
await store.transaction.getDetailHistoryTransaction(record.id)
|
||||
//await store.transaction.getDataHistoryTransaction()
|
||||
history.push(LINKS.USER_DETAIL.replace(":id", record.id));
|
||||
console.log(record.id);
|
||||
}}
|
||||
|
|
@ -513,6 +510,11 @@ export const Membership = observer(() => {
|
|||
visible={store.membership.visibleModalFilterMembership}
|
||||
title={"Filter"}
|
||||
footer={footerLayoutFilter}
|
||||
onCancel={() => {
|
||||
setFilterMembership([]);
|
||||
setFilterPartner([]);
|
||||
store.membership.visibleModalFilterMembership = false;
|
||||
}}
|
||||
>
|
||||
<Row>
|
||||
<Col span={24}>
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import {
|
|||
Select,
|
||||
Typography,
|
||||
DatePicker,
|
||||
Form,
|
||||
} from "antd";
|
||||
import { useStore } from "../../utils/useStore";
|
||||
import { observer } from "mobx-react-lite";
|
||||
|
|
@ -38,15 +39,17 @@ const { RangePicker } = DatePicker;
|
|||
export const Payback = observer(() => {
|
||||
const { Option } = Select;
|
||||
const { Title } = Typography;
|
||||
const [form] = Form.useForm();
|
||||
const store = useStore();
|
||||
const modalLoader = useContext(ModalLoaderContext);
|
||||
const [filterSupplier, setFilterSupplier] = useState([]);
|
||||
const [filterMembership, setFilterMembership] = useState([]);
|
||||
const [filterSubCategories, setFilterSubCategories] = useState([]);
|
||||
|
||||
useEffect(() => {
|
||||
const init = async () => {
|
||||
try {
|
||||
modalLoader.setLoading(true);
|
||||
await store.membership.getData();
|
||||
await store.payback.getDataConfirmation();
|
||||
modalLoader.setLoading(false);
|
||||
} catch (e) {
|
||||
|
|
@ -209,29 +212,36 @@ export const Payback = observer(() => {
|
|||
};
|
||||
|
||||
const handleRemoveFilter = async () => {
|
||||
store.product.filterSupplier = null;
|
||||
store.product.filterSubCategory = null;
|
||||
setFilterSupplier([]);
|
||||
store.product.filterCategory = null;
|
||||
setFilterSubCategories([]);
|
||||
await store.product.getData();
|
||||
store.product.visibleModalFilterProduct = false;
|
||||
store.payback.filterMembership = null;
|
||||
store.payback.filterStart = null;
|
||||
store.payback.filterEnd = null;
|
||||
setFilterMembership([]);
|
||||
form.resetFields();
|
||||
await store.payback.getDataConfirmation();
|
||||
store.payback.visibleModalFilterPayback = false;
|
||||
};
|
||||
|
||||
const handleCancelFilter = () => {
|
||||
setFilterSupplier([]);
|
||||
store.product.filterCategory = null;
|
||||
setFilterSubCategories([]);
|
||||
setFilterMembership([]);
|
||||
form.resetFields();
|
||||
store.payback.filterMembership = null;
|
||||
store.payback.filterStart = null;
|
||||
store.payback.filterEnd = null;
|
||||
store.payback.visibleModalFilterPayback = false;
|
||||
};
|
||||
|
||||
const handleSubmitFilter = async () => {
|
||||
store.product.filterSupplier = filterSupplier;
|
||||
store.product.filterSubCategory = filterSubCategories;
|
||||
const data = form.getFieldsValue();
|
||||
//console.log(data);
|
||||
store.transaction.filterMembership = filterMembership;
|
||||
store.transaction.filterStart = data.start_date;
|
||||
store.transaction.filterEnd = data.end_date;
|
||||
modalLoader.setLoading(true);
|
||||
await store.product.getData();
|
||||
await store.payback.getDataConfirmation();
|
||||
modalLoader.setLoading(false);
|
||||
store.product.visibleModalFilterProduct = false;
|
||||
form.resetFields();
|
||||
setFilterMembership([]);
|
||||
store.payback.visibleModalFilterPayback = false;
|
||||
};
|
||||
|
||||
const handleFilterCategory = async (value) => {
|
||||
|
|
@ -462,33 +472,55 @@ export const Payback = observer(() => {
|
|||
visible={store.payback.visibleModalFilterPayback}
|
||||
title={"Filter"}
|
||||
footer={footerLayoutFilter}
|
||||
onCancel={() => {
|
||||
form.resetFields();
|
||||
setFilterMembership([]);
|
||||
store.payback.visibleModalFilterPayback = false;
|
||||
}}
|
||||
>
|
||||
<Row>
|
||||
<Col span={24}>
|
||||
<Title level={5} type={"secondary"} strong>
|
||||
From
|
||||
</Title>
|
||||
<Form layout="vertical" name="filter" form={form}>
|
||||
<Select
|
||||
mode={"multiple"}
|
||||
placeholder="Pilih Anggota"
|
||||
onChange={(val) => {
|
||||
setFilterSupplier(val);
|
||||
setFilterMembership(val);
|
||||
}}
|
||||
style={{ marginBottom: "20px", width: "100%" }}
|
||||
value={filterSupplier}
|
||||
value={filterMembership}
|
||||
>
|
||||
{store.payback.dataConfirmation.map((item) => (
|
||||
{store.membership.data.map((item) => (
|
||||
<Option value={item.id} key={item.id}>
|
||||
{item.userData_name}
|
||||
{item.name}
|
||||
</Option>
|
||||
))}
|
||||
</Select>
|
||||
<Form.Item
|
||||
name="start_date"
|
||||
label="Dari"
|
||||
rules={[{ required: true, message: "Please input Date!" }]}
|
||||
>
|
||||
<DatePicker style={{ width: "100%" }} />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="end_date"
|
||||
label="Sampai"
|
||||
rules={[{ required: true, message: "Please input Date!" }]}
|
||||
>
|
||||
<DatePicker style={{ width: "100%" }} />
|
||||
</Form.Item>
|
||||
</Form>
|
||||
</Col>
|
||||
<Col span={24}>
|
||||
<Title level={5} type={"secondary"} strong>
|
||||
{/* <Col span={24}> */}
|
||||
|
||||
{/* <Title level={5} type={"secondary"} strong>
|
||||
Date
|
||||
</Title>
|
||||
<RangePicker style={{ marginBottom: "20px", width: "100%" }} />
|
||||
<RangePicker style={{ marginBottom: "20px", width: "100%" }} /> */}
|
||||
{/* <Select
|
||||
mode={"multiple"}
|
||||
placeholder="Choose Category"
|
||||
|
|
@ -502,7 +534,7 @@ export const Payback = observer(() => {
|
|||
</Option>
|
||||
))}
|
||||
</Select> */}
|
||||
</Col>
|
||||
{/* </Col> */}
|
||||
{/* <Col span={24}>
|
||||
<Title level={5} type={"secondary"} strong>
|
||||
Filter Sub-Categories
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import {
|
|||
DatePicker,
|
||||
Modal,
|
||||
Form,
|
||||
Input,
|
||||
} from "antd";
|
||||
import moment from "moment";
|
||||
import { BreadcumbComponent } from "../../component/BreadcumbComponent";
|
||||
|
|
@ -53,14 +54,16 @@ export const Profile = observer(() => {
|
|||
const handleRemoveFilter = async () => {
|
||||
store.transaction.filterStart = null;
|
||||
store.transaction.filterEnd = null;
|
||||
form.resetFields();
|
||||
setFilterStart([]);
|
||||
setFilterEnd([]);
|
||||
await store.transaction.getDataHistoryTransaction();
|
||||
store.product.visibleModalFilterProduct = false;
|
||||
store.transaction.visibleModalFilterTransaction = false;
|
||||
};
|
||||
|
||||
const handleCancelFilter = () => {
|
||||
store.transaction.filterStart = null;
|
||||
form.resetFields();
|
||||
store.transaction.filterEnd = null;
|
||||
store.transaction.visibleModalFilterTransaction = false;
|
||||
};
|
||||
|
|
@ -72,6 +75,7 @@ export const Profile = observer(() => {
|
|||
modalLoader.setLoading(true);
|
||||
await store.transaction.getDataHistoryTransaction();
|
||||
modalLoader.setLoading(false);
|
||||
form.resetFields();
|
||||
store.transaction.visibleModalFilterTransaction = false;
|
||||
};
|
||||
|
||||
|
|
@ -296,6 +300,10 @@ export const Profile = observer(() => {
|
|||
visible={store.transaction.visibleModalFilterTransaction}
|
||||
title={"Filter"}
|
||||
footer={footerLayoutFilter}
|
||||
onCancel={() => {
|
||||
form.resetFields();
|
||||
store.transaction.visibleModalFilterTransaction = false;
|
||||
}}
|
||||
>
|
||||
<Row>
|
||||
<Col span={24}>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ 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)
|
||||
console.log(response)
|
||||
this.data = response.body.data.map((item, idx) => {
|
||||
item.key = idx;
|
||||
item.name = item?.user_detail?.name;
|
||||
|
|
@ -53,6 +53,7 @@ export class Membership {
|
|||
async getDataBySuperior() {
|
||||
try {
|
||||
const response = await http.get(`/users/find-by-supperior?page=${this.page}&pageSize=${this.pageSize}`);
|
||||
//console.log(response)
|
||||
this.data = response.body.data.map((item, idx) => {
|
||||
item.key = idx;
|
||||
item.name = item?.user_detail?.name;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@ export class Payback {
|
|||
|
||||
//filter
|
||||
visibleModalFilterPayback = false;
|
||||
filterMembership=null;
|
||||
filterStart=null;
|
||||
filterEnd=null;
|
||||
constructor(ctx) {
|
||||
this.ctx = ctx;
|
||||
makeAutoObservable(this);
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ export class Product {
|
|||
|
||||
async getProductPartner(id) {
|
||||
try {
|
||||
const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&sub-category=${id}`);
|
||||
const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=10&sub-category=${id}`);
|
||||
console.log(response)
|
||||
this.dataProductPartner = response.body.data
|
||||
} catch (e) {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,11 @@ export class Transaction {
|
|||
pageSizeHistoryTopUp = 10;
|
||||
dataHistoryTopUp = [];
|
||||
total_dataHistoryTopUp = 0;
|
||||
dataTransaction=[]
|
||||
dataTransaction = [];
|
||||
dataTransactionB2B = [];
|
||||
dataTransactionPartner = [];
|
||||
dataDetailHistoryTransaction = [];
|
||||
total_dataDetailHistoryTransaction=0;
|
||||
|
||||
//filter
|
||||
visibleModalFilterTransaction = false;
|
||||
|
|
@ -55,12 +59,29 @@ export class Transaction {
|
|||
|
||||
async getDataTransaction() {
|
||||
try {
|
||||
const response = await http.get(
|
||||
`/transaction/total-order`
|
||||
);
|
||||
const response = await http.get(`/transaction/total-order`);
|
||||
//console.log(response)
|
||||
this.dataTransaction = response.body.data ?? [];
|
||||
this.total_data = response?.body?.count ?? 0;
|
||||
this.dataTransaction = response.body.data;
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
async getDataTransactionB2B() {
|
||||
try {
|
||||
const response = await http.get(`/transaction/total-order-b2b`);
|
||||
//console.log(response)
|
||||
this.dataTransactionB2B = response.body.data;
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
async getDataTransactionPartner() {
|
||||
try {
|
||||
const response = await http.get(`/transaction/total-order-partner`);
|
||||
//console.log(response)
|
||||
this.dataTransactionPartner = response.body.data;
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
|
|
@ -106,11 +127,23 @@ export class Transaction {
|
|||
}
|
||||
}
|
||||
|
||||
async getDetailHistoryTransaction(id) {
|
||||
try {
|
||||
const response = await http.get(`/transaction/history-user/${id}`);
|
||||
console.log(response,'Data Trans');
|
||||
this.dataDetailHistoryTransaction = response.body.data ?? [];
|
||||
this.total_dataDetailHistoryTransaction = response?.body?.count ?? 0;
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
async getDataHistoryTopUp(id) {
|
||||
try {
|
||||
const response = await http.get(
|
||||
`/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}`
|
||||
);
|
||||
console.log(response,'get data history')
|
||||
this.dataHistoryTopUp = response.body.data ?? [];
|
||||
this.total_dataHistoryTopUp = response?.body?.count ?? 0;
|
||||
} catch (e) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user