From b337610f94177d5a41a69d06694c8ab029e6d5f8 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Thu, 13 Jan 2022 11:24:16 +0700 Subject: [PATCH 1/4] Perbaikan PPOB --- src/pages/Home/Home.js | 328 +---------------------------- src/pages/Membership/DetailUser.js | 3 + 2 files changed, 4 insertions(+), 327 deletions(-) diff --git a/src/pages/Home/Home.js b/src/pages/Home/Home.js index a42cd97..4d41f87 100644 --- a/src/pages/Home/Home.js +++ b/src/pages/Home/Home.js @@ -48,56 +48,7 @@ export const Home = observer(() => { ? await store.membership.getData() : await store.membership.getDataBySuperior(); }; - const columns = [ - { - title: "Name", - dataIndex: "name", - key: "name", - render: (text, record) => record?.name ?? record?.username, - }, - { - title: "Role", - dataIndex: "roleName", - key: "role", - }, - { - title: "Saldo", - dataIndex: ["coa", "amount"], - key: ["coa", "amount"], - width: "20%", - render: (text) => - new Intl.NumberFormat("id-ID", { - style: "currency", - currency: "IDR", - }).format(text), - }, - // { - // title: "Action", - // key: "action", - // render: (text, record) => ( - // - // - // - // - // ), - // }, - ]; + return (
{store.ui.mediaQuery.isDesktop && @@ -328,28 +279,6 @@ export const Home = observer(() => { - {/**/} - {/* */} - {/* Total Keuntungan B2C}>*/} - {/* */} - {/* {new Intl.NumberFormat("id-ID", {*/} - {/* style: "currency",*/} - {/* currency: "IDR",*/} - {/* }).format(store.authentication.profileData?.wallet || 0)}*/} - {/* */} - {/* */} - {/* */} - {/**/} )} {store.ui.mediaQuery.isMobile && @@ -497,28 +426,6 @@ export const Home = observer(() => { - {/**/} - {/* */} - {/* Total Keuntungan B2C}>*/} - {/* */} - {/* {new Intl.NumberFormat("id-ID", {*/} - {/* style: "currency",*/} - {/* currency: "IDR",*/} - {/* }).format(store.authentication.profileData?.wallet || 0)}*/} - {/* */} - {/* */} - {/* */} - {/**/} )} {store.ui.mediaQuery.isMobile && @@ -579,241 +486,8 @@ export const Home = observer(() => { - {/**/} - {/* */} - {/* Total Keuntungan B2C}>*/} - {/* */} - {/* {new Intl.NumberFormat("id-ID", {*/} - {/* style: "currency",*/} - {/* currency: "IDR",*/} - {/* }).format(store.authentication.profileData?.wallet || 0)}*/} - {/* */} - {/* */} - {/* */} - {/**/} )} - {/*{store.authentication.userData.role === "Admin" &&*/} - {/* store.ui.mediaQuery.isDesktop && (*/} - {/* */} - {/* */} - {/* {*/} - {/* let pageNumber = page.current;*/} - {/* store.membership.pageSize = page.pageSize;*/} - {/* store.membership.page = pageNumber - 1;*/} - {/* modalLoader.setLoading(true);*/} - {/* await getData();*/} - {/* modalLoader.setLoading(false);*/} - {/* }}*/} - {/* />*/} - {/* */} - {/* */} - {/* {*/} - {/* let pageNumber = page.current;*/} - {/* store.membership.pageSize = page.pageSize;*/} - {/* store.membership.page = pageNumber - 1;*/} - {/* modalLoader.setLoading(true);*/} - {/* await getData();*/} - {/* modalLoader.setLoading(false);*/} - {/* }}*/} - {/* />*/} - {/* */} - {/* */} - {/* )}*/} - {/*{store.ui.mediaQuery.isMobile && (*/} - {/*
*/} - {/* */} - {/* */} - {/* */} - {/* Total Transaksi}>*/} - {/*

*/} - {/*

{store.transaction.dataTransaction} Transaksi

*/} - {/*

*/} - {/*
*/} - {/*
*/} - {/* */} - {/* */} - {/* */} - {/* */} - {/* Total Keuntungan B2B}>*/} - {/* */} - {/* {new Intl.NumberFormat("id-ID", {*/} - {/* style: "currency",*/} - {/* currency: "IDR",*/} - {/* }).format(store.authentication.profileData?.wallet || 0)}*/} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* */} - {/* Total Keuntungan B2C}>*/} - {/* */} - {/* {new Intl.NumberFormat("id-ID", {*/} - {/* style: "currency",*/} - {/* currency: "IDR",*/} - {/* }).format(store.authentication.profileData?.wallet || 0)}*/} - {/* */} - {/* */} - {/* */} - {/* */} - {/*
*/} - {/*)}*/} - {/*{store.authentication.userData.role === "Admin" &&*/} - {/* store.ui.mediaQuery.isMobile && (*/} - {/* */} - {/* */} - {/* {*/} - {/* let pageNumber = page.current;*/} - {/* store.membership.pageSize = page.pageSize;*/} - {/* store.membership.page = pageNumber - 1;*/} - {/* modalLoader.setLoading(true);*/} - {/* await getData();*/} - {/* modalLoader.setLoading(false);*/} - {/* }}*/} - {/* />*/} - {/* */} - {/* */} - {/* {*/} - {/* let pageNumber = page.current;*/} - {/* store.membership.pageSize = page.pageSize;*/} - {/* store.membership.page = pageNumber - 1;*/} - {/* modalLoader.setLoading(true);*/} - {/* await getData();*/} - {/* modalLoader.setLoading(false);*/} - {/* }}*/} - {/* />*/} - {/* */} - {/* */} - {/* )}*/}
); }); diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index aff0513..9f7cf33 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -337,6 +337,9 @@ export const DetailUser = observer(() => { console.log( store.membership.dataDetail.userDetail.image_identity ); + console.log( + store.membership.dataDetail.userDetail.image_store,"ini store" + ); console.log(store.membership.dataDetail.username); setVisibleModal(true); }} From a346ffd8f1b7e76e6f6477234686678524c0d918 Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Thu, 13 Jan 2022 12:16:22 +0700 Subject: [PATCH 2/4] Perbaikan PPOB --- src/pages/Membership/Membership.js | 2 +- src/pages/Membership/MembershipModal.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index d6fd602..b708b47 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -442,7 +442,7 @@ export const Membership = observer(() => { Role : {item.roles?.name}
Saldo : {item.coa?.amount}
*/} { - let pageNumber = page.current; - store.product.pageSizePriceHistory = page.pageSize; - store.product.pagePriceHistory = pageNumber - 1; - modalLoader.setLoading(true); - await store.product.getPriceHistoryByProduct(id); - modalLoader.setLoading(false); - }} + columns={columns} + dataSource={store.product.dataPriceHistory} + bordered + pagination={{ + pageSize: store.product.pageSizePriceHistory, + total: store.product.totalDataPriceHistory, + current: store.product.pagePriceHistory + 1, + showSizeChanger: true, + simple: false, + }} + onChange={async (page) => { + let pageNumber = page.current; + store.product.pageSizePriceHistory = page.pageSize; + store.product.pagePriceHistory = pageNumber - 1; + modalLoader.setLoading(true); + await store.product.getPriceHistoryByProduct(id); + modalLoader.setLoading(false); + }} /> From 8857911dcdccd2394bd32803352ab7e04e4171ae Mon Sep 17 00:00:00 2001 From: "ajat91.sudrajat" Date: Thu, 13 Jan 2022 14:18:34 +0700 Subject: [PATCH 4/4] Perbaikan Project PPOB --- src/pages/Payback/PaybackCreated.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Payback/PaybackCreated.js b/src/pages/Payback/PaybackCreated.js index 397b7d7..a4ef6cf 100644 --- a/src/pages/Payback/PaybackCreated.js +++ b/src/pages/Payback/PaybackCreated.js @@ -307,7 +307,7 @@ export const PaybackCreated = observer(() => { className={[""].join(" ")} title={item.name} description={ -
+
Amount: {item.amount}