From 0765b6027db0c970a843e3332b21ca600be187e9 Mon Sep 17 00:00:00 2001 From: rarsyansyahr Date: Thu, 16 Dec 2021 16:52:42 +0700 Subject: [PATCH] feat: add Top Up Distribute Admin --- src/component/PartnerComponent.js | 17 +++++++-- src/pages/Membership/Membership.js | 55 ++++++++++++++++-------------- src/store/transaction.js | 10 ++++++ 3 files changed, 54 insertions(+), 28 deletions(-) diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js index f80a61b..51db6dc 100644 --- a/src/component/PartnerComponent.js +++ b/src/component/PartnerComponent.js @@ -114,7 +114,10 @@ export const PartnerComponent = observer((props) => { key: "action", render: (text, record) => ( - @@ -166,10 +169,18 @@ export const PartnerComponent = observer((props) => { setConfirmLoading(true); try { await store.partner.update(idData, data); - message.success(isChangePassword ? "Failed Change Partner Password" : "Success Update Data Partner"); + message.success( + isChangePassword + ? "Failed Change Partner Password" + : "Success Update Data Partner" + ); //await store.partner.getData() } catch (e) { - message.error(isChangePassword ? "Failed Change Partner Password" : "Failed Update Data Partner"); + message.error( + isChangePassword + ? "Failed Change Partner Password" + : "Failed Update Data Partner" + ); } setConfirmLoading(false); store.partner.visibleModalPartner = false; diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index abd6d91..8bcf4e6 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -33,6 +33,8 @@ export const Membership = observer(() => { const [form] = Form.useForm(); const store = useStore(); const [visibleModal, setVisibleModal] = useState(false); + const [isVisibleTopUpModal, setIsVisibleTopUpModal] = useState(false); + const [destination, setDestination] = useState(null); const [initialData, setInitialData] = useState({}); const [confirmLoading, setConfirmLoading] = useState(false); const [isLoading, setIsLoading] = useState(false); @@ -43,6 +45,7 @@ export const Membership = observer(() => { setIsLoading(true); await getData(); store.role.getData(); + await store.supplier.getData(); setIsLoading(false); } catch (e) { setIsLoading(false); @@ -53,10 +56,10 @@ export const Membership = observer(() => { }, []); const getData = () => { - (store.authentication.userData.role === "Admin") - ? store.membership.getData() - : store.membership.getDataBySuperior(); - } + store.authentication.userData.role === "Admin" + ? store.membership.getData() + : store.membership.getDataBySuperior(); + }; const changeStatus = async (id, isActive) => { const status = isActive ? "inactive" : "active"; @@ -76,13 +79,16 @@ export const Membership = observer(() => { } }; const handleCancelTransaction = () => { - store.supplier.visibleModalTransaction = false; + setIsVisibleTopUpModal(false); + setDestination(null); }; const handleSubmitTransaction = async (data) => { - console.log(data, "isi data2"); setConfirmLoading(true); try { - await store.supplier.createTransaction(data); + let input = data; + data.destination = destination; + + await store.transaction.distributeAdmin(data); message.success("Success Top Up"); //await store.supplier.getData() } catch (e) { @@ -90,8 +96,9 @@ export const Membership = observer(() => { message.error("Failed Top Up"); } setConfirmLoading(false); - store.supplier.visibleModalTransaction = false; + setIsVisibleTopUpModal(false); form.resetFields(); + setDestination(null); }; const columns = [ @@ -128,9 +135,20 @@ export const Membership = observer(() => { key: "action", render: (text, record) => ( - + + */} { - - - {store.ui.mediaQuery.isDesktop && ( {