PPOB/ppob-frontend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'devops-staging'

Browse Source 
feat: revisi fixing filter admin partner and add column biaya admin

See merge request empatnusabangsa/ppob/ppob-frontend!169
This commit is contained in:
Rahman Efendi 2022-05-11 13:35:20 +00:00
commit 507e10f979
2 changed files with 331 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/component/ProductComponent.js
View File

@ -145,7 +145,6 @@ export const ProductComponent = observer((props) => {
if (store.authentication.userData.role !== "Admin") delete columns[8]; if (store.authentication.userData.role !== "Admin") delete columns[8];
if (store.authentication.userData.role !== "Admin") delete columns[6]; if (store.authentication.userData.role !== "Admin") delete columns[6];
if (store.authentication.userData.role !== "Admin") delete columns[2]; if (store.authentication.userData.role !== "Admin") delete columns[2];
if (store.authentication.userData.role !== "Admin") delete columns[5];
if (store.authentication.userData.role === "Admin Partner") delete columns[7]; if (store.authentication.userData.role === "Admin Partner") delete columns[7];
//if (store.authentication.userData.role !== "Admin") delete columns[8]; //if (store.authentication.userData.role !== "Admin") delete columns[8];
//if (store.authentication.userData.role === "Admin Partner") delete columns[5]; //if (store.authentication.userData.role === "Admin Partner") delete columns[5];
@ -317,7 +316,7 @@ export const ProductComponent = observer((props) => {
modalLoader.setLoading(true); modalLoader.setLoading(true);
store.authentication.userData.role === "Admin Partner" store.authentication.userData.role === "Admin Partner"
? await store.product.getProductPartner( ? await store.product.getProductPartner(
// store.authentication.profileData.id filterSubCategories
) )
: await store.product.getData(); : await store.product.getData();
modalLoader.setLoading(false); modalLoader.setLoading(false);
@ -335,7 +334,7 @@ export const ProductComponent = observer((props) => {
modalLoader.setLoading(true); modalLoader.setLoading(true);
store.authentication.userData.role === "Admin Partner" store.authentication.userData.role === "Admin Partner"
? await store.product.getProductPartner( ? await store.product.getProductPartner(
// store.authentication.profileData.id filterSubCategories
) )
: await store.product.getData(); : await store.product.getData();
//await store.product.getData(); //await store.product.getData();

2
src/store/product.js
View File

@ -101,7 +101,7 @@ export class Product {
} }
async getProductPartner(id) { async getProductPartner(id) {
console.log({ id });
if (id === undefined) { if (id === undefined) {
try { try {
const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=`); const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=`);