grokability
diff --git a/‎.all-contributorsrc‎
Lines changed: 9 additions & 0 deletions b/‎.all-contributorsrc‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎app/Console/Commands/LdapSync.php‎
Lines changed: 4 additions & 3 deletions b/‎app/Console/Commands/LdapSync.php‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎app/Http/Controllers/Api/AssetsController.php‎
Lines changed: 11 additions & 1 deletion b/‎app/Http/Controllers/Api/AssetsController.php‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎app/Http/Controllers/Assets/BulkAssetsController.php‎
Lines changed: 1 addition & 0 deletions b/‎app/Http/Controllers/Assets/BulkAssetsController.php‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/Http/Controllers/ProfileController.php‎
Lines changed: 6 additions & 2 deletions b/‎app/Http/Controllers/ProfileController.php‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎app/Importer/ItemImporter.php‎
Lines changed: 1 addition & 3 deletions b/‎app/Importer/ItemImporter.php‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎app/Importer/UserImporter.php‎
Lines changed: 1 addition & 1 deletion b/‎app/Importer/UserImporter.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/Models/Asset.php‎
Lines changed: 11 additions & 4 deletions b/‎app/Models/Asset.php‎
Lines changed: 11 additions & 4 deletions
diff --git a/‎app/Models/License.php‎
Lines changed: 4 additions & 0 deletions b/‎app/Models/License.php‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎resources/assets/js/components/importer/importer-file.vue‎
Lines changed: 1 addition & 0 deletions b/‎resources/assets/js/components/importer/importer-file.vue‎
Lines changed: 1 addition & 0 deletions
@@ -2549,6 +2549,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "TenOfTens",
+      "name": "TenOfTens",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48162670?v=4",
+      "profile": "https://github.com/TenOfTens",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
@@ -3,11 +3,11 @@
 namespace App\Console\Commands;
 
 use App\Models\Department;
-use App\Models\Ldap;
-use App\Models\Location;
+use Illuminate\Console\Command;
 use App\Models\Setting;
+use App\Models\Ldap;
 use App\Models\User;
-use Illuminate\Console\Command;
+use App\Models\Location;
 use Log;
 
 class LdapSync extends Command
@@ -189,6 +189,7 @@ public function handle()
                     'name' => $item['department'],
                 ]);
 
+
                 $user = User::where('username', $item['username'])->first();
                 if ($user) {
                     // Updating an existing user.
 
@@ -119,7 +119,7 @@ public function index(Request $request, $audit = null)
                 'model.category', 'model.manufacturer', 'model.fieldset','supplier'); //it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
 
 
