diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js index 1bfa117..76daf6a 100644 --- a/src/pages/Membership/DetailUser.js +++ b/src/pages/Membership/DetailUser.js @@ -56,6 +56,7 @@ export const DetailUser = observer(() => { await Promise.allSettled([ store.transaction.getDataHistoryTopUp(id), store.authentication.getProfit(id), + store.authentication.getProfile(), store.transaction.getDetailHistoryTransaction(id), store.membership.getDetail(id), store.role.getData(isAdmin), @@ -254,7 +255,7 @@ export const DetailUser = observer(() => { const dataRoute = [ { route: LINKS.MEMBERSHIP, - name: "Keanggotaan" + name: "Keanggotaan", }, { route: LINKS.USER_DETAIL.replace(":id", id), @@ -645,8 +646,9 @@ export const DetailUser = observer(() => { Foto Toko - {store.authentication.listImage.map((item) => ( + {store.authentication.listImage.map((item, index) => ( { Foto Toko - {store.authentication.listImage.map((item) => ( + {store.authentication.listImage.map((item, index) => ( { if (initialData.id) { data.image_identity = image; - data.image_store = imageStore; + data.image_store = JSON.stringify(imageStore); } if (initialData.id) { @@ -280,7 +280,7 @@ export const Membership = observer(() => { const request = { ...data, image_identity: image, - image_store: imageStore, + image_store: JSON.stringify(imageStore), }; await store.membership.update(initialData.id, request); console.log(data, "edit data"); diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js index 7743fb4..b10e4d3 100644 --- a/src/pages/Membership/MembershipModal.js +++ b/src/pages/Membership/MembershipModal.js @@ -141,7 +141,7 @@ export const MembershipModal = ({ name: res.body.filename, status: "done", url: `${appConfig.apiUrl}/config/image/${res.body.filename}`, - }, + } ]); setLoadingStore(false); @@ -207,7 +207,8 @@ export const MembershipModal = ({ .then((values) => { console.log(values, "apa valuesanya"); values.image_identity = responseFilename; - values.image_store = responseFilenameStore; + const data = values.image_store = JSON.stringify(responseFilenameStore); + console.log(data,'dari modal') onCreate(values, responseFilename, responseFilenameStore); form.resetFields(); setFileStore([]); diff --git a/src/pages/Payback/Payback.js b/src/pages/Payback/Payback.js index 13538c5..618566d 100644 --- a/src/pages/Payback/Payback.js +++ b/src/pages/Payback/Payback.js @@ -185,7 +185,7 @@ export const Payback = observer(() => { const dataRoute = [ { route: LINKS.PAYBACK, - name: "Konfirmasi Pembayaran" + name: "Konfirmasi Pembayaran", }, ]; @@ -201,15 +201,6 @@ export const Payback = observer(() => { : message.success( response?.body?.message || `Success ${capitalize(type)} Payback` ); - // if (response.body.status !== 201 ) { - // message.error( - // response?.body?.message || `Failed ${capitalize(type)} Payback` - // ); - // } else { - // message.success( - // response?.body?.message || `Success ${capitalize(type)} Payback` - // ); - // } } catch (e) { console.error(e, "apa errornya"); message.error( @@ -521,7 +512,7 @@ export const Payback = observer(() => { label="Dari" rules={[{ required: true, message: "Please input Date!" }]} > - + { - {/* */} - - {/* - Date - - */} - {/* */} - {/* */} - {/* - - Filter Sub-Categories - - - */} diff --git a/src/pages/Payback/PaybackCreated.js b/src/pages/Payback/PaybackCreated.js index 9f3bda2..e55ba2e 100644 --- a/src/pages/Payback/PaybackCreated.js +++ b/src/pages/Payback/PaybackCreated.js @@ -90,12 +90,6 @@ export const PaybackCreated = observer(() => { key: "status", width: "10%", render: (text, record) => ( - // - // {PAYBACK_STATUS[text]} - // { const handleSubmitFilter = async () => { const data = form.getFieldsValue(); console.log(data); - //store.payback.filterMembership = filterMembership; - // const awal = format(parseISO(data.start_date), "dd-MM-yyyy") - // const akhir = format(parseISO(data.start_date), "dd-MM-yyyy") - //const awal= format(startOfDay(date.start_date()), 'yyyy-MM-dd 00:00') const awal = (store.payback.filterStart = moment(data.start_date).format( "YYYY-MM-DD 00:00:00" )); @@ -174,8 +164,6 @@ export const PaybackCreated = observer(() => { modalLoader.setLoading(true); await store.payback.getDataCreated(); modalLoader.setLoading(false); - // form.resetFields(); - // setFilterMembership([]); store.payback.visibleModalFilterCreate = false; }; diff --git a/src/pages/Product/ProductDetail.js b/src/pages/Product/ProductDetail.js index 22cb5f9..de8aa00 100644 --- a/src/pages/Product/ProductDetail.js +++ b/src/pages/Product/ProductDetail.js @@ -134,16 +134,6 @@ export const ProductDetail = observer(() => { - {/* - - - Saldo - - - {store.authentication.profileData?.wallet} - - - */} @@ -151,13 +141,6 @@ export const ProductDetail = observer(() => { Product Price History - - {/* */} { )); console.log(awal); console.log(akhir); - // store.transaction.filterStart = data.start_date; - // store.transaction.filterEnd = data.end_date; modalLoader.setLoading(true); await store.transaction.getDataHistoryTransaction(); modalLoader.setLoading(false); @@ -270,83 +268,7 @@ export const Profile = observer(() => { {store.authentication.profileData.superior?.username} - {/* {store.authentication.userData.role === "Retail" && ( - - - Foto Identitas - - - Foto Toko - - - - - - - - - - - - - )} */} {store.authentication.userData.role === "Retail" && ( - // - // - // Foto Identitas - // - // - // - // - // - // - // - // - // Foto Toko - // - // - // {JSON.parse( - // store.authentication.profileData.userDetail - // ?.image_store - // ).map((item) => ( - // - // ))} - // - // - // - // Foto Identitas diff --git a/src/store/authentication.js b/src/store/authentication.js index 3754135..c39bb8f 100644 --- a/src/store/authentication.js +++ b/src/store/authentication.js @@ -57,10 +57,9 @@ export class Authentication { async getProfit(id) { try { const response = await http.get(`/auth/profile/${id}`); - console.log(response) + console.log(response,"Data Gambar Store") this.dataProfit = response.body ?? []; - this.listImage = this.dataProfit.userDetail?.image_store ? JSON.parse(this.dataProfit.userDetail?.image_store) : []; - + this.listImage = this.dataProfit.userDetail?.image_store ? JSON.parse(this.dataProfit.userDetail?.image_store) : []; this.total_data = response?.body?.count ?? 0; } catch (e) { console.error(e); @@ -70,7 +69,7 @@ export class Authentication { async getProfile() { try { const response = await http.get('/auth/profile'); - console.log(response) + console.log(response,"Data Profile") this.profileData = response.body; this.imageProfil = this.profileData.userDetail?.image_store ? JSON.parse(this.profileData.userDetail?.image_store) : [];