fix

Ciframa · Nov 2, 2024 · f16d1cf · f16d1cf
1 parent 8884cee
commit f16d1cf
Show file tree

Hide file tree

Showing 6 changed files with 520 additions and 125 deletions.
diff --git a/Fitmo_backend/app/Http/Controllers/CategoryController.php b/Fitmo_backend/app/Http/Controllers/CategoryController.php
@@ -140,14 +140,17 @@ public function getMaxId()
 
     public function updateCategories(Request $categories)
     {
+        $alphabet = range('A', 'Z');
         foreach ($categories[0] as $category) {
             $categoryFromDb = Category::find($category["id"]);
             if (!$categoryFromDb) {
+                $parentCategory = Category::find($category["id_parent"]);
                 $categoryFromDb = new Category();
                 $categoryFromDb["id"] = $category["id"];
                 $categoryFromDb["id_parent"] = $category["id_parent"];
                 $categoryFromDb["name"] = $category["name"];
                 $categoryFromDb["childIndex"] = $category["index"];
+                $categoryFromDb["path"] = isset($parentCategory["path"]) ? $parentCategory["path"] . $alphabet[$category["index"]] : $alphabet[$category["index"]];
                 if (isset($category["image"]) && $category["image"]) {
                     $path = 'categories/';
                     if ($categoryFromDb["image_path"]) {
@@ -168,9 +171,11 @@ public function updateCategories(Request $categories)
                     $img->writeImage($path . "/" . $category['image']["image_path"]);
                 }
             } else {
+                $parentCategory = Category::find($category["id_parent"]);
                 $categoryFromDb["id_parent"] = $category["id_parent"];
                 $categoryFromDb["name"] = $category["name"];
                 $categoryFromDb["childIndex"] = $category["index"];
+                $categoryFromDb["path"] = isset($parentCategory["path"]) ? $parentCategory["path"] . $alphabet[$category["index"]] : $alphabet[$category["index"]];
 
                 if (isset($category["image"]) && $category["image"]) {
                     $path = 'categories/';

diff --git a/Fitmo_backend/app/Http/Controllers/ProductController.php b/Fitmo_backend/app/Http/Controllers/ProductController.php
@@ -323,7 +323,6 @@ public function getProductById($id)
     public function getCategoryProducts($categoryName, Request $request)
     {
         $categoryName = join("/", explode(",", $categoryName));
-        $products = [];
         $categories = Category::where(
             'path',
             'LIKE',
@@ -376,7 +375,7 @@ public function getCategoryProducts($categoryName, Request $request)
             ->where('products.isActive', 1)
             ->whereIn('category_id', $categoriesToSearch)
             ->whereNotNull('categories.id_parent')
-            ->paginate(6, ['*'], 'page', $request->page ?? 1);
+            ->paginate(15, ['*'], 'page', $request->page ?? 1);
 
 
         $products = $this->formatProducts($paginatedProducts, true);

diff --git a/Fitmo_frontend/src/main.js b/Fitmo_frontend/src/main.js
@@ -17,6 +17,7 @@ import "@vueup/vue-quill/dist/vue-quill.core.css";
 
 import {
   faAngleDown,
+  faAngleLeft,
   faBars,
   faCheck,
   faFile,
@@ -37,6 +38,7 @@ library.add(faXmark);
 library.add(faStar);
 library.add(faCheck);
 library.add(faAngleDown);
+library.add(faAngleLeft);
 library.add(faStar);
 library.add(faSignOut);
 library.add(faSpinner);