From 117e34eecd90f95766f4ade157009072cc386ed7 Mon Sep 17 00:00:00 2001
From: mahdi purHosseini <mahdip9811@gmail.com>
Date: Mon, 11 Dec 2023 12:18:05 +0330
Subject: [PATCH] fix export problems

---
 app/Http/Controllers/ExportController.php | 64 ++++++++++++-----------
 config/medialibrary.php                   |  2 +-
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php
index 45c8ff5d..59007539 100644
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@@ -11,23 +11,26 @@ class ExportController extends Controller
 {
     public function items()
     {
-        $user = auth( 'api' )->user();
-        $Items = Item::when( $user->cant( 'showAll' , Item::class ) , function ( $query ) use ( $user ) {
-            if ( $user->hasRole( 'Supervisor' ) or $user->hasRole( 'User' ) ) {
-                $query->whereHas( 'user' , function ( $query ) use ( $user ) {
-                    $query->where( 'medical_center_id' , $user->medical_center_id );
-                } );
+        $Items = Item::with( [ 'user' => function ( $query ) {
+            $query->select( 'id' , 'name' , 'medical_center_id' );
+        } ,
+            'user.medical_center' => function ( $query ) {
+                $query->select( 'id' , 'name' );
             }
-        } )
-            ->with( [ 'user' => function ( $query ) {
-                $query->select( 'id' , 'name' , 'medical_center_id' );
-            } ,
-                'user.medical_center' => function ( $query ) {
-                    $query->select( 'id' , 'name' );
-                }
-            ] )
-            ->orderByDesc( 'id' )
-            ->get();
+        ] );
+
+        $user = auth( 'api' )->user();
+        if ( $user->hasRole( 'User' ) ) {
+            $Items = $Items->whereHas( 'user' , function ( $query ) use ( $user ) {
+                $query->where( 'medical_center_id' , $user->medical_center_id );
+            } )->where( "status" , 1 );
+        } elseif ( $user->hasRole( 'Supervisor' ) ) {
+            $Items = $Items->whereHas( 'user' , function ( $query ) use ( $user ) {
+                $query->where( 'medical_center_id' , $user->medical_center_id );
+            } );
+        }
+
+        $Items = $Items->orderByDesc( 'id' )->get();
 
         $Items = $Items->map( function ( $item , $key ) {
 
@@ -66,22 +69,23 @@ class ExportController extends Controller
 
     public function packages()
     {
-        $user = auth( 'api' )->user();
-        $Packages = Package::when( $user->cant( 'showAll' , Package::class ) , function ( $query ) use ( $user ) {
-            if ( $user->hasRole( 'Supervisor' ) or $user->hasRole( 'User' ) ) {
-                $query->whereHas( 'user' , function ( $query ) use ( $user ) {
-                    $query->where( 'medical_center_id' , $user->medical_center_id );
-                } );
-            }
-        } )
-            ->with( [ 'user' => function ( $query ) {
+        $Packages = Package::with( [
+            'user' => function ( $query ) {
                 $query->select( 'id' , 'name' , 'medical_center_id' );
             } ,
-                'user.medical_center' => function ( $query ) {
-                    $query->select( 'id' , 'name' );
-                } ] )
-            ->orderByDesc( 'id' )
-            ->get();
+            'user.medical_center' => function ( $query ) {
+                $query->select( 'id' , 'name' );
+            } ] );
+
+        $user = auth( 'api' )->user();
+        if ( $user->hasRole( 'User' ) or $user->hasRole( 'Supervisor' ) ) {
+            $Packages = $Packages->whereHas( 'user' , function ( $query ) use ( $user ) {
+                $query->where( 'medical_center_id' , $user->medical_center_id );
+            } );
+        }
+
+        $Packages = $Packages->orderByDesc( 'id' )->get();
+
         $Packages = $Packages->map( function ( $item , $key ) {
 
             $row[] = $item[ "id" ];
diff --git a/config/medialibrary.php b/config/medialibrary.php
index c4a92711..972d95fd 100644
--- a/config/medialibrary.php
+++ b/config/medialibrary.php
@@ -129,7 +129,7 @@ return [
      * The engine that should perform the image conversions.
      * Should be either `gd` or `imagick`.
      */
-    'image_driver' => env('IMAGE_DRIVER', 'gd'),
+    'image_driver' => env('IMAGE_DRIVER', 'imagick'),
 
     /*
      * FFMPEG & FFProbe binaries paths, only used if you try to generate video