diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 74d709adca..03fdcb0d49 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -645,6 +645,12 @@ class ReportsController extends Controller if($request->filled('exclude_archived')){ $assets->notArchived(); } + if($request->filled('include_deleted')){ + $assets->withTrashed(); + } + if($request->filled('only_deleted')){ + $assets->onlyTrashed(); + } $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) { diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 43e9e4fbe2..c97d8133f5 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -132,6 +132,7 @@ return [ 'id' => 'ID', 'image' => 'Image', 'image_delete' => 'Delete Image', + 'include_deleted' => 'Include Deleted Assets', 'image_upload' => 'Upload Image', 'filetypes_accepted_help' => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.', 'filetypes_size_help' => 'Max upload size allowed is :size.', @@ -185,6 +186,7 @@ return [ 'no' => 'No', 'notes' => 'Notes', 'order_number' => 'Order Number', + 'only_deleted' => 'Only Deleted Assets', 'page_menu' => 'Showing _MENU_ items', 'pagination_info' => 'Showing _START_ to _END_ of _TOTAL_ items', 'pending' => 'Pending', diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index b281595d0c..b58efaf4a2 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -351,6 +351,18 @@ {{ trans('general.bom_remark') }} +
+ +
+
+ +