diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js index 6172ca9..cf007ab 100644 --- a/src/pages/App/DesktopLayout.js +++ b/src/pages/App/DesktopLayout.js @@ -12,6 +12,8 @@ import { FileSyncOutlined, FileProtectOutlined, ShoppingCartOutlined, + AlipayOutlined, + PayCircleOutlined } from "@ant-design/icons"; import { AppRoute, LINKS } from "../../routes/app"; import { useStore } from "../../utils/useStore"; @@ -202,12 +204,24 @@ export const DesktopLayout = observer(() => { )} - - - - Payback - - + } + title="Payback" + > + + + + Payback To + + + + + + Payback + + + {store.authentication.userData.role !== "Admin" && ( diff --git a/src/pages/App/MenuList.js b/src/pages/App/MenuList.js index a099c3b..56137bb 100644 --- a/src/pages/App/MenuList.js +++ b/src/pages/App/MenuList.js @@ -14,6 +14,8 @@ import { ProjectOutlined, ShoppingCartOutlined, UserOutlined, + AlipayOutlined, + PayCircleOutlined } from "@ant-design/icons"; import { observer } from "mobx-react-lite"; import { useStore } from "../../utils/useStore"; @@ -127,14 +129,14 @@ export const MenuList = observer((props) => { } title="Payback"> - - Payback + + Payback To - - Payback User + + Payback diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index ecc7eb9..f98f51f 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -47,7 +47,7 @@ export const Membership = observer(() => { await getData(); await store.role.getData(isAdmin); - if (isAdmin) await store.supplier.getData(); + await store.supplier.getData(); setIsLoading(false); } catch (e) { setIsLoading(false); diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index 34f9b4c..7f8296b 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -162,7 +162,7 @@ export const Payback = observer(() => { marginBottom: store.ui.mediaQuery.isMobile ? 10 : 0, }} /> - {store.authentication.userData.role !== "Admin" && ( + {/* {store.authentication.userData.role !== "Admin" && ( - )} + )} */} {store.ui.mediaQuery.isDesktop && ( @@ -260,7 +260,7 @@ export const Payback = observer(() => { - { setInitialData({}); setVisibleModal(false); }} - /> + /> */} ); }); diff --git a/src/pages/Payback/PaybackFromUser.js b/src/pages/Payback/PaybackFromUser.js index 94077a1..8d518da 100644 --- a/src/pages/Payback/PaybackFromUser.js +++ b/src/pages/Payback/PaybackFromUser.js @@ -52,18 +52,13 @@ export const PaybackFromUser = observer(() => { const columns = [ - // { - // title: "Name", - // dataIndex: "name", - // key: "name", - // }, { title: "Picture", dataIndex: "image_prove", key: "image_prove", render: (text, record) => ( avatar { dataIndex: "amount", key: "amount", }, + { + title: "Action", + dataIndex: "amount", + key: "action", + render: (text, record) => ( + + + + + ), + }, // { // title: "Action", // key: "action", @@ -181,21 +211,21 @@ export const PaybackFromUser = observer(() => { columns={columns} dataSource={store.payback.data} bordered - // pagination={{ - // pageSize: store.membership.pageSize, - // total: store.membership.total_data, - // 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; - // // store.membership.isLoading = true; - // await store.membership.getData(); - // // store.membership.isLoading = false; - // }} + pagination={{ + pageSize: store.payback.pageSize, + total: store.payback.total_data, + current: store.payback.page + 1, + showSizeChanger: true, + simple: false + }} + onChange={async (page) => { + let pageNumber = page.current; + store.payback.pageSize = page.pageSize; + store.payback.page = pageNumber - 1; + // store.membership.isLoading = true; + await store.payback.getData(); + // store.membership.isLoading = false; + }} /> )} @@ -236,7 +266,7 @@ export const PaybackFromUser = observer(() => { title={item.name} description={
- +
} /> diff --git a/src/pages/Payback/PaybackModal.js b/src/pages/Payback/PaybackModal.js index dc87207..a559aeb 100644 --- a/src/pages/Payback/PaybackModal.js +++ b/src/pages/Payback/PaybackModal.js @@ -22,6 +22,7 @@ export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => { const [fileUrl, setFileUrl] = useState(""); const firstIndexFileList = fileList[0]; const [isLoading, setIsLoading] = useState(false); + useEffect(() => { const init = async () => { @@ -93,13 +94,14 @@ export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => { console.log(data, "isi data2"); try { await store.payback.create(data); - message.success("Success Add New Member"); + message.success("Success Add Payback"); + await store.payback.getData(); } catch (e) { console.log(e, "apa errornya"); message.error("Failed Add Member"); } - - store.payback.visibleModalPayback = false; + + //store.payback.visibleModalPayback = false; form.resetFields(); }; @@ -143,7 +145,6 @@ export const PaybackModal = ({ visible, onCreate, onCancel, initialData }) => {
{ beforeUpload={beforeUpload} onPreview={handlePreview} onChange={handleChange} - defaultValue={"tes"} > {!firstIndexFileList ? uploadButton : null} diff --git a/src/store/payback.js b/src/store/payback.js index 1c36900..a0c580a 100644 --- a/src/store/payback.js +++ b/src/store/payback.js @@ -9,15 +9,15 @@ export class Payback { filterCategory = null; visibleModalPayback = false; - pageCategories = 0; - pageSizeCategories = 10; - dataCategories = []; - total_dataCategories = 0; + pagePayback = 0; + pageSizePayback = 10; + dataPayback = []; + total_dataPayback = 0; - pageSubCategories = 0; - pageSizeSubCategories = 10; - dataSubCategories = []; - total_dataSubCategories = 0; + pageSubPayback = 0; + pageSizeSubPayback = 10; + dataSubPayback = []; + total_dataPayback = 0; constructor(ctx) { this.ctx = ctx; @@ -29,14 +29,14 @@ export class Payback { const response = await http.get( `/transaction/deposit-return?page=${this.page}&pageSize=${this.pageSize}` ); - //console.log(response) + console.log(response) this.data = - response.body[0].map((item, idx) => { + response.body.data.map((item, idx) => { item.key = idx; return item; }) ?? []; - this.total_data = response.body.total_data ?? 0; + this.total_data = response.body.count ?? 0; } catch (e) { console.error(e); } @@ -49,12 +49,12 @@ export class Payback { ); console.log(response); this.data = - response.body[0].map((item, idx) => { + response.body.data.map((item, idx) => { item.key = idx; return item; }) ?? []; - this.total_data = response.body.total_data ?? 0; + this.total_data = response.body.count ?? 0; } catch (e) { console.error(e); }