-        if($filter_non_deprecable_assets) {
+        if ($filter_non_deprecable_assets) {
             $non_deprecable_models = AssetModel::select('id')->whereNotNull('depreciation_id')->get();
 
             $assets->InModelList($non_deprecable_models->toArray());
@@ -128,6 +128,16 @@ public function index(Request $request, $audit = null)
         // These are used by the API to query against specific ID numbers.
         // They are also used by the individual searches on detail pages like
         // locations, etc.
+
+
+        // Search custom fields by column name
+        foreach ($all_custom_fields as $field) {
+            if ($request->filled($field->db_column_name())) {
+                $assets->where($field->db_column_name(), '=', $request->input($field->db_column_name()));
+            }
+        }
+
+
         if ($request->filled('status_id')) {
             $assets->where('assets.status_id', '=', $request->input('status_id'));
         }
 
@@ -6,6 +6,7 @@
 use App\Helpers\Helper;
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
+use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Setting;
 use Illuminate\Http\Request;
 
@@ -64,10 +64,12 @@ public function postIndex(ImageUploadRequest $request)
             $user->location_id = $request->input('location_id');
         }
 
+
         if ($request->input('avatar_delete') == 1) {
             $user->avatar = null;
         }
 
+
         if ($request->hasFile('avatar')) {
             $path = 'avatars';
 
@@ -101,6 +103,7 @@ public function postIndex(ImageUploadRequest $request)
         return redirect()->back()->withInput()->withErrors($user->getErrors());
     }
 
+
     /**
      * Returns a page with the API token generation interface.
      *
@@ -183,11 +186,12 @@ public function passwordSave(Request $request)
         if (! $validator->fails()) {
             $user->password = Hash::make($request->input('password'));
             $user->save();
-
             return redirect()->route('account.password.index')->with('success', 'Password updated!');
-        }
 
+        }
         return redirect()->back()->withInput()->withErrors($validator);
+
+
     }
 
     /**
 
@@ -288,8 +288,7 @@ public function createOrFetchCategory($asset_category)
 
             return $category->id;
         }
-
-        $this->logError($category, 'Category "'.$asset_category.'"');
+        $this->logError($category, 'Category "'. $asset_category. '"');
 
         return null;
     }
@@ -380,7 +379,6 @@ public function createOrFetchStatusLabel($asset_statuslabel_name)
         }
 
         $this->logError($status, 'Status "'.$asset_statuslabel_name.'"');
-
         return null;
     }
 
 
@@ -76,6 +76,7 @@ public function createUserIfNotExists(array $row)
         }
 
 
+
         // This needs to be applied after the update logic, otherwise we'll overwrite user passwords
         // Issue #5408
         $this->item['password'] = bcrypt($this->tempPassword);
@@ -145,7 +146,6 @@ public function createOrFetchDepartment($department_name)
         return null;
     }
 
-
     public function sendWelcome($send = true)
     {
         $this->send_welcome = $send;
 
@@ -262,12 +262,13 @@ public function availableForCheckout()
                 && ($this->assetstatus->deployable == '1')) 
             {
                 return true;
+
             }
         }
-
         return false;
     }
 
+
     /**
      * Checks the asset out to the target
      *
@@ -301,6 +302,7 @@ public function checkOut($target, $admin = null, $checkout_at = null, $expected_
 
         $this->assignedTo()->associate($target);
 
+
         if ($name != null) {
             $this->name = $name;
         }
@@ -502,9 +504,10 @@ public function assetLoc($iterations = 1, $first_asset = null)
                 }
                 //this makes no sense
                 return $this->defaultLoc;
-            }
+
             }
 
+        }
         return $this->defaultLoc;
     }
 
@@ -675,13 +678,15 @@ public function model()
      */
     public static function getExpiringWarrantee($days = 30)
     {
+        $days = (is_null($days)) ? 30 : $days;
+        
         return self::where('archived', '=', '0')
             ->whereNotNull('warranty_months')
             ->whereNotNull('purchase_date')
             ->whereNull('deleted_at')
             ->whereRaw(\DB::raw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL '
-                                 .$days
-                                 .' DAY) AND DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) > NOW()'))
+                                 . $days
+                                 . ' DAY) AND DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) > NOW()'))
             ->orderBy('purchase_date', 'ASC')
             ->get();
     }
