Merge branches 'develop' and 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop

src/store/category.js

@@ -9,11 +9,6 @@ export class Category {
     filterCategory = null;
     visibleModalCategory = false;
 
-    pageCategories = 0;
-    pageSizeCategories = 10
-    dataCategories = [];
-    total_dataCategories = 0;
-
     pageSubCategories = 0;
     pageSizeSubCategories = 10
     dataSubCategories = [];

src/store/product.js

@@ -6,8 +6,12 @@ export class Product {
     pageSize = 10
     data = [];
     total_data = 0;
+    filterSupplier = null;
     filterCategory = null;
+    filterSubCategory = null;
     visibleModalProduct = false;
+    visibleModalFilterProduct = false;
+    uploadBtnProduct = false;
 
     pageCategories = 0;
     pageSizeCategories = 10
@@ -25,8 +29,7 @@ export class Product {
     }
 
     async getData() {
-        const response = await http.get(`/product/by-categories?categories=${this.filterCategory}&page=${this.page}&pageSize=${this.pageSize}`);
-
+        const response = await http.get(`/product/all?supplier=${this.filterSupplier}&categories=${this.filterCategory}&categories=${this.filterSubCategory}&page=${this.page}&pageSize=${this.pageSize}`);
         this.data = response.body.data.map((item, idx) => {
             item.key = idx;
             return item
@@ -46,7 +49,6 @@ export class Product {
 
     async getDataCategories() {
         const response = await http.get(`/product/categories?page=${this.pageCategories}&pageSize=${this.pageSizeCategories}`);
-
         this.dataCategories = response.body.data ?? []
         this.total_dataCategories = response.body.total_data ?? 0