diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js index a5f6f93..f2daca7 100644 --- a/src/component/ProductComponent.js +++ b/src/component/ProductComponent.js @@ -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 = [ - + - + - } + > + Ganti Password + + + + )} -
- - History Top Up - - + + {/* {store.ui.mediaQuery.isDesktop && ( */} +
- + 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.isDesktop && ( +
{ + 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 && ( + { + 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 ( +
+ + +

+ Saldo System : {item.name}{" "} +
+ Role : {item.roleName}
+ + Saldo Supplier : {item.coa?.amount} + {" "} +
+ {/* + */} +

+
+ } + /> +
+

+ {/* */} +

+
+ + + + ); + }} + /> + )} + {/*
*/} + +
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index 161bba5..48da62c 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -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(() => {
diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index 7a3e6a8..0269547 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -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,34 +472,56 @@ export const Payback = observer(() => { visible={store.payback.visibleModalFilterPayback} title={"Filter"} footer={footerLayoutFilter} + onCancel={() => { + form.resetFields(); + setFilterMembership([]); + store.payback.visibleModalFilterPayback = false; + }} > From - + + + + + + + + + - - + {/* <Col span={24}> */} + + {/* <Title level={5} type={"secondary"} strong> Date - - {/* handleFilterCategory(val)} @@ -502,7 +534,7 @@ export const Payback = observer(() => { ))} */} - + {/* */} {/* Filter Sub-Categories diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 724c17d..c390507 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -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}> diff --git a/src/store/membership.js b/src/store/membership.js index a9f78cb..2c86220 100644 --- a/src/store/membership.js +++ b/src/store/membership.js @@ -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; diff --git a/src/store/payback.js b/src/store/payback.js index 3ef65d0..74b0624 100644 --- a/src/store/payback.js +++ b/src/store/payback.js @@ -17,6 +17,9 @@ export class Payback { //filter visibleModalFilterPayback = false; + filterMembership=null; + filterStart=null; + filterEnd=null; constructor(ctx) { this.ctx = ctx; makeAutoObservable(this); diff --git a/src/store/product.js b/src/store/product.js index 8bd3c91..ff0570f 100644 --- a/src/store/product.js +++ b/src/store/product.js @@ -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) { diff --git a/src/store/transaction.js b/src/store/transaction.js index 32be61d..50d8274 100644 --- a/src/store/transaction.js +++ b/src/store/transaction.js @@ -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) {