diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 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.php index 2a8fbe7fab..16bbe1006f 100644 --- a/app/Http/Requests/CustomAssetReportRequest.php +++ b/app/Http/Requests/CustomAssetReportRequest.php @@ -24,6 +24,7 @@ class CustomAssetReportRequest extends Request return [ '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.php index 87810ac5cc..a3693f6f72 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -430,9 +430,9 @@