Merge branch 'develop' into 'devops-staging'

Develop

See merge request empatnusabangsa/ppob/ppob-frontend!27
This commit is contained in:
ilham dwi pratama 2022-01-02 09:56:36 +00:00
commit 3896e4c9d1
10 changed files with 811 additions and 378 deletions

View File

@ -210,16 +210,16 @@ export const ProductComponent = observer((props) => {
store.product.filterSupplier = null; store.product.filterSupplier = null;
store.product.filterSubCategory = null; store.product.filterSubCategory = null;
setFilterSupplier([]); setFilterSupplier([]);
store.product.filterCategory = null;
setFilterSubCategories([]); setFilterSubCategories([]);
await store.product.getData(); await store.product.getData();
store.product.visibleModalFilterProduct = false; store.product.visibleModalFilterProduct = false;
}; };
const handleCancelFilter = () => { const handleCancelFilter = () => {
setFilterSupplier([]); store.product.filterSubCategory = null;
store.product.filterCategory = null; store.product.filterSupplier = null;
setFilterSubCategories([]); setFilterSubCategories([]);
setFilterSupplier([]);
store.product.visibleModalFilterProduct = false; store.product.visibleModalFilterProduct = false;
}; };
@ -229,18 +229,20 @@ export const ProductComponent = observer((props) => {
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.product.getData(); await store.product.getData();
modalLoader.setLoading(false); modalLoader.setLoading(false);
setFilterSupplier([]);
setFilterSubCategories([]);
store.product.visibleModalFilterProduct = false; store.product.visibleModalFilterProduct = false;
}; };
const handleFilterCategory = async (value) => { // const handleFilterCategory = async (value) => {
if (value) { // if (value) {
store.product.filterCategory = value; // store.product.filterCategory = value;
await store.product.getDataSubCategories(); // await store.product.getDataSubCategories();
} else { // } else {
store.product.filterCategory = null; // store.product.filterCategory = null;
await store.product.getDataSubCategories(); // await store.product.getDataSubCategories();
} // }
}; // };
const footerLayoutFilter = [ const footerLayoutFilter = [
<Button <Button
@ -465,11 +467,15 @@ export const ProductComponent = observer((props) => {
</Form.Item> </Form.Item>
</Form> </Form>
</Modal> </Modal>
<Modal <Modal
visible={store.product.visibleModalFilterProduct} visible={store.product.visibleModalFilterProduct}
title={"Filter"} title={"Filter"}
footer={footerLayoutFilter} footer={footerLayoutFilter}
onCancel={() => {
setFilterSupplier([]);
setFilterSubCategories([]);
store.product.visibleModalFilterProduct = false;
}}
> >
<Row> <Row>
<Col span={24}> <Col span={24}>
@ -492,24 +498,6 @@ export const ProductComponent = observer((props) => {
))} ))}
</Select> </Select>
</Col> </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}> <Col span={24}>
<Title level={5} type={"secondary"} strong> <Title level={5} type={"secondary"} strong>
Filter Sub-Categories Filter Sub-Categories

View File

