From 3bc95a78297cf8ba3a062b1a134a49e0815396a2 Mon Sep 17 00:00:00 2001
From: mahdi purHosseini <mahdip9811@gmail.com>
Date: Sun, 12 Nov 2023 12:31:47 +0330
Subject: [PATCH] fix some problems in pdf

---
 app/Http/Controllers/ItemController.php         | 4 +++-
 app/Http/Controllers/PackageController.php      | 8 ++++++--
 app/Http/Controllers/TransferItemController.php | 7 +++++--
 app/Http/Requests/StoreItemRequest.php          | 4 ++--
 app/Http/Requests/StoreLabelRequest.php         | 4 ++--
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index e7c3e5a4..cdc92486 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -52,6 +52,7 @@ class ItemController extends Controller
                     $query->select( 'id' , 'name' );
                 }
                 ] )
+            ->orderByDesc( 'id' )
             ->paginate( 10 );
         return \MessageResponse::data( $Items );
     }
@@ -141,7 +142,7 @@ class ItemController extends Controller
 
     public function destroy( Item $Item )
     {
-        if ( ! auth( 'api' )->user()->can( 'delete' , Item::class ) ) {
+        if ( ! auth( 'api' )->user()->can( 'delete' , $Item ) ) {
             return \MessageResponse::error( trans( 'messages.access_denied' ) );
         }
         if ( count( $Item->packages ) ) {
@@ -179,6 +180,7 @@ class ItemController extends Controller
                     } ] );
                 }
             ] )
+            ->orderByDesc( 'id' )
             ->get();
         return \MessageResponse::data( $Items );
     }
diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php
index 5f7caa25..93db7753 100644
--- a/app/Http/Controllers/PackageController.php
+++ b/app/Http/Controllers/PackageController.php
@@ -39,7 +39,9 @@ class PackageController extends Controller
             } ,
                 'user.medical_center' => function ( $query ) {
                     $query->select( 'id' , 'name' );
-                } ] )->orderByDesc( 'id' )->paginate( 10 );
+                } ] )
+            ->orderByDesc( 'id' )
+            ->paginate( 10 );
 
         return \MessageResponse::data( $Packages );
     }
@@ -169,7 +171,9 @@ class PackageController extends Controller
             } ,
                 'user.medical_center' => function ( $query ) {
                     $query->select( 'id' , 'name' );
-                } ] )->get();
+                } ] )
+            ->orderByDesc( 'id' )
+            ->get();
 
         return \MessageResponse::data( $Packages );
 
diff --git a/app/Http/Controllers/TransferItemController.php b/app/Http/Controllers/TransferItemController.php
index 25227506..fbd76bff 100644
--- a/app/Http/Controllers/TransferItemController.php
+++ b/app/Http/Controllers/TransferItemController.php
@@ -99,7 +99,9 @@ class TransferItemController extends Controller
                         $query->select( 'id' , 'name' , 'medical_center_id' );
                     } ] );
                 }
-            ] )->get();
+            ] )
+            ->orderByDesc( 'id' )
+            ->paginate( 10 );
         return \MessageResponse::data( $data );
     }
 
@@ -133,7 +135,8 @@ class TransferItemController extends Controller
                     } ] );
                 }
             ] )
-            ->get();
+            ->orderByDesc( 'id' )
+            ->paginate( 10 );
         return \MessageResponse::data( $data );
     }
 }
diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php
index 70039e73..0d5ac368 100644
--- a/app/Http/Requests/StoreItemRequest.php
+++ b/app/Http/Requests/StoreItemRequest.php
@@ -22,7 +22,7 @@ class StoreItemRequest extends FormRequest
         switch ($this->method()) {
             case 'POST': {
                 return [
-                    'name' => 'required|max:100|unique:items',
+                    'name' => 'required|max:100',
                     'unique_id' => 'nullable|max:100|unique:items',
                     'size' => 'required',
                     'specific' => 'required',
@@ -35,7 +35,7 @@ class StoreItemRequest extends FormRequest
             case 'PATCH': {
                 $Item =  $this->route('Item');
                 return [
-                    'name' => 'required|max:100|unique:items,name,'.$Item->id,
+                    'name' => 'required|max:100',
                     'unique_id' => 'nullable|max:100|unique:items,unique_id,'.$Item->id,
                     'size' => 'required',
                     'specific' => 'required',
diff --git a/app/Http/Requests/StoreLabelRequest.php b/app/Http/Requests/StoreLabelRequest.php
index 248808bd..40e6174f 100644
--- a/app/Http/Requests/StoreLabelRequest.php
+++ b/app/Http/Requests/StoreLabelRequest.php
@@ -25,8 +25,8 @@ class StoreLabelRequest extends FormRequest
         switch ($this->method()) {
             case 'POST': {
                 return [
-                    'sterile_date' => 'required',
-                    'expire_date' => 'required',
+                    'sterile_date' => 'required|date',
+                    'expire_date' => 'required|date',
                     'sterilizer_id' => 'required',
                     'cycle_number' => 'required',
                     'lot_number' => 'required',