DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

resolve some conflicts

Browse source
This commit is contained in:
slong753 2023-07-13 22:48:51 -05:00 committed by spencerrlongg
parent c1daabef08
commit 17ccfa9ada
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
app/Http/Controllers/Assets/AssetsController.php
View file

@ -6,6 +6,7 @@ use App\Helpers\Helper;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\ImageUploadRequest; use App\Http\Requests\ImageUploadRequest;
use App\Models\Actionlog; use App\Models\Actionlog;
use Illuminate\Support\Facades\Log;
use App\Models\Asset; use App\Models\Asset;
use App\Models\AssetModel; use App\Models\AssetModel;
use App\Models\CheckoutRequest; use App\Models\CheckoutRequest;
@ -14,26 +15,20 @@ use App\Models\Location;
use App\Models\Setting; use App\Models\Setting;
use App\Models\Statuslabel; use App\Models\Statuslabel;
use App\Models\User; use App\Models\User;
use Illuminate\Support\Facades\Auth;
use App\View\Label; use App\View\Label;
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Gate;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Crypt;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Cookie; use Illuminate\Support\Facades\Validator;
use Input;
use Intervention\Image\Facades\Image;
use League\Csv\Reader; use League\Csv\Reader;
use League\Csv\Statement;
use Paginator;
use Redirect; use Redirect;
use Response; use Response;
use Slack; use Illuminate\View\View;
use Str;
use TCPDF;
use View;
/** /**
* This class controls all actions related to assets for * This class controls all actions related to assets for
@ -173,9 +168,9 @@ class AssetsController extends Controller
if ($field->field_encrypted == '1') { if ($field->field_encrypted == '1') {
if (Gate::allows('admin')) { if (Gate::allows('admin')) {
if (is_array($request->input($field->db_column))) { if (is_array($request->input($field->db_column))) {
$asset->{$field->db_column} = \Crypt::encrypt(implode(', ', $request->input($field->db_column))); $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
} else { } else {
$asset->{$field->db_column} = \Crypt::encrypt($request->input($field->db_column)); $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
} }
} }
} else { } else {
@ -315,7 +310,13 @@ class AssetsController extends Controller
$asset->status_id = $request->input('status_id', null); $asset->status_id = $request->input('status_id', null);
$asset->warranty_months = $request->input('warranty_months', null); $asset->warranty_months = $request->input('warranty_months', null);
$asset->purchase_cost = $request->input('purchase_cost', null); $asset->purchase_cost = $request->input('purchase_cost', null);
$asset->asset_eol_date = request('asset_eol_date', null); if ($request->filled('purchase_date') && !$request->filled('asset_eol_date')) {
$asset->asset_eol_date = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d');
} else {
$asset->purchase_date = $request->input('purchase_date', null);
$asset->asset_eol_date = request('asset_eol_date', null);
}
$asset->purchase_date = $request->input('purchase_date', null); $asset->purchase_date = $request->input('purchase_date', null);
$asset->supplier_id = $request->input('supplier_id', null); $asset->supplier_id = $request->input('supplier_id', null);
@ -342,7 +343,7 @@ class AssetsController extends Controller
unlink(public_path().'/uploads/assets/'.$asset->image); unlink(public_path().'/uploads/assets/'.$asset->image);
$asset->image = ''; $asset->image = '';
} catch (\Exception $e) { } catch (\Exception $e) {
\Log::info($e); Log::info($e);
} }
} }
@ -370,9 +371,9 @@ class AssetsController extends Controller
if ($field->field_encrypted == '1') { if ($field->field_encrypted == '1') {
if (Gate::allows('admin')) { if (Gate::allows('admin')) {
if (is_array($request->input($field->db_column))) { if (is_array($request->input($field->db_column))) {
$asset->{$field->db_column} = \Crypt::encrypt(implode(', ', $request->input($field->db_column))); $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
} else { } else {
$asset->{$field->db_column} = \Crypt::encrypt($request->input($field->db_column)); $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
} }
} }
} else { } else {
@ -423,7 +424,7 @@ class AssetsController extends Controller
try { try {
Storage::disk('public')->delete('assets'.'/'.$asset->image); Storage::disk('public')->delete('assets'.'/'.$asset->image);
} catch (\Exception $e) { } catch (\Exception $e) {
\Log::debug($e); Log::debug($e);
} }
} }
@ -538,7 +539,7 @@ class AssetsController extends Controller
return response($barcode_obj->getPngData())->header('Content-type', 'image/png'); return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
} catch (\Exception $e) { } catch (\Exception $e) {
\Log::debug('The barcode format is invalid.'); Log::debug('The barcode format is invalid.');
return response(file_get_contents(public_path('uploads/barcodes/invalid_barcode.gif')))->header('Content-type', 'image/gif'); return response(file_get_contents(public_path('uploads/barcodes/invalid_barcode.gif')))->header('Content-type', 'image/gif');
} }
@ -859,7 +860,7 @@ class AssetsController extends Controller
'next_audit_date' => 'date|nullable', 'next_audit_date' => 'date|nullable',
]; ];
$validator = \Validator::make($request->all(), $rules); $validator = Validator::make($request->all(), $rules);
if ($validator->fails()) { if ($validator->fails()) {
return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all())); return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all()));
@ -876,7 +877,7 @@ class AssetsController extends Controller
// Check to see if they checked the box to update the physical location, // Check to see if they checked the box to update the physical location,
// not just note it in the audit notes // not just note it in the audit notes
if ($request->input('update_location') == '1') { if ($request->input('update_location') == '1') {
\Log::debug('update location in audit'); Log::debug('update location in audit');
$asset->location_id = $request->input('location_id'); $asset->location_id = $request->input('location_id');
} }