diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 749a86b..f570eca 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -252,6 +252,17 @@ export const DetailUser = observer(() => { }, ]; + const dataRoute = [ + { + route: LINKS.MEMBERSHIP, + name: "Keanggotaan" + }, + { + route: LINKS.USER_DETAIL.replace(":id", id), + name: Detail User, + }, + ]; + const styleSaldoTitle = store.ui.mediaQuery.isDesktop ? { display: "flex", @@ -275,21 +286,22 @@ export const DetailUser = observer(() => { store.authentication.dataProfit.userDetail?.image_identity, "detail" ); - console.log( - store.authentication.listImage, - "detail gambar" - ); + console.log(store.authentication.listImage, "detail gambar"); return (
- + Detail User - - {store.authentication.userData.role === "Admin" && ( - + + {store.authentication.userData.role === "Admin" && ( + { store.membership.dataDetail.userDetail.image_identity ); console.log( - store.membership.dataDetail.userDetail.image_store,"ini store" + store.membership.dataDetail.userDetail.image_store, + "ini store" ); console.log(store.membership.dataDetail.username); setVisibleModal(true); @@ -373,10 +386,10 @@ export const DetailUser = observer(() => { Withdraw Profit - - )} - {store.authentication.userData.role === "Supervisor" && ( - + + )} + {store.authentication.userData.role === "Supervisor" && ( + { Ganti Password - - )} - {store.authentication.userData.role === "Sales" && ( - + + )} + {store.authentication.userData.role === "Sales" && ( + { Ganti Password - - )} - + + )} @@ -641,7 +653,7 @@ export const DetailUser = observer(() => { ? `${appConfig.apiUrl}/config/image/${item}` : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" } - style={{ width: "10vw",marginRight:15 }} + style={{ width: "10vw", marginRight: 15 }} /> ))} @@ -679,7 +691,7 @@ export const DetailUser = observer(() => { ? `${appConfig.apiUrl}/config/image/${item}` : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" } - style={{ width: "10vw",marginRight:15 }} + style={{ width: "10vw", marginRight: 15 }} /> ))} @@ -687,7 +699,7 @@ export const DetailUser = observer(() => { )} - + {store.authentication.userData.role === "Supervisor" && ( diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js index b708b47..f62fca6 100644 --- a/src/pages/Membership/Membership.js +++ b/src/pages/Membership/Membership.js @@ -30,7 +30,6 @@ import { LINKS } from "../../routes/app"; import { useHistory } from "react-router-dom"; import { ModalLoaderContext } from "../../utils/modal"; - export const Membership = observer(() => { const history = useHistory(); const { Option } = Select; @@ -253,12 +252,19 @@ export const Membership = observer(() => { name: Keanggotaan, }, ]; + + const dataRoute = [ + { + route: LINKS.MEMBERSHIP, + name: "Keanggotaan" + }, + ]; const onSubmit = async (data, image, imageStore) => { data.superior = true; - console.log(imageStore, "Apa imageStore") + console.log(imageStore, "Apa imageStore"); - if(!imageStore){ - imageStore = [] + if (!imageStore) { + imageStore = []; } if (initialData.id) { @@ -325,7 +331,11 @@ export const Membership = observer(() => { }; return (
- +
@@ -399,7 +409,7 @@ export const Membership = observer(() => { pagination={{ onChange: async (page, pageSize) => { store.membership.pageSize = pageSize; - store.membership.page = page -1; + store.membership.page = page - 1; modalLoader.setLoading(true); await getData(); modalLoader.setLoading(false); @@ -442,7 +452,7 @@ export const Membership = observer(() => { Role : {item.roles?.name}
Saldo : {item.coa?.amount}
- - -
- {/* + + +
+ + + + + +
+ {/* { }} /> */} - {store.authentication.userData.role == "Admin" &&
- -
} -
- -
-
- -
- - { - form.resetFields(); - handleCancel(); - }} - onOk={() => { - form - .validateFields() - .then((values) => { - console.log(values, "isi form"); - handleSubmit(values); - form.resetFields(); - }) - .catch((info) => { - console.error("Validate Failed:", info); - }); - }} - > -
- - beforeUpload(file)} - customRequest={(args) => uploadHandler(args)} - onRemove={(file) => { - setLoading(false); - setFileList([]); - setExcel(""); - }} - > -
- -
-
-
- } + onClick={() => setVisibleModalUpload(true)} + > + Tambah Produk + +
+ )} +
+ + +
+ +
+ + { + form.resetFields(); + handleCancel(); + }} + onOk={() => { + form + .validateFields() + .then((values) => { + console.log(values, "isi form"); + handleSubmit(values); + form.resetFields(); + }) + .catch((info) => { + console.error("Validate Failed:", info); + }); + }} + > + + + beforeUpload(file)} + customRequest={(args) => uploadHandler(args)} + onRemove={(file) => { + setLoading(false); + setFileList([]); + setExcel(""); + }} > - - - - -
+
+ +
+ + + + + + + + ); }); diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index fdd510a..7c6ce41 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -38,7 +38,7 @@ export const Profile = observer(() => { const routeData = [ { route: LINKS.HOME, - name: "Home", + name: "Beranda", }, { route: LINKS.PROFILE, @@ -46,6 +46,13 @@ export const Profile = observer(() => { }, ]; + const dataRoute = [ + { + route: LINKS.PROFILE, + name: "Profil", + }, + ]; + useEffect(() => { (async () => { modalLoader.setLoading(true); @@ -214,7 +221,14 @@ export const Profile = observer(() => { return (
- + Profile @@ -362,7 +376,7 @@ export const Profile = observer(() => { ? `${appConfig.apiUrl}/config/image/${item}` : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg" } - style={{ width: "10vw",marginRight:15 }} + style={{ width: "10vw", marginRight: 15 }} /> ))} diff --git a/src/pages/Transaction/Transaction.js b/src/pages/Transaction/Transaction.js index 7984069..cb902a5 100644 --- a/src/pages/Transaction/Transaction.js +++ b/src/pages/Transaction/Transaction.js @@ -55,13 +55,9 @@ export const Transaction = observer(() => { }; const routeData = [ - { - route: LINKS.HOME, - name: "Beranda", - }, { route: LINKS.TRANSACTION, - name: Transaksi, + name: "Transaksi" }, ];