forked from snipe/snipe-it
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature snipe#9378 update phpdoc comment
- Loading branch information
Showing
1 changed file
with
7 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,6 @@ | |
use App\Models\License; | ||
use App\Models\Setting; | ||
use Carbon\Carbon; | ||
use Illuminate\Auth\Access\AuthorizationException; | ||
use Illuminate\Http\Request; | ||
use Illuminate\Support\Facades\Response; | ||
use Illuminate\Support\Facades\View; | ||
|
@@ -417,7 +416,7 @@ public function postCustom(Request $request) | |
// Open output stream | ||
$handle = fopen('php://output', 'w'); | ||
stream_set_timeout($handle, 2000); | ||
|
||
if ($request->filled('use_bom')) { | ||
fprintf($handle, chr(0xEF) . chr(0xBB) . chr(0xBF)); | ||
} | ||
|
@@ -488,7 +487,7 @@ public function postCustom(Request $request) | |
if ($request->filled('rtd_location')) { | ||
$header[] = trans('admin/hardware/form.default_location'); | ||
} | ||
|
||
if ($request->filled('rtd_location_address')) { | ||
$header[] = trans('general.address'); | ||
$header[] = trans('general.address'); | ||
|
@@ -579,7 +578,7 @@ public function postCustom(Request $request) | |
$assets = \App\Models\Company::scopeCompanyables(Asset::select('assets.*'))->with( | ||
'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo', | ||
'model.category', 'model.manufacturer','supplier'); | ||
|
||
if ($request->filled('by_location_id')) { | ||
$assets->where('assets.location_id', $request->input('by_location_id')); | ||
} | ||
|
@@ -641,7 +640,7 @@ public function postCustom(Request $request) | |
if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) { | ||
$assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]); | ||
} | ||
|
||
$assets->orderBy('assets.created_at', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) { | ||
|
||
$executionTime = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; | ||
|
@@ -650,7 +649,7 @@ public function postCustom(Request $request) | |
foreach ($assets as $asset) { | ||
$count++; | ||
$row = []; | ||
|
||
if ($request->filled('company')) { | ||
$row[] = ($asset->company) ? $asset->company->name : ''; | ||
} | ||
|
@@ -699,7 +698,7 @@ public function postCustom(Request $request) | |
if ($request->filled('supplier')) { | ||
$row[] = ($asset->supplier) ? $asset->supplier->name : ''; | ||
} | ||
|
||
|
||
if ($request->filled('location')) { | ||
$row[] = ($asset->location) ? $asset->location->present()->name() : ''; | ||
|
@@ -930,9 +929,8 @@ public function exportAssetMaintenancesReport() | |
* getAssetAcceptanceReport | ||
* | ||
* @return mixed | ||
* @throws AuthorizationException | ||
* @version v1.0 | ||
* @author Vincent Sposato <[email protected]> | ||
* @version v1.0 | ||
*/ | ||
public function getAssetAcceptanceReport() | ||
{ | ||
|