From b1d35e2df66f689e0a8e02ab419a5f9be384e797 Mon Sep 17 00:00:00 2001 From: caturbgs Date: Wed, 22 Dec 2021 21:21:17 +0700 Subject: [PATCH 1/5] fix: amount in profile --- src/pages/Payback/PaybackModal.js | 1 - src/pages/Profile/Profile.js | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/Payback/PaybackModal.js b/src/pages/Payback/PaybackModal.js index 34683ec..63bdc77 100644 --- a/src/pages/Payback/PaybackModal.js +++ b/src/pages/Payback/PaybackModal.js @@ -45,7 +45,6 @@ export const PaybackModal = ({initialData}) => { }; const handleChange = (info) => { - console.log(info, "apa isi onchange") if (info.file.status === 'uploading') { setLoading(true); } else { diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index f6ec408..1e40082 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -122,7 +122,13 @@ export const Profile = observer(() => { Saldo - {store.authentication.profileData?.wallet} + { + new Intl.NumberFormat("id-ID", { + style: "currency", + currency: "IDR" + }) + .format(store.authentication.profileData?.wallet || 0)} + From 8f6620e7aa5d235d2e39f0a69976da48bbd05463 Mon Sep 17 00:00:00 2001 From: caturbgs Date: Wed, 22 Dec 2021 21:40:07 +0700 Subject: [PATCH 2/5] fix: change wording menu payback --- src/pages/App/DesktopLayout.js | 18 +++++++++--------- src/pages/App/MenuList.js | 8 ++++---- src/pages/Payback/Payback.js | 1 - .../{PaybackFromUser.js => PaybackCreated.js} | 5 ++--- src/pages/Payback/PaybackModal.js | 4 ++-- src/routes/app.js | 8 ++++---- 6 files changed, 21 insertions(+), 23 deletions(-) rename src/pages/Payback/{PaybackFromUser.js => PaybackCreated.js} (98%) diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js index 0769e58..8e1edd0 100644 --- a/src/pages/App/DesktopLayout.js +++ b/src/pages/App/DesktopLayout.js @@ -206,24 +206,24 @@ export const DesktopLayout = observer(() => { )} } - title="Payback" + key="payback-main" + icon={} + title="Created" > {store.authentication.userData.role !== "Retail" && ( - - Payback To + + Confirmation )} {store.authentication.userData.role !== "Admin" && ( - - - Payback - + + + Created + )} diff --git a/src/pages/App/MenuList.js b/src/pages/App/MenuList.js index 5ece71d..6bd6c96 100644 --- a/src/pages/App/MenuList.js +++ b/src/pages/App/MenuList.js @@ -131,16 +131,16 @@ export const MenuList = observer((props) => { {store.authentication.userData.role !== "Retail" && ( - - Payback To + + Confirmation )} {store.authentication.userData.role !== "Admin" && ( - + - Payback + Created )} diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index 3423829..c1ff5b4 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -33,7 +33,6 @@ export const Payback = observer(() => { init(); }, []); - const columns = [ { title: "Picture", diff --git a/src/pages/Payback/PaybackFromUser.js b/src/pages/Payback/PaybackCreated.js similarity index 98% rename from src/pages/Payback/PaybackFromUser.js rename to src/pages/Payback/PaybackCreated.js index 3cca08e..d990149 100644 --- a/src/pages/Payback/PaybackFromUser.js +++ b/src/pages/Payback/PaybackCreated.js @@ -10,7 +10,7 @@ import {ModalLoaderContext} from "../../utils/modal"; const {Search} = Input; -export const PaybackFromUser = observer(() => { +export const PaybackCreated = observer(() => { const store = useStore(); const [initialData, setInitialData] = useState({}); const modalLoader = useContext(ModalLoaderContext); @@ -37,7 +37,6 @@ export const PaybackFromUser = observer(() => { init(); }, []); - const columns = [ { title: "Picture", @@ -70,7 +69,7 @@ export const PaybackFromUser = observer(() => { name: "Home", }, { - route: LINKS.PAYBACK_FROM_USER, + route: LINKS.PAYBACK_CREATED, name: Payback User, }, ]; diff --git a/src/pages/Payback/PaybackModal.js b/src/pages/Payback/PaybackModal.js index 63bdc77..39ae6b9 100644 --- a/src/pages/Payback/PaybackModal.js +++ b/src/pages/Payback/PaybackModal.js @@ -68,7 +68,7 @@ export const PaybackModal = ({initialData}) => { image_prove: responseFilename } await store.payback.create(request); - message.success("Success Add Payback"); + message.success("Success Add Created"); } catch (e) { if (e.response?.body?.message) { message.error(e.response.body.message); @@ -97,7 +97,7 @@ export const PaybackModal = ({initialData}) => { return ( { - - + + From 3bce86ea5fabe2c22a6428196da79a48ac9db900 Mon Sep 17 00:00:00 2001 From: caturbgs Date: Wed, 22 Dec 2021 22:06:37 +0700 Subject: [PATCH 3/5] fix: payback menu swap API --- src/pages/Payback/Payback.js | 104 ++++++++++++++-------------- src/pages/Payback/PaybackCreated.js | 44 ++++++------ src/store/payback.js | 38 +++++----- 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index c1ff5b4..96768ba 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -17,9 +17,9 @@ export const Payback = observer(() => { useEffect(() => { const init = async () => { try { - modalLoader.setLoading(true); - await store.payback.getData(); - modalLoader.setLoading(false); + modalLoader.setLoading(true); + await store.payback.getDataConfirmation(); + modalLoader.setLoading(false); } catch (e) { modalLoader.setLoading(false); if (e.response?.body?.message) { @@ -82,17 +82,17 @@ export const Payback = observer(() => { await handleAction(record, "reject"); }} icon={} - style={{ - backgroundColor: "#ff1c1c", - color: "#fff", - borderColor: "#ff1c1c", - }} - > - Reject - - - ), - }, + style={{ + backgroundColor: "#ff1c1c", + color: "#fff", + borderColor: "#ff1c1c", + }} + > + Reject + + + ), + }, ]; if (store.authentication.userData.role === "Retail") columns.pop(); @@ -162,23 +162,23 @@ export const Payback = observer(() => { key="1" hasEmpty columns={columns} - dataSource={store.payback.data} + dataSource={store.payback.dataConfirmation} bordered - // pagination={{ - // pageSize: store.payback.page, - // total: store.payback.total_data, - // current: store.payback.pageSize + 1, - // showSizeChanger: true, - // simple: false - // }} - // onChange={async (page) => { - // let pageNumber = page.current; - // store.payback.pageSize = page.pageSize; - // store.payback.page = pageNumber - 1; - // modalLoader.setLoading(true); - // await store.payback.getData(); - // modalLoader.setLoading(false); - // }} + pagination={{ + pageSize: store.payback.pageSizeConfirmation, + total: store.payback.totalDataConfirmation, + current: store.payback.pageSizeConfirmation + 1, + showSizeChanger: true, + simple: false + }} + onChange={async (page) => { + let pageNumber = page.current; + store.payback.pageSizeConfirmation = page.pageSize; + store.payback.pageConfirmation = pageNumber - 1; + modalLoader.setLoading(true); + await store.payback.getDataConfirmation(); + modalLoader.setLoading(false); + }} /> )} @@ -186,30 +186,30 @@ export const Payback = observer(() => { { - // store.payback.pageSize = page.pageSize; - // store.payback.page = page.current; - // modalLoader.setLoading(true); - // await store.payback.getData(); - // modalLoader.setLoading(false); - // }, - // pageSize: store.payback.pageSize, - // total: store.payback.total_data, - // current: store.payback.page, - // style: {marginBottom: "1rem", marginRight: "1rem"}, - // }} - dataSource={store.payback.data} + pagination={{ + onChange: async (page) => { + store.payback.pageSizeConfirmation = page.pageSize; + store.payback.pageConfirmation = page.current - 1; + modalLoader.setLoading(true); + await store.payback.getDataConfirmation(); + modalLoader.setLoading(false); + }, + pageSize: store.payback.pageSizeConfirmation, + total: store.payback.totalDataConfirmation, + current: store.payback.pageConfirmation + 1, + style: {marginBottom: "1rem", marginRight: "1rem"}, + }} + dataSource={store.payback.dataConfirmation} style={{padding: 0}} renderItem={(item) => { - return ( -
- + { try { modalLoader.setLoading(true); await Promise.allSettled([ - store.payback.getDataUser(), - store.authentication.getProfile() + store.payback.getDataCreated(), + store.authentication.getProfile(), ]); modalLoader.setLoading(false); } catch (e) { @@ -43,12 +44,11 @@ export const PaybackCreated = observer(() => { dataIndex: "image_prove", key: "image_prove", render: (text, record) => ( - avatar + {record.id} ), }, { @@ -112,21 +112,21 @@ export const PaybackCreated = observer(() => { key="1" hasEmpty columns={columns} - dataSource={store.payback.dataPaybackUser} + dataSource={store.payback.dataCreated} bordered pagination={{ - pageSize: store.payback.pageSizePaybackUser, - total: store.payback.total_dataPaybackUser, - current: store.payback.pageSizePaybackUser + 1, + pageSize: store.payback.pageSizeCreated, + total: store.payback.totalDataCreated, + current: store.payback.pageCreated + 1, showSizeChanger: true, simple: false }} onChange={async (page) => { let pageNumber = page.current; - store.payback.pageSizePaybackUser = page.pageSize; - store.payback.pageSizePaybackUser = pageNumber - 1; + store.payback.pageSizeCreated = page.pageSize; + store.payback.pageCreated = pageNumber - 1; modalLoader.setLoading(true); - //await store.payback.getDataUser(); + await store.payback.getDataCreated(); modalLoader.setLoading(false); }} /> @@ -138,18 +138,18 @@ export const PaybackCreated = observer(() => { position={"top"} pagination={{ onChange: async (page) => { - store.payback.pageSizePaybackUser = page.pageSize; - store.payback.pageSizePaybackUser = page.current; + store.payback.pageSizeCreated = page.pageSize; + store.payback.pageCreated = page.current - 1; modalLoader.setLoading(true); - await store.payback.getDataUser(); + await store.payback.getDataCreated(); modalLoader.setLoading(false); }, - pageSize: store.payback.pageSizePaybackUser, - total: store.payback.total_dataPaybackUser, - current: store.payback.pageSizePaybackUser, + pageSize: store.payback.pageSizeCreated, + total: store.payback.totalDataCreated, + current: store.payback.pageCreated + 1, style: {marginBottom: "1rem", marginRight: "1rem"}, }} - dataSource={store.payback.dataPaybackUser} + dataSource={store.payback.dataCreated} style={{padding: 0}} renderItem={(item) => { return ( diff --git a/src/store/payback.js b/src/store/payback.js index 366f530..104c406 100644 --- a/src/store/payback.js +++ b/src/store/payback.js @@ -2,50 +2,50 @@ import {makeAutoObservable} from "mobx"; import {http} from "../utils/http"; export class Payback { - page = 0; - pageSize = 10; - data = []; - total_data = 0; + pageCreated = 0; + pageSizeCreated = 10; + dataCreated = []; + totalDataCreated = 0; filterCategory = null; visibleModalPayback = false; - pagePaybackUser = 0; - pageSizePaybackUser = 10; - dataPaybackUser = []; - total_dataPaybackUser = 0; + pageConfirmation = 0; + pageSizeConfirmation = 10; + dataConfirmation = []; + totalDataConfirmation = 0; constructor(ctx) { this.ctx = ctx; makeAutoObservable(this); } - async getData() { + async getDataCreated() { try { const response = await http.get( - `/transaction/deposit-return?page=${this.page}&pageSize=${this.pageSize}` + `/transaction/deposit-return?page=${this.pageCreated}&pageSize=${this.pageSizeCreated}` ); - this.data = response.body.data.map((item, idx) => { + this.dataCreated = response.body.data.map((item, idx) => { item.key = idx; return item; }) ?? []; - this.total_data = response.body.count ?? 0; + this.totalDataCreated = response.body.count ?? 0; } catch (e) { console.error(e); } } - async getDataUser() { + async getDataConfirmation() { try { const response = await http.get( - `/transaction/deposit-return/confirmation?page=${this.pagePaybackUser}&pageSize=${this.pageSizePaybackUser}` + `/transaction/deposit-return/confirmation?page=${this.pageConfirmation}&pageSize=${this.pageSizeConfirmation}` ); - this.dataPaybackUser = response.body.data.map((item, idx) => { + this.dataConfirmation = response.body.data.map((item, idx) => { item.key = idx; return item; }) ?? []; - this.total_dataPaybackUser = response.body.count ?? 0; + this.totalDataConfirmation = response.body.count ?? 0; } catch (e) { console.error(e); } @@ -54,7 +54,7 @@ export class Payback { async update(id, data) { try { const response = await http.put(`/config/commission/${id}`).send(data); - await this.getData(); + await this.getDataCreated(); return response; } catch (e) { console.error(e); @@ -64,7 +64,7 @@ export class Payback { async delete(id) { try { const response = await http.del(`/product/${id}`); - await this.getData(); + await this.getDataCreated(); return response; } catch (e) { console.error(e); @@ -74,7 +74,7 @@ export class Payback { async create(data) { try { const response = await http.post("/transaction/deposit-return").send(data); - await this.getData(); + await this.getDataCreated(); return response; } catch (e) { console.error(e); From 1e92eee5b5679ba0bfb37fe2097dbfb593f9d77b Mon Sep 17 00:00:00 2001 From: caturbgs Date: Wed, 22 Dec 2021 22:15:04 +0700 Subject: [PATCH 4/5] fix: pagination on all page --- src/component/PartnerComponent.js | 34 +++++++++----------------- src/component/ProductComponent.js | 6 ++--- src/component/SubcategoryComponent.js | 6 ++--- src/component/SupplierComponent.js | 35 +++++++++------------------ src/pages/Membership/Membership.js | 22 ++++++++--------- src/pages/Profile/Profile.js | 21 +++++++++++++--- src/store/transaction.js | 4 +-- 7 files changed, 60 insertions(+), 68 deletions(-) diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js index 7a3afd0..cc2e6b6 100644 --- a/src/component/PartnerComponent.js +++ b/src/component/PartnerComponent.js @@ -1,23 +1,11 @@ -import React, { useContext, useEffect, useState } from "react"; -import { - Button, - Form, - Input, - message, - Modal, - Select, - Space, - Table, - Tag, - List, - Divider, -} from "antd"; -import { observer } from "mobx-react-lite"; -import { ExclamationCircleOutlined } from "@ant-design/icons"; -import { useHistory } from "react-router-dom"; -import { useStore } from "../utils/useStore"; -import { LINKS } from "../routes/app"; -import { ModalLoaderContext } from "../utils/modal"; +import React, {useContext, useState} from "react"; +import {Button, Divider, Form, Input, List, message, Modal, Space, Table, Tag,} from "antd"; +import {observer} from "mobx-react-lite"; +import {ExclamationCircleOutlined} from "@ant-design/icons"; +import {useHistory} from "react-router-dom"; +import {useStore} from "../utils/useStore"; +import {LINKS} from "../routes/app"; +import {ModalLoaderContext} from "../utils/modal"; export const PartnerComponent = observer((props) => { const store = useStore(); @@ -223,15 +211,15 @@ export const PartnerComponent = observer((props) => { pagination={{ onChange: async (page) => { store.partner.pageSize = page.pageSize; - store.partner.page = page.current; + store.partner.page = page.current - 1; modalLoader.setLoading(true); await store.partner.getData(); modalLoader.setLoading(false); }, pageSize: store.partner.pageSize, total: store.partner.total_data, - current: store.partner.page, - style: { marginBottom: "1rem", marginRight: "1rem" }, + current: store.partner.page + 1, + style: {marginBottom: "1rem", marginRight: "1rem"}, }} dataSource={store.partner.data} style={{ padding: 0 }} diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js index 47aadb3..990b7d8 100644 --- a/src/component/ProductComponent.js +++ b/src/component/ProductComponent.js @@ -281,15 +281,15 @@ export const ProductComponent = observer((props) => { pagination={{ onChange: async (page) => { store.product.pageSize = page.pageSize; - store.product.page = page.current; + store.product.page = page.current - 1; modalLoader.setLoading(true); await store.product.getData(); modalLoader.setLoading(false); }, pageSize: store.product.pageSize, total: store.product.total_data, - current: store.product.page, - style: { marginBottom: "1rem", marginRight: "1rem" }, + current: store.product.page + 1, + style: {marginBottom: "1rem", marginRight: "1rem"}, }} dataSource={store.product.data} style={{ padding: 0 }} diff --git a/src/component/SubcategoryComponent.js b/src/component/SubcategoryComponent.js index 0b01a76..db1a7e5 100644 --- a/src/component/SubcategoryComponent.js +++ b/src/component/SubcategoryComponent.js @@ -125,15 +125,15 @@ export const SubcategoryComponent = observer((props) => { pagination={{ onChange: async (page) => { store.subcategory.pageSize = page.pageSize; - store.subcategory.page = page.current; + store.subcategory.page = page.current - 1; modalLoader.setLoading(true); await store.subcategory.getData(); modalLoader.setLoading(false); }, pageSize: store.subcategory.pageSize, total: store.subcategory.total_data, - current: store.subcategory.page, - style: { marginBottom: "1rem", marginRight: "1rem" }, + current: store.subcategory.page + 1, + style: {marginBottom: "1rem", marginRight: "1rem"}, }} dataSource={store.subcategory.data} style={{ padding: 0 }} diff --git a/src/component/SupplierComponent.js b/src/component/SupplierComponent.js index af6b6e4..7efd50e 100644 --- a/src/component/SupplierComponent.js +++ b/src/component/SupplierComponent.js @@ -1,23 +1,12 @@ -import React, { useContext, useState } from "react"; -import { - Button, - Form, - Input, - message, - Modal, - Space, - Table, - Tag, - List, - Divider, -} from "antd"; -import { observer } from "mobx-react-lite"; -import { ExclamationCircleOutlined } from "@ant-design/icons"; -import { useHistory } from "react-router-dom"; -import { useStore } from "../utils/useStore"; -import { LINKS } from "../routes/app"; -import { TopupsaldoModal } from "./TopupsaldoModal"; -import { ModalLoaderContext } from "../utils/modal"; +import React, {useContext, useState} from "react"; +import {Button, Divider, Form, Input, List, message, Modal, Space, Table, Tag,} from "antd"; +import {observer} from "mobx-react-lite"; +import {ExclamationCircleOutlined} from "@ant-design/icons"; +import {useHistory} from "react-router-dom"; +import {useStore} from "../utils/useStore"; +import {LINKS} from "../routes/app"; +import {TopupsaldoModal} from "./TopupsaldoModal"; +import {ModalLoaderContext} from "../utils/modal"; export const SupplierComponent = observer((props) => { const store = useStore(); @@ -231,15 +220,15 @@ export const SupplierComponent = observer((props) => { pagination={{ onChange: async (page) => { store.supplier.pageSize = page.pageSize; - store.supplier.page = page.current; + store.supplier.page = page.current - 1; modalLoader.setLoading(true); await store.supplier.getData(); modalLoader.setLoading(false); }, pageSize: store.supplier.pageSize, total: store.supplier.total_data, - current: store.supplier.page, - style: { marginBottom: "1rem", marginRight: "1rem" }, + current: store.supplier.page + 1, + style: {marginBottom: "1rem", marginRight: "1rem"}, }} dataSource={store.supplier.data} style={{ padding: 0 }} diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index b7fd1e5..28a278b 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -338,17 +338,17 @@ export const Membership = observer(() => { itemLayout="horizontal" position={"top"} pagination={{ - onChange: async (page) => { - store.membership.pageSize = page.pageSize; - store.membership.page = page.current; - modalLoader.setLoading(true); - await getData(); - modalLoader.setLoading(false); - }, - pageSize: store.membership.pageSize, - total: store.membership.total_data, - current: store.membership.page, - style: { marginBottom: "1rem", marginRight: "1rem" }, + onChange: async (page) => { + store.membership.pageSize = page.pageSize; + store.membership.page = page.current - 1; + modalLoader.setLoading(true); + await getData(); + modalLoader.setLoading(false); + }, + pageSize: store.membership.pageSize, + total: store.membership.total_data, + current: store.membership.page + 1, + style: {marginBottom: "1rem", marginRight: "1rem"}, }} dataSource={store.membership.data} style={{ padding: 0 }} diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 1e40082..450afb1 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -145,9 +145,24 @@ export const Profile = observer(() => { Filter { + let pageNumber = page.current; + store.transaction.pageSizeHistoryTransaction = page.pageSize; + store.transaction.pageHistoryTransaction = pageNumber - 1; + modalLoader.setLoading(true); + await store.transaction.getDataHistoryTransaction(); + modalLoader.setLoading(false); + }} /> diff --git a/src/store/transaction.js b/src/store/transaction.js index cad1219..307f4bd 100644 --- a/src/store/transaction.js +++ b/src/store/transaction.js @@ -23,7 +23,7 @@ export class Transaction { pageHistoryTransaction = 0; pageHistoryTopUp = 0; - // pageSizeHistoryTransaction = 10 + pageSizeHistoryTransaction = 10 dataHistoryTransaction = []; total_dataHistoryTransaction = 0; @@ -71,7 +71,7 @@ export class Transaction { async getDataHistoryTransaction() { try { - const response = await http.get(`/transaction/history?page=${this.pageHistoryTransaction}`); + const response = await http.get(`/transaction/history?page=${this.pageHistoryTransaction}&pageSize=${this.pageSizeHistoryTransaction}`); this.dataHistoryTransaction = response.body.data ?? [] this.total_dataHistoryTransaction = response?.body?.count ?? 0 From 7b07d1a1d87c16e72e3bb64d5646a1bfc97e355a Mon Sep 17 00:00:00 2001 From: caturbgs Date: Wed, 22 Dec 2021 22:48:34 +0700 Subject: [PATCH 5/5] fix: add API payback confirmation --- src/pages/Payback/Payback.js | 175 +++++++++++++++------------- src/pages/Payback/PaybackCreated.js | 2 +- src/store/payback.js | 13 +++ 3 files changed, 109 insertions(+), 81 deletions(-) diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index 96768ba..2b77216 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -1,44 +1,45 @@ import React, {useContext, useEffect} from "react"; -import {Button, Card, Col, Divider, Image, Input, List, message, Row, Space, Table,} from "antd"; +import {Button, Card, Col, Divider, Image, Input, List, message, Modal, Row, Space, Table,} from "antd"; import {useStore} from "../../utils/useStore"; import {observer} from "mobx-react-lite"; -import {CheckCircleOutlined, CloseOutlined, FilterOutlined,} from "@ant-design/icons"; +import {CheckCircleOutlined, CheckOutlined, CloseOutlined, FilterOutlined, StopOutlined,} from "@ant-design/icons"; import {BreadcumbComponent} from "../../component/BreadcumbComponent"; import {LINKS} from "../../routes/app"; import {ModalLoaderContext} from "../../utils/modal"; import {appConfig} from "../../config/app"; +import {capitalize} from "lodash"; const {Search} = Input; export const Payback = observer(() => { - const store = useStore(); - const modalLoader = useContext(ModalLoaderContext); + const store = useStore(); + const modalLoader = useContext(ModalLoaderContext); - useEffect(() => { - const init = async () => { - try { - modalLoader.setLoading(true); - await store.payback.getDataConfirmation(); - modalLoader.setLoading(false); - } catch (e) { - modalLoader.setLoading(false); - if (e.response?.body?.message) { - message.error(e.response.body.message); - return; - } - message.error(e.message); - } - }; + useEffect(() => { + const init = async () => { + try { + modalLoader.setLoading(true); + await store.payback.getDataConfirmation(); + modalLoader.setLoading(false); + } catch (e) { + modalLoader.setLoading(false); + if (e.response?.body?.message) { + message.error(e.response.body.message); + return; + } + message.error(e.message); + } + }; - init(); - }, []); + init(); + }, []); - const columns = [ - { - title: "Picture", - dataIndex: "image_prove", - key: "image_prove", - render: (text, record) => ( + const columns = [ + { + title: "Picture", + dataIndex: "image_prove", + key: "image_prove", + render: (text, record) => ( { - - - - + + +
+ +
+ + + + - {/* {store.authentication.userData.role !== "Admin" && ( - - )} */} {store.ui.mediaQuery.isDesktop && ( diff --git a/src/pages/Payback/PaybackCreated.js b/src/pages/Payback/PaybackCreated.js index 7a0984e..70dd3e6 100644 --- a/src/pages/Payback/PaybackCreated.js +++ b/src/pages/Payback/PaybackCreated.js @@ -70,7 +70,7 @@ export const PaybackCreated = observer(() => { }, { route: LINKS.PAYBACK_CREATED, - name: Payback User, + name: Payback Created, }, ]; diff --git a/src/store/payback.js b/src/store/payback.js index 104c406..592c673 100644 --- a/src/store/payback.js +++ b/src/store/payback.js @@ -80,4 +80,17 @@ export class Payback { console.error(e); } } + + async confirmPayback(id, data) { + try { + const response = await http.put(`/transaction/deposit-return/confirmation/${id}`).send(data); + await Promise.all([ + this.getDataConfirmation(), + this.getDataCreated() + ]) + return response; + } catch (e) { + console.error(e); + } + } }