A free open source IT asset/license management system
validation rule & query
akemidx99acf018f13d
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.phpindex afa9191b9a..d1a649a14e 100644--- a/app/Http/Controllers/ReportsController.php+++ b/app/Http/Controllers/ReportsController.php@@ -685,8 +685,12 @@ class ReportsController extends Controller$assets->whereBetween('assets.purchase_date', [$request->input('purchase_start'), $request->input('purchase_end')]);}- if (($request->filled('purchase_cost_start')) && ($request->filled('purchase_cost_end'))) {- $assets->whereBetween('assets.purchase_cost', [$request->input('purchase_cost_start'), $request->input('purchase_cost_end')]);+ if ($request->filled('purchase_cost_start')) {+ if ($request->filled('purchase_cost_end')) {+ $assets->whereBetween('assets.purchase_cost', [$request->input('purchase_cost_start'), $request->input('purchase_cost_end')]);+ } else {+ $assets->where('assets.purchase_cost', ">", $request->input('purchase_cost_start'));+ }}if (($request->filled('created_start')) && ($request->filled('created_end'))) {diff --git a/app/Http/Requests/CustomAssetReportRequest.php b/app/Http/Requests/CustomAssetReportRequest.phpindex 2a8fbe7fab..16bbe1006f 100644--- a/app/Http/Requests/CustomAssetReportRequest.php+++ b/app/Http/Requests/CustomAssetReportRequest.php@@ -24,6 +24,7 @@ class CustomAssetReportRequest extends Requestreturn ['purchase_start' => 'date|date_format:Y-m-d|nullable','purchase_end' => 'date|date_format:Y-m-d|nullable',+ 'purchase_cost_end' => 'numeric|nullable|gte:purchase_cost_start','created_start' => 'date|date_format:Y-m-d|nullable','created_end' => 'date|date_format:Y-m-d|nullable','checkout_date_start' => 'date|date_format:Y-m-d|nullable',diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.phpindex 87810ac5cc..a3693f6f72 100644--- a/resources/views/reports/custom.blade.php+++ b/resources/views/reports/custom.blade.php@@ -430,9 +430,9 @@<div class="form-group purchase-range{{ ($errors->has('purchase_cost_start') || $errors->has('purchase_cost_end')) ? ' has-error' : '' }}"><label for="purchase_cost_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.cost') }}</label><div class="input-group col-md-7">- <input type="text" min="0" class="form-control" name="purchase_cost_start" aria-label="purchase_cost_start" value="{{ $template->textValue('purchase_cost_start', old('purchase_cost_start')) }}">+ <input type="number" min="0" step="0.01" class="form-control" name="purchase_cost_start" aria-label="purchase_cost_start" value="{{ $template->textValue('purchase_cost_start', old('purchase_cost_start')) }}"><span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>- <input type="text" class="form-control" name="purchase_cost_end" aria-label="purchase_cost_end" value="{{ $template->textValue('purchase_cost_end', old('purchase_cost_end')) }}">+ <input type="number" min="0" step="0.01" class="form-control" name="purchase_cost_end" aria-label="purchase_cost_end" value="{{ $template->textValue('purchase_cost_end', old('purchase_cost_end')) }}"></div>@if ($errors->has('purchase_cost_start') || $errors->has('purchase_cost_end'))