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: fixing filter admin partner

See merge request empatnusabangsa/ppob/ppob-frontend!167
This commit is contained in:
Rahman Efendi 2022-05-09 13:54:29 +00:00
commit 2c971c757f
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/component/ProductComponent.js
View File

@ -210,17 +210,16 @@ export const ProductComponent = observer((props) => {
};
const handleRemoveFilter = async () => {
store.product.visibleModalFilterProduct = false;
store.product.filterSupplier = null;
store.product.filterSubCategory = null;
setFilterSupplier([]);
setFilterSubCategories([]);
store.authentication.userData.role === "Admin Partner"
? await store.product.getProductPartner(
store.authentication.profileData.id
)
? await store.product.getProductPartner()
: await store.product.getData();
//await store.product.getData();
store.product.visibleModalFilterProduct = false;
modalLoader.setLoading(false);
};
const handleCancelFilter = async () => {
@ -228,25 +227,23 @@ export const ProductComponent = observer((props) => {
store.product.filterSupplier = null;
store.product.visibleModalFilterProduct = false;
store.authentication.userData.role === "Admin Partner"
? await store.product.getProductPartner(
store.authentication.profileData.id
)
? await store.product.getProductPartner()
: await store.product.getData();
//await store.product.getData();
};
const handleSubmitFilter = async () => {
store.product.visibleModalFilterProduct = false;
store.product.filterSupplier = filterSupplier;
store.product.filterSubCategory = filterSubCategories;
modalLoader.setLoading(true);
store.authentication.userData.role === "Admin Partner"
? await store.product.getProductPartner(
store.authentication.profileData.id
filterSubCategories
)
: await store.product.getData();
//await store.product.getData();
modalLoader.setLoading(false);
store.product.visibleModalFilterProduct = false;
//store.product.page=1
};

27
src/store/product.js
View File

@ -101,14 +101,27 @@ export class Product {
}
async getProductPartner(id) {
try {
const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=${id}`);
console.log(response)
this.dataProductPartner = response.body.data
this.total_data_partner = response?.body?.count ?? 0
} catch (e) {
console.error(e);
if (id === undefined) {
try {
const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=`);
console.log(response)
this.dataProductPartner = response.body.data
this.total_data_partner = response?.body?.count ?? 0
} catch (e) {
console.error(e);
}
} else {
try {
const response = await http.get(`/product/by-categories?page=${this.pageProductPartner}&pageSize=${this.pageSizeProductPartner}&sub-category=${id}`);
console.log(response)
this.dataProductPartner = response.body.data
this.total_data_partner = response?.body?.count ?? 0
} catch (e) {
console.error(e);
}
}
}
async create(data) {