¨4.0.1¨

Modules/Category/Http/Controllers/Admin/CategoryController.php

@@ -2,6 +2,7 @@
 
 namespace Modules\Category\Http\Controllers\Admin;
 
+use Illuminate\Http\Response;
 use Modules\Category\Entities\Category;
 use Modules\Admin\Traits\HasCrudActions;
 use Modules\Category\Http\Requests\SaveCategoryRequest;
@@ -38,27 +39,31 @@ class CategoryController
      */
     protected $validation = SaveCategoryRequest::class;
 
+
     /**
      * Display the specified resource.
      *
      * @param int $id
-     * @return \Illuminate\Http\Response
+     *
+     * @return Response
      */
     public function show($id)
     {
         return Category::with('files')->withoutGlobalScope('active')->find($id);
     }
 
+
     /**
      * Destroy resources by given ids.
      *
-     * @param int $id
-     * @return \Illuminate\Http\Response
+     * @param string $ids
+     *
+     * @return Response
      */
-    public function destroy($id)
+    public function destroy(string $ids)
     {
         Category::withoutGlobalScope('active')
-            ->findOrFail($id)
+            ->findOrFail($ids)
             ->delete();
 
         return back()->withSuccess(trans('admin::messages.resource_deleted', ['resource' => $this->getLabel()]));

Modules/Category/Http/Controllers/Admin/CategoryTreeController.php

@@ -2,6 +2,7 @@
 
 namespace Modules\Category\Http\Controllers\Admin;
 
+use Illuminate\Http\Response;
 use Modules\Category\Entities\Category;
 use Modules\Category\Services\CategoryTreeUpdater;
 use Modules\Category\Http\Responses\CategoryTreeResponse;
@@ -11,7 +12,7 @@ class CategoryTreeController
     /**
      * Display category tree in json.
      *
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
     public function index()
     {
@@ -22,15 +23,16 @@ class CategoryTreeController
         return new CategoryTreeResponse($categories);
     }
 
+
     /**
      * Update category tree in storage.
      *
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
     public function update()
     {
         CategoryTreeUpdater::update(request('category_tree'));
 
-        return trans('category::messages.category_order_saved');
+        return trans('category::messages.category_order_updated');
     }
 }

Modules/Category/Http/Controllers/CategoryController.php

@@ -2,6 +2,7 @@
 
 namespace Modules\Category\Http\Controllers;
 
+use Illuminate\Http\Response;
 use Modules\Category\Entities\Category;
 
 class CategoryController
@@ -9,7 +10,7 @@ class CategoryController
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return Response
      */
     public function index()
     {

Modules/Category/Http/Controllers/CategoryProductController.php

@@ -2,6 +2,7 @@
 
 namespace Modules\Category\Http\Controllers;
 
+use Illuminate\Http\Response;
 use Modules\Product\Entities\Product;
 use Modules\Category\Entities\Category;
 use Modules\Product\Filters\ProductFilter;
@@ -15,9 +16,10 @@ class CategoryProductController
      * Display a listing of the resource.
      *
      * @param string $slug
-     * @param \Modules\Product\Entities\Product $model
-     * @param \Modules\Product\Filters\ProductFilter $productFilter
-     * @return \Illuminate\Http\Response
+     * @param Product $model
+     * @param ProductFilter $productFilter
+     *
+     * @return Response
      */
     public function index($slug, Product $model, ProductFilter $productFilter)
     {

Modules/Category/Http/Requests/SaveCategoryRequest.php

@@ -15,6 +15,7 @@ class SaveCategoryRequest extends Request
      */
     protected $availableAttributes = 'category::attributes';
 
+
     /**
      * Get the validation rules that apply to the request.
      *
@@ -26,10 +27,10 @@ class SaveCategoryRequest extends Request
             'name' => 'required',
             'slug' => $this->getSlugRules(),
             'is_active' => 'required|boolean',
-            'is_active' => 'required|boolean',
         ];
     }
 
+
     private function getSlugRules()
     {
         $rules = $this->route()->getName() === 'admin.categories.update'

Modules/Category/Http/Responses/CategoryTreeResponse.php

@@ -2,6 +2,9 @@
 
 namespace Modules\Category\Http\Responses;
 
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Responsable;
 
 class CategoryTreeResponse implements Responsable
@@ -13,6 +16,7 @@ class CategoryTreeResponse implements Responsable
      */
     private $categories;
 
+
     /**
      * Create a new instance.
      *
@@ -23,21 +27,24 @@ class CategoryTreeResponse implements Responsable
         $this->categories = $categories;
     }
 
+
     /**
      * Create an HTTP response that represents the object.
      *
-     * @param \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     *
+     * @return Response
      */
     public function toResponse($request)
     {
         return response()->json($this->transform());
     }
 
+
     /**
      * Transform the categories.
      *
-     * @return \Illuminate\Support\Collection
+     * @return Collection
      */
     private function transform()
     {