@ -20,7 +20,13 @@ export const Home = observer(() => {
await getData(); await getData();
await store.membership.getDataBySuperior(); await store.membership.getDataBySuperior();
await store.partner.getData(); await store.partner.getData();
await store.transaction.getDataTransaction(); if(isAdmin){
await store.transaction.getDataTransaction();
await store.transaction.getDataTransactionB2B();
} else {
await store.transaction.getDataTransactionPartner();
}
await store.role.getData(isAdmin); await store.role.getData(isAdmin);
modalLoader.setLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
@ -93,7 +99,7 @@ export const Home = observer(() => {
]; ];
return ( return (
<div> <div>
{store.ui.mediaQuery.isDesktop && ( {store.ui.mediaQuery.isDesktop && store.authentication.userData.role === "Admin" && (
<Row <Row
style={{ style={{
marginTop: 30, marginTop: 30,
@ -108,14 +114,33 @@ export const Home = observer(() => {
height: 200, height: 200,
marginBottom: 10, marginBottom: 10,
borderColor: "salmon", borderColor: "salmon",
width: "30%", width: "45%",
}} }}
> >
<Row> <Row>
<BarChartOutlined style={{ fontSize: 30 }} /> {/*<BarChartOutlined style={{ fontSize: 25 ,marginRight:80}} />*/}
<PageHeader title={<span>Total Transaksi</span>}>
<PageHeader title={<span>{store.transaction.dataTransaction.total_transaction} Transaksi B2C</span>}>
<p> <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> </p>
</PageHeader> </PageHeader>
</Row> </Row>
@ -128,257 +153,337 @@ export const Home = observer(() => {
height: 200, height: 200,
marginBottom: 10, marginBottom: 10,
borderColor: "salmon", borderColor: "salmon",
width: "30%", width: "45%",
}} }}
> >
<Row> <Row>
<DropboxOutlined style={{ fontSize: 30 }} /> <PageHeader title={<span>{store.transaction.dataTransaction.total_transaction} Transaksi B2B</span>}>
<PageHeader title={<span>Total Keuntungan</span>}> <p>
<span> <h4>Total Penjualan : { new Intl.NumberFormat("id-ID", {
{new Intl.NumberFormat("id-ID", {
style: "currency", style: "currency",
currency: "IDR", currency: "IDR",
}).format(store.authentication.profileData?.wallet || 0)} }).format(store.transaction.dataTransactionB2B.total_amount)}</h4>
</span>
</PageHeader> <h4>Total Modal : { new Intl.NumberFormat("id-ID", {
</Row> style: "currency",
</Card> currency: "IDR",
<Card }).format(store.transaction.dataTransactionB2B.total_modal)}</h4>
className={"shadow"}
hoverable <h4>Total Profit : { new Intl.NumberFormat("id-ID", {
style={{ style: "currency",
marginLeft: 20, currency: "IDR",
height: 200, }).format(store.transaction.dataTransactionB2B.total_profit)}</h4>
marginBottom: 10, </p>
borderColor: "salmon",
width: "30%",
}}
>
<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> </PageHeader>
</Row> </Row>
</Card> </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> </Row>
)} )}
{store.authentication.userData.role === "Admin" && {store.ui.mediaQuery.isDesktop && store.authentication.userData.role === "Admin Partner" && (
store.ui.mediaQuery.isDesktop && ( <Row
<Row style={{ marginLeft: 50, marginTop: 10 }}>
<Card
className={"shadow"}
title="Card title"
style={{ style={{
marginBottom: 30, marginTop: 30,
marginRight: 20, marginLeft: 30,
borderColor: "salmon",
width: "47%",
}} }}
>
<Card
className={"shadow"}
hoverable
style={{
marginLeft: 20,
height: 200,
marginBottom: 10,
borderColor: "salmon",
width: "45%",
}}
> >
<Table <Row>
key="1" <PageHeader title={<span>Total Transaksi</span>}>
hasEmpty <p>
size="large" <h4>{store.transaction.dataTransactionPartner.total_transaction}</h4>
columns={columns} </p>
dataSource={store.membership.data} </PageHeader>
bordered </Row>
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>
<Card <Card
className={"shadow"} className={"shadow"}
title="Card title" hoverable
style={{ style={{
marginBottom: 30, marginLeft: 20,
borderColor: "salmon", height: 200,
width: "47%", marginBottom: 10,
}} borderColor: "salmon",
width: "45%",
}}
> >
<Table <Row>
key="1" <PageHeader title={<span>Total Penjualan</span>}>
hasEmpty <p>
size="large" <h4>{ new Intl.NumberFormat("id-ID", {
columns={columns} style: "currency",
dataSource={store.membership.data} currency: "IDR",
bordered }).format(store.transaction.dataTransactionPartner.total_amount)}</h4>
pagination={{ </p>
pageSize: store.membership.pageSize, </PageHeader>
total: store.membership.totalData, </Row>
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>
{/*<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> </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>
</p>
</PageHeader>
</Row>
</Card>
<Card
className={"shadow"}
hoverable
style={{
marginLeft: 20,
height: 200,
marginBottom: 10,
marginRight: 20,
borderColor: "salmon",
}}
>
<Row>
<DropboxOutlined style={{ fontSize: 30 }} />
<PageHeader title={<span>Total Keuntungan</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: 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.authentication.userData.role === "Admin" &&*/}
store.ui.mediaQuery.isMobile && ( {/* store.ui.mediaQuery.isDesktop && (*/}
<Row style={{ marginLeft: 20, marginRight: 20, marginTop: 10 }}> {/* <Row style={{ marginLeft: 50, marginTop: 10 }}>*/}
<Card {/* <Card*/}
className={"shadow"} {/* className={"shadow"}*/}
title="Card title" {/* title="List Transaksi B2B"*/}
style={{ {/* style={{*/}
marginBottom: 10, {/* marginBottom: 30,*/}
borderColor: "salmon", {/* marginRight: 20,*/}
}} {/* borderColor: "salmon",*/}
> {/* width: "47%",*/}
<Table {/* }}*/}
key="1" {/* >*/}
hasEmpty {/* <Table*/}
size="small" {/* key="1"*/}
columns={columns} {/* hasEmpty*/}
dataSource={store.membership.data} {/* size="large"*/}
bordered {/* columns={columns}*/}
pagination={{ {/* dataSource={store.membership.data}*/}
pageSize: store.membership.pageSize, {/* bordered*/}
total: store.membership.totalData, {/* pagination={{*/}
current: store.membership.page + 1, {/* pageSize: store.membership.pageSize,*/}
showSizeChanger: true, {/* total: store.membership.totalData,*/}
simple: false, {/* current: store.membership.page + 1,*/}
}} {/* showSizeChanger: true,*/}
onChange={async (page) => { {/* simple: false,*/}
let pageNumber = page.current; {/* }}*/}
store.membership.pageSize = page.pageSize; {/* onChange={async (page) => {*/}
store.membership.page = pageNumber - 1; {/* let pageNumber = page.current;*/}
modalLoader.setLoading(true); {/* store.membership.pageSize = page.pageSize;*/}
await getData(); {/* store.membership.page = pageNumber - 1;*/}
modalLoader.setLoading(false); {/* modalLoader.setLoading(true);*/}
}} {/* await getData();*/}
/> {/* modalLoader.setLoading(false);*/}
</Card> {/* }}*/}
<Card {/* />*/}
className={"shadow"} {/* </Card>*/}
title="Card title" {/* <Card*/}
style={{ {/* className={"shadow"}*/}
marginBottom: 30, {/* title="List Transaksi B2C"*/}
borderColor: "salmon", {/* style={{*/}
}} {/* marginBottom: 30,*/}
> {/* borderColor: "salmon",*/}
<Table {/* width: "47%",*/}
key="1" {/* }}*/}
hasEmpty {/* >*/}
size="small" {/* <Table*/}
columns={columns} {/* key="1"*/}
dataSource={store.membership.data} {/* hasEmpty*/}
bordered {/* size="large"*/}
pagination={{ {/* columns={columns}*/}
pageSize: store.membership.pageSize, {/* dataSource={store.membership.data}*/}
total: store.membership.totalData, {/* bordered*/}
current: store.membership.page + 1, {/* pagination={{*/}
showSizeChanger: true, {/* pageSize: store.membership.pageSize,*/}
simple: false, {/* total: store.membership.totalData,*/}
}} {/* current: store.membership.page + 1,*/}
onChange={async (page) => { {/* showSizeChanger: true,*/}
let pageNumber = page.current; {/* simple: false,*/}
store.membership.pageSize = page.pageSize; {/* }}*/}
store.membership.page = pageNumber - 1; {/* onChange={async (page) => {*/}
modalLoader.setLoading(true); {/* let pageNumber = page.current;*/}
await getData(); {/* store.membership.pageSize = page.pageSize;*/}
modalLoader.setLoading(false); {/* store.membership.page = pageNumber - 1;*/}
}} {/* modalLoader.setLoading(true);*/}
/> {/* await getData();*/}
</Card> {/* modalLoader.setLoading(false);*/}
</Row> {/* }}*/}
)} {/* />*/}
{/* </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> </div>
); );
}); });

View File

@ -1,20 +1,32 @@
import React, {useContext, useEffect, useState} from "react"; import React, { useContext, useEffect, useState } from "react";
import {Button, Card, Col, message, Row, Space, Table, Typography,} from "antd"; import {
import {BreadcumbComponent} from "../../component/BreadcumbComponent"; Button,
import {LINKS} from "../../routes/app"; Card,
import {useStore} from "../../utils/useStore"; Col,
import {observer} from "mobx-react-lite"; message,
import {format, parseISO} from "date-fns"; Row,
import {ModalLoaderContext} from "../../utils/modal"; Space,
import {useParams} from "react-router-dom"; Table,
import {MembershipModal} from "./MembershipModal"; Typography,
Tabs,
const {Title, Text} = Typography; 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(() => { export const DetailUser = observer(() => {
const store = useStore(); const store = useStore();
const modalLoader = useContext(ModalLoaderContext); const modalLoader = useContext(ModalLoaderContext);
const {id} = useParams(); const { id } = useParams();
const [visibleModal, setVisibleModal] = useState(false); const [visibleModal, setVisibleModal] = useState(false);
const [isVisibleTopUpModal, setIsVisibleTopUpModal] = useState(false); const [isVisibleTopUpModal, setIsVisibleTopUpModal] = useState(false);
const [destination, setDestination] = useState(null); const [destination, setDestination] = useState(null);
@ -24,6 +36,8 @@ export const DetailUser = observer(() => {
useEffect(() => { useEffect(() => {
(async () => { (async () => {
modalLoader.setLoading(true); modalLoader.setLoading(true);
store.transaction.getDataHistoryTransaction();
store.transaction.getDetailHistoryTransaction();
await getData(); await getData();
modalLoader.setLoading(false); modalLoader.setLoading(false);
})(); })();
@ -31,6 +45,7 @@ export const DetailUser = observer(() => {
return () => { return () => {
store.membership.dataDetail = {}; store.membership.dataDetail = {};
store.transaction.dataHistoryTopUp = []; store.transaction.dataHistoryTopUp = [];
store.transaction.dataDetailHistoryTransaction = [];
}; };
}, []); }, []);
@ -38,8 +53,9 @@ export const DetailUser = observer(() => {
const isAdmin = store.authentication.userData.role === "Admin"; const isAdmin = store.authentication.userData.role === "Admin";
await Promise.allSettled([ await Promise.allSettled([
store.transaction.getDataHistoryTopUp(id), store.transaction.getDataHistoryTopUp(id),
store.transaction.getDetailHistoryTransaction(id),
store.membership.getDetail(id), store.membership.getDetail(id),
store.role.getData(isAdmin) store.role.getData(isAdmin),
]); ]);
}; };
@ -77,22 +93,24 @@ export const DetailUser = observer(() => {
if (response?.body?.statusCode === 200) { if (response?.body?.statusCode === 200) {
message.success( message.success(
initialData.isChangePassword initialData.isChangePassword
? "Success Change Member Password" ? "Success Change Member Password"
: "Success Update Data Member"); : "Success Update Data Member"
);
} else { } else {
message.error( message.error(
initialData.isChangePassword initialData.isChangePassword
? "Failed Change Member Password" ? "Failed Change Member Password"
: "Failed Update Data Member"); : "Failed Update Data Member"
);
} }
await getData(); await getData();
} catch (e) { } catch (e) {
modalLoader.setLoading(false); modalLoader.setLoading(false);
message.error( message.error(
initialData.isChangePassword initialData.isChangePassword
? "Failed Update Member Password" ? "Failed Update Member Password"
: "Failed Update Data Member" : "Failed Update Data Member"
); );
} }
modalLoader.setLoading(false); modalLoader.setLoading(false);
@ -105,10 +123,10 @@ export const DetailUser = observer(() => {
dataIndex: "amount", dataIndex: "amount",
key: "amount", key: "amount",
render: (text) => render: (text) =>
new Intl.NumberFormat("id-ID", { new Intl.NumberFormat("id-ID", {
style: "currency", style: "currency",
currency: "IDR", currency: "IDR",
}).format(text), }).format(text),
}, },
{ {
title: "Transaction Date", title: "Transaction Date",
@ -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 = [ const routeData = [
{ {
route: LINKS.HOME, route: LINKS.HOME,
@ -135,7 +204,7 @@ export const DetailUser = observer(() => {
}, },
{ {
route: LINKS.USER_DETAIL.replace(":id", id), route: LINKS.USER_DETAIL.replace(":id", id),
name: <span style={{fontWeight: "bold"}}>Detail User</span>, name: <span style={{ fontWeight: "bold" }}>Detail User</span>,
}, },
]; ];
@ -179,71 +248,263 @@ export const DetailUser = observer(() => {
<Col span={12}> <Col span={12}>
<Text> <Text>
{store.membership.dataDetail.isActive === true {store.membership.dataDetail.isActive === true
? "Aktif" ? "Aktif"
: "Inaktif"} : "Inaktif"}
</Text> </Text>
</Col> </Col>
</Row> </Row>
</Col> </Col>
<Col lg={12} xs={24}> <Col lg={12} xs={24}>
{store.authentication.userData.role === "Admin" && <Title strong level={3}>Action User Detail</Title>} {store.authentication.userData.role === "Admin" && (
{store.authentication.userData.role === "Admin" && <Space <Title strong level={3}>
Action User Detail
</Title>
)}
{store.authentication.userData.role === "Admin" && (
<Space
size="middle" size="middle"
align={"center"} align={"center"}
wrap={true} 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)}
> >
{store.membership.dataDetail.isActive === true ? "Inactive" : "Active"} <Button
</Button> type={
<Button store.membership.dataDetail.isActive === true
? "danger"
: "primary"
}
onClick={() =>
changeStatus(
store.membership.dataDetail.id,
store.membership.dataDetail.isActive
)
}
>
{store.membership.dataDetail.isActive === true
? "Inactive"
: "Active"}
</Button>
<Button
onClick={() => { onClick={() => {
setInitialData({ setInitialData({
id: store.membership.dataDetail.id, id: store.membership.dataDetail.id,
name: store.membership.dataDetail.userDetail.name, name: store.membership.dataDetail.userDetail.name,
username: store.membership.dataDetail.username, 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, roleId: store.membership.dataDetail.roles.id,
isChangePassword: false, isChangePassword: false,
}); });
setVisibleModal(true); setVisibleModal(true);
}} }}
> >
Edit Edit
</Button> </Button>
<Button <Button
onClick={() => { onClick={() => {
setInitialData({ setInitialData({
id: store.membership.dataDetail.id, id: store.membership.dataDetail.id,
name: store.membership.dataDetail.userDetail.name, name: store.membership.dataDetail.userDetail.name,
username: store.membership.dataDetail.username, 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, roleId: store.membership.dataDetail.roles.id,
isChangePassword: true, isChangePassword: true,
}); });
setVisibleModal(true); setVisibleModal(true);
}} }}
> >
Ganti Password Ganti Password
</Button> </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> </Col>
</Row> </Row>
<Row> <Row>
<Col span={24}> <Col span={24}>
<div> <Tabs defaultActiveKey="1">
<Title strong level={3}> <TabPane tab="History Top Up" key="1">
History Top Up {/* {store.ui.mediaQuery.isDesktop && ( */}
</Title> <Table
<Table key="1"
hasEmpty
columns={columns} columns={columns}
dataSource={store.transaction.dataHistoryTopUp} dataSource={store.transaction.dataHistoryTopUp}
bordered bordered
/> pagination={{
</div> 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> </Col>
</Row> </Row>
<div /> <div />

View File

@ -94,20 +94,14 @@ export const Membership = observer(() => {
}; };
const handleRemoveFilter = async () => { const handleRemoveFilter = async () => {
store.membership.filterMembership = null;
store.membership.filterPartner = null;
setFilterMembership([]); setFilterMembership([]);
setFilterPartner([]); setFilterPartner([]);
//store.product.filterCategory = null; store.membership.visibleModalFilterMembership = false;
//setFilterSubCategories([]);
await store.membership.getData(); await store.membership.getData();
store.membership.visibleModalFiltermembership = false;
}; };
const handleCancelFilter = () => { const handleCancelFilter = () => {
setFilterMembership([]); setFilterMembership([]);
setFilterPartner([]); setFilterPartner([]);
//store.product.filterCategory = null;
//setFilterSubCategories([]);
store.membership.visibleModalFilterMembership = false; store.membership.visibleModalFilterMembership = false;
}; };
@ -116,8 +110,9 @@ export const Membership = observer(() => {
store.membership.filterPartner = filterPartner; store.membership.filterPartner = filterPartner;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.membership.getData(); await store.membership.getData();
//await store.product.getData();
modalLoader.setLoading(false); modalLoader.setLoading(false);
setFilterMembership([]);
setFilterPartner([]);
store.membership.visibleModalFilterMembership = false; store.membership.visibleModalFilterMembership = false;
}; };
@ -225,6 +220,8 @@ export const Membership = observer(() => {
<Button <Button
onClick={async () => { onClick={async () => {
await store.transaction.getDataHistoryTopUp(record.id); 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)); history.push(LINKS.USER_DETAIL.replace(":id", record.id));
console.log(record.id); console.log(record.id);
}} }}
@ -513,6 +510,11 @@ export const Membership = observer(() => {
visible={store.membership.visibleModalFilterMembership} visible={store.membership.visibleModalFilterMembership}
title={"Filter"} title={"Filter"}
footer={footerLayoutFilter} footer={footerLayoutFilter}
onCancel={() => {
setFilterMembership([]);
setFilterPartner([]);
store.membership.visibleModalFilterMembership = false;
}}
> >
<Row> <Row>
<Col span={24}> <Col span={24}>

View File

@ -16,6 +16,7 @@ import {
Select, Select,
Typography, Typography,
DatePicker, DatePicker,
Form,
} from "antd"; } from "antd";
import { useStore } from "../../utils/useStore"; import { useStore } from "../../utils/useStore";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react-lite";
@ -38,15 +39,17 @@ const { RangePicker } = DatePicker;
export const Payback = observer(() => { export const Payback = observer(() => {
const { Option } = Select; const { Option } = Select;
const { Title } = Typography; const { Title } = Typography;
const [form] = Form.useForm();
const store = useStore(); const store = useStore();
const modalLoader = useContext(ModalLoaderContext); const modalLoader = useContext(ModalLoaderContext);
const [filterSupplier, setFilterSupplier] = useState([]); const [filterMembership, setFilterMembership] = useState([]);
const [filterSubCategories, setFilterSubCategories] = useState([]); const [filterSubCategories, setFilterSubCategories] = useState([]);
useEffect(() => { useEffect(() => {
const init = async () => { const init = async () => {
try { try {
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.membership.getData();
await store.payback.getDataConfirmation(); await store.payback.getDataConfirmation();
modalLoader.setLoading(false); modalLoader.setLoading(false);
} catch (e) { } catch (e) {
@ -209,29 +212,36 @@ export const Payback = observer(() => {
}; };
const handleRemoveFilter = async () => { const handleRemoveFilter = async () => {
store.product.filterSupplier = null; store.payback.filterMembership = null;
store.product.filterSubCategory = null; store.payback.filterStart = null;
setFilterSupplier([]); store.payback.filterEnd = null;
store.product.filterCategory = null; setFilterMembership([]);
setFilterSubCategories([]); form.resetFields();
await store.product.getData(); await store.payback.getDataConfirmation();
store.product.visibleModalFilterProduct = false; store.payback.visibleModalFilterPayback = false;
}; };
const handleCancelFilter = () => { const handleCancelFilter = () => {
setFilterSupplier([]); setFilterMembership([]);
store.product.filterCategory = null; form.resetFields();
setFilterSubCategories([]); store.payback.filterMembership = null;
store.payback.filterStart = null;
store.payback.filterEnd = null;
store.payback.visibleModalFilterPayback = false; store.payback.visibleModalFilterPayback = false;
}; };
const handleSubmitFilter = async () => { const handleSubmitFilter = async () => {
store.product.filterSupplier = filterSupplier; const data = form.getFieldsValue();
store.product.filterSubCategory = filterSubCategories; //console.log(data);
store.transaction.filterMembership = filterMembership;
store.transaction.filterStart = data.start_date;
store.transaction.filterEnd = data.end_date;
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.product.getData(); await store.payback.getDataConfirmation();
modalLoader.setLoading(false); modalLoader.setLoading(false);
store.product.visibleModalFilterProduct = false; form.resetFields();
setFilterMembership([]);
store.payback.visibleModalFilterPayback = false;
}; };
const handleFilterCategory = async (value) => { const handleFilterCategory = async (value) => {
@ -462,34 +472,56 @@ export const Payback = observer(() => {
visible={store.payback.visibleModalFilterPayback} visible={store.payback.visibleModalFilterPayback}
title={"Filter"} title={"Filter"}
footer={footerLayoutFilter} footer={footerLayoutFilter}
onCancel={() => {
form.resetFields();
setFilterMembership([]);
store.payback.visibleModalFilterPayback = false;
}}
> >
<Row> <Row>
<Col span={24}> <Col span={24}>
<Title level={5} type={"secondary"} strong> <Title level={5} type={"secondary"} strong>
From From
</Title> </Title>
<Select <Form layout="vertical" name="filter" form={form}>
mode={"multiple"} <Select
placeholder="Pilih Anggota" mode={"multiple"}
onChange={(val) => { placeholder="Pilih Anggota"
setFilterSupplier(val); onChange={(val) => {
}} setFilterMembership(val);
style={{ marginBottom: "20px", width: "100%" }} }}
value={filterSupplier} style={{ marginBottom: "20px", width: "100%" }}
> value={filterMembership}
{store.payback.dataConfirmation.map((item) => ( >
<Option value={item.id} key={item.id}> {store.membership.data.map((item) => (
{item.userData_name} <Option value={item.id} key={item.id}>
</Option> {item.name}
))} </Option>
</Select> ))}
</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>
<Col span={24}> {/* <Col span={24}> */}
<Title level={5} type={"secondary"} strong>
{/* <Title level={5} type={"secondary"} strong>
Date Date
</Title> </Title>
<RangePicker style={{ marginBottom: "20px", width: "100%" }} /> <RangePicker style={{ marginBottom: "20px", width: "100%" }} /> */}
{/* <Select {/* <Select
mode={"multiple"} mode={"multiple"}
placeholder="Choose Category" placeholder="Choose Category"
onChange={async (val) => handleFilterCategory(val)} onChange={async (val) => handleFilterCategory(val)}
@ -502,7 +534,7 @@ export const Payback = observer(() => {
</Option> </Option>
))} ))}
</Select> */} </Select> */}
</Col> {/* </Col> */}
{/* <Col span={24}> {/* <Col span={24}>
<Title level={5} type={"secondary"} strong> <Title level={5} type={"secondary"} strong>
Filter Sub-Categories Filter Sub-Categories

View File

@ -9,6 +9,7 @@ import {
DatePicker, DatePicker,
Modal, Modal,
Form, Form,
Input,
} from "antd"; } from "antd";
import moment from "moment"; import moment from "moment";
import { BreadcumbComponent } from "../../component/BreadcumbComponent"; import { BreadcumbComponent } from "../../component/BreadcumbComponent";
@ -53,14 +54,16 @@ export const Profile = observer(() => {
const handleRemoveFilter = async () => { const handleRemoveFilter = async () => {
store.transaction.filterStart = null; store.transaction.filterStart = null;
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
form.resetFields();
setFilterStart([]); setFilterStart([]);
setFilterEnd([]); setFilterEnd([]);
await store.transaction.getDataHistoryTransaction(); await store.transaction.getDataHistoryTransaction();
store.product.visibleModalFilterProduct = false; store.transaction.visibleModalFilterTransaction = false;
}; };
const handleCancelFilter = () => { const handleCancelFilter = () => {
store.transaction.filterStart = null; store.transaction.filterStart = null;
form.resetFields();
store.transaction.filterEnd = null; store.transaction.filterEnd = null;
store.transaction.visibleModalFilterTransaction = false; store.transaction.visibleModalFilterTransaction = false;
}; };
@ -72,6 +75,7 @@ export const Profile = observer(() => {
modalLoader.setLoading(true); modalLoader.setLoading(true);
await store.transaction.getDataHistoryTransaction(); await store.transaction.getDataHistoryTransaction();
modalLoader.setLoading(false); modalLoader.setLoading(false);
form.resetFields();
store.transaction.visibleModalFilterTransaction = false; store.transaction.visibleModalFilterTransaction = false;
}; };
@ -296,6 +300,10 @@ export const Profile = observer(() => {
visible={store.transaction.visibleModalFilterTransaction} visible={store.transaction.visibleModalFilterTransaction}
title={"Filter"} title={"Filter"}
footer={footerLayoutFilter} footer={footerLayoutFilter}
onCancel={() => {
form.resetFields();
store.transaction.visibleModalFilterTransaction = false;
}}
> >
<Row> <Row>
<Col span={24}> <Col span={24}>

View File

@ -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}`); 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.data = response.body.data.map((item, idx) => { this.data = response.body.data.map((item, idx) => {
item.key = idx; item.key = idx;
item.name = item?.user_detail?.name; item.name = item?.user_detail?.name;
@ -53,6 +53,7 @@ export class Membership {
async getDataBySuperior() { async getDataBySuperior() {
try { try {
const response = await http.get(`/users/find-by-supperior?page=${this.page}&pageSize=${this.pageSize}`); 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) => { this.data = response.body.data.map((item, idx) => {
item.key = idx; item.key = idx;
item.name = item?.user_detail?.name; item.name = item?.user_detail?.name;

View File

@ -17,6 +17,9 @@ export class Payback {
//filter //filter
visibleModalFilterPayback = false; visibleModalFilterPayback = false;
filterMembership=null;
filterStart=null;
filterEnd=null;
constructor(ctx) { constructor(ctx) {
this.ctx = ctx; this.ctx = ctx;
makeAutoObservable(this); makeAutoObservable(this);

View File

@ -98,7 +98,7 @@ export class Product {
async getProductPartner(id) { async getProductPartner(id) {
try { 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) console.log(response)
this.dataProductPartner = response.body.data this.dataProductPartner = response.body.data
} catch (e) { } catch (e) {

View File

@ -30,7 +30,11 @@ export class Transaction {
pageSizeHistoryTopUp = 10; pageSizeHistoryTopUp = 10;
dataHistoryTopUp = []; dataHistoryTopUp = [];
total_dataHistoryTopUp = 0; total_dataHistoryTopUp = 0;
dataTransaction=[] dataTransaction = [];
dataTransactionB2B = [];
dataTransactionPartner = [];
dataDetailHistoryTransaction = [];
total_dataDetailHistoryTransaction=0;
//filter //filter
visibleModalFilterTransaction = false; visibleModalFilterTransaction = false;
@ -55,12 +59,29 @@ export class Transaction {
async getDataTransaction() { async getDataTransaction() {
try { try {
const response = await http.get( const response = await http.get(`/transaction/total-order`);
`/transaction/total-order`
);
//console.log(response) //console.log(response)
this.dataTransaction = response.body.data ?? []; this.dataTransaction = response.body.data;
this.total_data = response?.body?.count ?? 0; } 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) { } catch (e) {
console.error(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) { async getDataHistoryTopUp(id) {
try { try {
const response = await http.get( const response = await http.get(
`/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}` `/transaction/history-deposit?page=${this.pageHistoryTopUp}&pageSize=${this.pageSizeHistoryTopUp}&user-destination=${id}`
); );
console.log(response,'get data history')
this.dataHistoryTopUp = response.body.data ?? []; this.dataHistoryTopUp = response.body.data ?? [];
this.total_dataHistoryTopUp = response?.body?.count ?? 0; this.total_dataHistoryTopUp = response?.body?.count ?? 0;
} catch (e) { } catch (e) {