diff --git a/app/Http/Controllers/Dashboard/AdminController.php b/app/Http/Controllers/Dashboard/AdminController.php index 0cd35cea5..8fba9ce88 100644 --- a/app/Http/Controllers/Dashboard/AdminController.php +++ b/app/Http/Controllers/Dashboard/AdminController.php @@ -202,8 +202,8 @@ class AdminController extends Controller $found = AllowedLogin::where([ 'entity_type' => $request->allowedentityType, 'entity_name' => $request->allowedEntityName, - ])->get(); - if($found != null) { + ])->count(); + if($found != 0) { AllowedLogin::where([ 'entity_type' => $request->allowedEntityType, 'entity_name' => $request->allowedEntityName, diff --git a/app/Http/Controllers/Moons/MoonsAdminController.php b/app/Http/Controllers/Moons/MoonsAdminController.php index 358525983..18e2c6f10 100644 --- a/app/Http/Controllers/Moons/MoonsAdminController.php +++ b/app/Http/Controllers/Moons/MoonsAdminController.php @@ -369,9 +369,9 @@ class MoonsAdminController extends Controller 'Planet' => $request->planet, 'Moon' => $request->moon, 'Contact' => $contact, - ])->first(); + ])->count(); - if($found) { + if($found != 0) { MoonRental::where([ 'System' => $request->system, 'Planet' => $request->planet, diff --git a/app/Jobs/ProcessAssetsJob.php b/app/Jobs/ProcessAssetsJob.php index bbec09ef0..46acb7461 100644 --- a/app/Jobs/ProcessAssetsJob.php +++ b/app/Jobs/ProcessAssetsJob.php @@ -101,10 +101,10 @@ class ProcessAssetsJob implements ShouldQueue foreach($assets as $asset) { $found = Asset::where([ 'item_id' => $asset['item_id'], - ])->get(); + ])->count(); //Update the asset if we found it, otherwise add the asset to the database - if(!$found) { + if($found == 0) { if(in_array($asset['location_flag'], $this->location_array)) { $this->StoreNewAsset($asset); } diff --git a/app/Library/Stock/StockHelper.php b/app/Library/Stock/StockHelper.php index c0aa295d0..a0fb8ae68 100644 --- a/app/Library/Stock/StockHelper.php +++ b/app/Library/Stock/StockHelper.php @@ -69,8 +69,8 @@ class StructureStockHelper { foreach($newAssets as $asset) { //See if the asset is in the asset table already. - $found = Asset::where(['item_id' => $asset['item_id']]); - if(!$found) { + $found = Asset::where(['item_id' => $asset['item_id']])->count(); + if($found == 0) { $newItem = new Asset; if(isset($asset['is_blueprint_copy'])) { $newItem->is_blueprint_coopy = $asset['is_blueprint_copy'];