@@ -1316,6 +1321,7 @@ public function scopeByFilter($query, $filter)
     {
         return $query->where(function ($query) use ($filter) {
             foreach ($filter as $key => $search_val) {
+
                 $fieldname = str_replace('custom_fields.', '', $key);
 
                 if ($fieldname == 'asset_tag') {
@@ -1453,6 +1459,7 @@ public function scopeByFilter($query, $filter)
                     $query->where('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
             }
 
+
             }
 
 
 
@@ -415,6 +415,7 @@ public static function assetcount()
                    ->count();
     }
 
+
     /**
      * Return the number of seats for this asset
      *
@@ -595,6 +596,7 @@ public function supplier()
         return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');
     }
 
+
     /**
      * Gets the next available free seat - used by
      * the API to populate next_seat
@@ -638,6 +640,8 @@ public function freeSeats()
      */
     public static function getExpiringLicenses($days = 60)
     {
+        $days = (is_null($days)) ? 60 : $days;
+
         return self::whereNotNull('expiration_date')
         ->whereNull('deleted_at')
         ->whereRaw(DB::raw('DATE_SUB(`expiration_date`,INTERVAL '.$days.' DAY) <= DATE(NOW()) '))
 
@@ -184,6 +184,7 @@
                         {id: 'address', text: 'Address' },
                         {id: 'city', text: 'City' },
                         {id: 'state', text: 'State' },
+                        {id: 'zip', text: 'ZIP' },
                         {id: 'country', text: 'Country' },
                         {id: 'zip', text: 'ZIP' },
Original file line number	Diff line number	Diff line change
`@@ -2549,6 +2549,15 @@`
`2549`	`2549`	`"contributions": [`
`2550`	`2550`	`"code"`
`2551`	`2551`	`]`
	`2552`	`+ },`
	`2553`	`+ {`
	`2554`	`+ "login": "TenOfTens",`
	`2555`	`+ "name": "TenOfTens",`
	`2556`	`+ "avatar_url": "https://avatars.githubusercontent.com/u/48162670?v=4",`
	`2557`	`+ "profile": "https://github.com/TenOfTens",`
	`2558`	`+ "contributions": [`
	`2559`	`+ "code"`
	`2560`	`+ ]`
`2552`	`2561`	`}`
`2553`	`2562`	`]`
`2554`	`2563`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,12 @@ public function postIndex(ImageUploadRequest $request)`
`64`	`64`	`$user->location_id = $request->input('location_id');`
`65`	`65`	`}`
`66`	`66`
	`67`	`+`
`67`	`68`	`if ($request->input('avatar_delete') == 1) {`
`68`	`69`	`$user->avatar = null;`
`69`	`70`	`}`
`70`	`71`
	`72`	`+`
`71`	`73`	`if ($request->hasFile('avatar')) {`
`72`	`74`	`$path = 'avatars';`
`73`	`75`
`@@ -101,6 +103,7 @@ public function postIndex(ImageUploadRequest $request)`
`101`	`103`	`return redirect()->back()->withInput()->withErrors($user->getErrors());`
`102`	`104`	`}`
`103`	`105`
	`106`	`+`
`104`	`107`	`/**`
`105`	`108`	`* Returns a page with the API token generation interface.`
`106`	`109`	`*`
`@@ -183,11 +186,12 @@ public function passwordSave(Request $request)`
`183`	`186`	`if (! $validator->fails()) {`
`184`	`187`	`$user->password = Hash::make($request->input('password'));`
`185`	`188`	`$user->save();`
`186`		`-`
`187`	`189`	`return redirect()->route('account.password.index')->with('success', 'Password updated!');`
`188`		`- }`
`189`	`190`
	`191`	`+ }`
`190`	`192`	`return redirect()->back()->withInput()->withErrors($validator);`
	`193`	`+`
	`194`	`+`
`191`	`195`	`}`
`192`	`196`
`193`	`197`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -288,8 +288,7 @@ public function createOrFetchCategory($asset_category)`
`288`	`288`
`289`	`289`	`return $category->id;`
`290`	`290`	`}`
`291`		`-`
`292`		`- $this->logError($category, 'Category "'.$asset_category.'"');`
	`291`	`+ $this->logError($category, 'Category "'. $asset_category. '"');`
`293`	`292`
`294`	`293`	`return null;`
`295`	`294`	`}`
`@@ -380,7 +379,6 @@ public function createOrFetchStatusLabel($asset_statuslabel_name)`
`380`	`379`	`}`
`381`	`380`
`382`	`381`	`$this->logError($status, 'Status "'.$asset_statuslabel_name.'"');`
`383`		`-`
`384`	`382`	`return null;`
`385`	`383`	`}`
`386`	`384`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ public function createUserIfNotExists(array $row)`
`76`	`76`	`}`
`77`	`77`
`78`	`78`
	`79`	`+`
`79`	`80`	`// This needs to be applied after the update logic, otherwise we'll overwrite user passwords`
`80`	`81`	`// Issue #5408`
`81`	`82`	`$this->item['password'] = bcrypt($this->tempPassword);`
`@@ -145,7 +146,6 @@ public function createOrFetchDepartment($department_name)`
`145`	`146`	`return null;`
`146`	`147`	`}`
`147`	`148`
`148`		`-`
`149`	`149`	`public function sendWelcome($send = true)`
`150`	`150`	`{`
`151`	`151`	`$this->send_welcome = $send;`
Original file line number	Diff line number	Diff line change
`@@ -262,12 +262,13 @@ public function availableForCheckout()`
`262`	`262`	`&& ($this->assetstatus->deployable == '1'))`
`263`	`263`	`{`
`264`	`264`	`return true;`
	`265`	`+`
`265`	`266`	`}`
`266`	`267`	`}`
`267`		`-`
`268`	`268`	`return false;`
`269`	`269`	`}`
`270`	`270`
	`271`	`+`
`271`	`272`	`/**`
`272`	`273`	`* Checks the asset out to the target`
`273`	`274`	`*`
`@@ -301,6 +302,7 @@ public function checkOut($target, $admin = null, $checkout_at = null, $expected_`
`301`	`302`
`302`	`303`	`$this->assignedTo()->associate($target);`
`303`	`304`
	`305`	`+`
`304`	`306`	`if ($name != null) {`
`305`	`307`	`$this->name = $name;`
`306`	`308`	`}`
`@@ -502,9 +504,10 @@ public function assetLoc($iterations = 1, $first_asset = null)`
`502`	`504`	`}`
`503`	`505`	`//this makes no sense`
`504`	`506`	`return $this->defaultLoc;`
`505`		`- }`
	`507`	`+`
`506`	`508`	`}`
`507`	`509`
	`510`	`+ }`
`508`	`511`	`return $this->defaultLoc;`
`509`	`512`	`}`
`510`	`513`
`@@ -675,13 +678,15 @@ public function model()`
`675`	`678`	`*/`
`676`	`679`	`public static function getExpiringWarrantee($days = 30)`
`677`	`680`	`{`
	`681`	`+ $days = (is_null($days)) ? 30 : $days;`
	`682`	`+`
`678`	`683`	`return self::where('archived', '=', '0')`
`679`	`684`	`->whereNotNull('warranty_months')`
`680`	`685`	`->whereNotNull('purchase_date')`
`681`	`686`	`->whereNull('deleted_at')`
`682`	`687`	->whereRaw(\DB::raw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL '
`683`		`- .$days`
`684`		- .' DAY) AND DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) > NOW()'))
	`688`	`+ . $days`
	`689`	+ . ' DAY) AND DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) > NOW()'))
`685`	`690`	`->orderBy('purchase_date', 'ASC')`
`686`	`691`	`->get();`
`687`	`692`	`}`
`@@ -1316,6 +1321,7 @@ public function scopeByFilter($query, $filter)`
`1316`	`1321`	`{`
`1317`	`1322`	`return $query->where(function ($query) use ($filter) {`
`1318`	`1323`	`foreach ($filter as $key => $search_val) {`
	`1324`	`+`
`1319`	`1325`	`$fieldname = str_replace('custom_fields.', '', $key);`
`1320`	`1326`
`1321`	`1327`	`if ($fieldname == 'asset_tag') {`
`@@ -1453,6 +1459,7 @@ public function scopeByFilter($query, $filter)`
`1453`	`1459`	`$query->where('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');`
`1454`	`1460`	`}`
`1455`	`1461`
	`1462`	`+`
`1456`	`1463`	`}`
`1457`	`1464`
`1458`	`1465`
Original file line number	Diff line number	Diff line change
`@@ -415,6 +415,7 @@ public static function assetcount()`
`415`	`415`	`->count();`
`416`	`416`	`}`
`417`	`417`
	`418`	`+`
`418`	`419`	`/**`
`419`	`420`	`* Return the number of seats for this asset`
`420`	`421`	`*`
`@@ -595,6 +596,7 @@ public function supplier()`
`595`	`596`	`return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');`
`596`	`597`	`}`
`597`	`598`
	`599`	`+`
`598`	`600`	`/**`
`599`	`601`	`* Gets the next available free seat - used by`
`600`	`602`	`* the API to populate next_seat`
`@@ -638,6 +640,8 @@ public function freeSeats()`
`638`	`640`	`*/`
`639`	`641`	`public static function getExpiringLicenses($days = 60)`
`640`	`642`	`{`
	`643`	`+ $days = (is_null($days)) ? 60 : $days;`
	`644`	`+`
`641`	`645`	`return self::whereNotNull('expiration_date')`
`642`	`646`	`->whereNull('deleted_at')`
`643`	`647`	->whereRaw(DB::raw('DATE_SUB(`expiration_date`,INTERVAL '.$days.' DAY) <= DATE(NOW()) '))