diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js index 008fb69..bf2f694 100644 --- a/src/component/ProductComponent.js +++ b/src/component/ProductComponent.js @@ -180,8 +180,8 @@ export const ProductComponent = observer((props) => { const response = await store.product.update(idData, data); response?.body?.statusCode === 201 || response?.body?.statusCode === 200 ? message.success( - response?.body?.message || "Berhasil Ubah Data Produk" - ) + response?.body?.message || "Berhasil Ubah Data Produk" + ) : message.error(response?.body?.message || "Gagal Ubah Data Produk"); } catch (e) { message.error(e.response?.body?.message || "Gagal Ubah Data Produk"); @@ -215,8 +215,8 @@ export const ProductComponent = observer((props) => { setFilterSubCategories([]); store.authentication.userData.role === "Admin Partner" ? await store.product.getProductPartner( - store.authentication.profileData.id - ) + store.authentication.profileData.id + ) : await store.product.getData(); //await store.product.getData(); store.product.visibleModalFilterProduct = false; @@ -228,8 +228,8 @@ export const ProductComponent = observer((props) => { store.product.visibleModalFilterProduct = false; store.authentication.userData.role === "Admin Partner" ? await store.product.getProductPartner( - store.authentication.profileData.id - ) + store.authentication.profileData.id + ) : await store.product.getData(); //await store.product.getData(); }; @@ -240,8 +240,8 @@ export const ProductComponent = observer((props) => { modalLoader.setLoading(true); store.authentication.userData.role === "Admin Partner" ? await store.product.getProductPartner( - store.authentication.profileData.id - ) + store.authentication.profileData.id + ) : await store.product.getData(); //await store.product.getData(); modalLoader.setLoading(false); @@ -297,21 +297,25 @@ export const ProductComponent = observer((props) => { } onRow={handleClickRow} pagination={{ - pageSize: store.product.pageSize, + pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner, total: store.authentication.userData.role === "Admin Partner" ? store.product.total_data_partner : store.product.total_data, - current: store.product.page + 1, + current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1, showSizeChanger: true, simple: false, }} onChange={async (page) => { let pageNumber = page.current; - store.product.pageSize = page.pageSize; - store.product.page = pageNumber - 1; + store.authentication.userData.role === "Admin" ? store.product.pageSize = page.pageSize : store.product.pageSizeProductPartner = page.pageSize; + store.authentication.userData.role === "Admin" ? store.product.page = pageNumber - 1 : store.product.pageProductPartner = pageNumber - 1 modalLoader.setLoading(true); - await store.product.getData(); + store.authentication.userData.role === "Admin Partner" + ? await store.product.getProductPartner( + // store.authentication.profileData.id + ) + : await store.product.getData(); modalLoader.setLoading(false); }} /> @@ -322,23 +326,29 @@ export const ProductComponent = observer((props) => { position={"top"} pagination={{ onChange: async (page, pageSize) => { - store.product.pageSize = pageSize; - store.product.page = page - 1; + store.authentication.userData.role === "Admin" ? store.product.pageSize = pageSize : store.product.pageSizeProductPartner = pageSize; + store.authentication.userData.role === "Admin" ? store.product.page = page - 1 : store.product.pageProductPartner = page - 1 modalLoader.setLoading(true); store.authentication.userData.role === "Admin Partner" ? await store.product.getProductPartner( - store.authentication.profileData.id - ) + // store.authentication.profileData.id + ) : await store.product.getData(); //await store.product.getData(); modalLoader.setLoading(false); }, - pageSize: store.product.pageSize, - total: store.product.total_data, - current: store.product.page + 1, + pageSize: store.authentication.userData.role === "Admin" ? store.product.pageSize : store.product.pageSizeProductPartner, + total: store.authentication.userData.role === "Admin Partner" + ? store.product.total_data_partner + : store.product.total_data, + current: store.authentication.userData.role === "Admin" ? store.product.page + 1 : store.product.pageProductPartner + 1, style: { marginBottom: "1rem", marginRight: "1rem" }, }} - dataSource={store.product.data} + dataSource={ + store.authentication.userData.role === "Admin Partner" + ? store.product.dataProductPartner + : store.product.data + } style={{ padding: 0 }} renderItem={(item) => { return ( diff --git a/src/pages/Product/Product.js b/src/pages/Product/Product.js index 37b888a..6a82286 100644 --- a/src/pages/Product/Product.js +++ b/src/pages/Product/Product.js @@ -183,8 +183,8 @@ export const Product = observer(() => {