Merge branch 'develop' into replace-date-and-time-display-macros

# Conflicts:
#	resources/macros/macros.php

Author: marcusmoore

app/Console/Commands/RemoveInvalidUploadDeleteActionLogItems.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Actionlog;
+use Illuminate\Console\Command;
+
+class RemoveInvalidUploadDeleteActionLogItems extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:remove-invalid-upload-delete-action-log-items';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Permanently remove invalid "upload deleted" action log items that have a null filename. This command can potentially result in deleted files being "resurrected" in the UI.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $invalidLogs = Actionlog::query()
+            ->where('action_type', 'upload deleted')
+            ->whereNull('filename')
+            ->withTrashed()
+            ->get();
+
+        $this->info("{$invalidLogs->count()} invalid log items found.");
+
+        if ($invalidLogs->count() === 0) {
+            return 0;
+        }
+
+        $this->table(['ID', 'Action Type', 'Item Type', 'Item ID', 'Created At', 'Deleted At'], $invalidLogs->map(fn($log) => [
+            $log->id,
+            $log->action_type,
+            $log->item_type,
+            $log->item_id,
+            $log->created_at,
+            $log->deleted_at,
+        ])->toArray());
+
+        if ($this->confirm("Do you wish to remove {$invalidLogs->count()} log items?")) {
+            $invalidLogs->each(fn($log) => $log->forceDelete());
+        }
+
+        return 0;
+    }
+}

app/Console/Commands/SendExpirationAlerts.php

@@ -60,19 +60,57 @@ public function handle()
                 Mail::to($recipients)->send(new ExpiringAssetsMail($assets, $alert_interval));
 
                 $this->table(
-                    ['ID', 'Tag', 'Model', 'Model Number', 'EOL', 'EOL Months', 'Warranty Expires', 'Warranty Months'],
-                    $assets->map(fn($item) => ['ID' => $item->id, 'Tag' => $item->asset_tag, 'Model' => $item->model->name, 'Model Number' => $item->model->model_number, 'EOL' => $item->asset_eol_date, 'EOL Months' => $item->model->eol,  'Warranty Expires' => $item->warranty_expires,  'Warranty Months' => $item->warranty_months])
-                );
+                    [
+                        trans('general.id'),
+                        trans('admin/hardware/form.tag'),
+                        trans('admin/hardware/form.model'),
+                        trans('general.model_no'),
+                        trans('general.purchase_date'),
+                        trans('admin/hardware/form.eol_rate'),
+                        trans('admin/hardware/form.eol_date'),
+                        trans('admin/hardware/form.warranty_expires'),
+                    ],
+                    $assets->map(fn($item) =>
+                    [
+                        trans('general.id')  => $item->id,
+                        trans('admin/hardware/form.tag') => $item->asset_tag,
+                        trans('admin/hardware/form.model') => $item->model->name,
+                        trans('general.model_no') => $item->model->model_number,
+                        trans('general.purchase_date') => $item->purchase_date_formatted,
+                        trans('admin/hardware/form.eol_rate')  => $item->model->eol,
+                        trans('admin/hardware/form.eol_date') => $item->eol_date ? $item->eol_formatted_date .' ('.$item->eol_diff_for_humans.')' : '',
+                        trans('admin/hardware/form.warranty_expires') => $item->warranty_expires ? $item->warranty_expires_formatted_date .' ('.$item->warranty_expires_diff_for_humans.')' : '',
+                   ])
+                   );
             }
 
             // Expiring licenses
-            $licenses = License::getExpiringLicenses($alert_interval);
+            $licenses = License::query()->ExpiringLicenses($alert_interval)
+                ->with('manufacturer','category')
+                ->orderBy('expiration_date', 'ASC')
+                ->orderBy('termination_date', 'ASC')
+                ->get();
             if ($licenses->count() > 0) {
                 Mail::to($recipients)->send(new ExpiringLicenseMail($licenses, $alert_interval));
 
                 $this->table(
-                    ['ID', 'Name', 'Expires', 'Termination Date'],
-                    $licenses->map(fn($item) => ['ID' => $item->id, 'Name' => $item->name, 'Expires' => $item->expiration_date, 'Termination Date' => $item->termination_date])
+                    [
+                        trans('general.id'),
+                        trans('general.name'),
+                        trans('general.purchase_date'),
+                        trans('admin/licenses/form.expiration'),
+                        trans('mail.expires'),
+                        trans('admin/licenses/form.termination_date'),
+                        trans('mail.terminates')],
+                    $licenses->map(fn($item) => [
+                        trans('general.id') => $item->id,
+                        trans('general.name') => $item->name,
+                        trans('general.purchase_date') => $item->purchase_date_formatted,
+                        trans('admin/licenses/form.expiration') => $item->expires_formatted_date,
+                        trans('mail.expires') => $item->expires_diff_for_humans,
+                        trans('admin/licenses/form.termination_date') => $item->terminates_formatted_date,
+                        trans('mail.terminates') => $item->terminates_diff_for_humans
+                    ])
                 );
             }
 

app/Console/Commands/SendUpcomingAuditReport.php

@@ -47,7 +47,7 @@ public function handle()
         $today = Carbon::now();
         $interval_date = $today->copy()->addDays($interval);
 
-        $assets = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'desc')->get();
+        $assets = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'asc')->get();
         $this->info($assets->count() . ' assets must be audited in on or before ' . $interval_date . ' is deadline');
 
 
@@ -61,6 +61,28 @@ public function handle()
 
             $this->info('Sending Admin SendUpcomingAuditNotification to: ' . $settings->alert_email);
             Mail::to($recipients)->send(new SendUpcomingAuditMail($assets, $settings->audit_warning_days));
+
+            $this->table(
+                [
+                    trans('general.id'),
+                    trans('general.name'),
+                    trans('general.last_audit'),
+                    trans('general.next_audit_date'),
+                    trans('mail.Days'),
+                    trans('mail.supplier'),
+                    trans('mail.assigned_to'),
+
+                ],
+                $assets->map(fn($item) => [
+                    trans('general.id') => $item->id,
+                    trans('general.name') => $item->display_name,
+                    trans('general.last_audit') => $item->last_audit_formatted_date,
+                    trans('general.next_audit_date') => $item->next_audit_formatted_date,
+                    trans('mail.Days') => round($item->next_audit_diff_in_days),
+                    trans('mail.supplier') => $item->supplier ? $item->supplier->name : '',
+                    trans('mail.assigned_to') => $item->assignedTo ? $item->assignedTo->display_name : '',
+                ])
+            );
         }
 
     }

app/Http/Controllers/Account/AcceptanceController.php

@@ -77,7 +77,6 @@ public function store(Request $request, $id) : RedirectResponse
         $acceptance = CheckoutAcceptance::find($id);
         $assigned_user = User::find($acceptance->assigned_to_id);
         $settings = Setting::getSettings();
-        $path_logo = '';
         $sig_filename='';
 
 
@@ -138,6 +137,13 @@ public function store(Request $request, $id) : RedirectResponse
         }
 
 
+        // Convert PDF logo to base64 for TCPDF
+        // This is needed for TCPDF to properly embed the image if it's a png and the cache isn't writable
+        $encoded_logo = null;
+        if ($settings->acceptance_pdf_logo) {
+            $encoded_logo = base64_encode(file_get_contents(public_path() . '/uploads/' . $settings->acceptance_pdf_logo));
+        }
+
         // Get the data array ready for the notifications and PDF generation
         $data = [
             'item_tag' => $item->asset_tag,
@@ -153,8 +159,8 @@ public function store(Request $request, $id) : RedirectResponse
             'assigned_to' => $assigned_user->display_name,
             'site_name' => $settings->site_name,
             'company_name' => $item->company?->name?? $settings->site_name,
-            'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
-            'logo' => ($settings->acceptance_pdf_logo) ? public_path() . '/uploads/' . $settings->acceptance_pdf_logo : null,
+            'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null,
+            'logo' => ($encoded_logo) ?? null,
             'date_settings' => $settings->date_display_format,
             'admin' => auth()->user()->present()?->fullName,
             'qty' => $acceptance->qty ?? 1,

app/Http/Controllers/Api/AssetsController.php

@@ -116,6 +116,22 @@ public function index(Request $request, $action = null, $upcoming_status = null)
             'asset_eol_date',
             'requestable',
             'jobtitle',
+            // These are *relationships* so we wouldn't normally include them in this array,
+            // since they would normally create a `column not found` error,
+            // BUT we account for them in the ordering switch down at the end of this method
+            // DO NOT ADD ANYTHING TO THIS LIST WITHOUT CHECKING THE ORDERING SWITCH BELOW!
+            'company',
+            'model',
+            'location',
+            'rtd_location',
+            'category',
+            'status_label',
+            'manufacturer',
+            'supplier',
+            'jobtitle',
+            'assigned_to',
+            'created_by',
+
         ];
 
         $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
@@ -132,6 +148,7 @@ public function index(Request $request, $action = null, $upcoming_status = null)
             $filter = array_filter($filter, function ($key) use ($allowed_columns) {
                 return in_array($key, $allowed_columns);
             }, ARRAY_FILTER_USE_KEY);
+
         }
 
         $assets = Asset::select('assets.*')

app/Http/Controllers/Api/LicensesController.php

@@ -7,6 +7,7 @@
 use App\Http\Transformers\LicensesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\License;
+use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\JsonResponse;
@@ -25,9 +26,12 @@ public function index(Request $request) : JsonResponse | array
         $this->authorize('view', License::class);
 
         $licenses = License::with('company', 'manufacturer', 'supplier','category', 'adminuser')->withCount('freeSeats as free_seats_count');
+        $settings = Setting::getSettings();
 
         if ($request->input('status')=='inactive') {
             $licenses->ExpiredLicenses();
+        } elseif ($request->input('status')=='expiring') {
+            $licenses->ExpiringLicenses($settings->alert_interval);
         } else {
             $licenses->ActiveLicenses();
         }

app/Http/Controllers/Api/MaintenancesController.php

@@ -52,6 +52,10 @@ public function index(Request $request) : JsonResponse | array
             $maintenances->where('maintenances.created_by', '=', $request->input('created_by'));
         }
 
+        if ($request->filled('url')) {
+            $maintenances->where('maintenances.url', '=', $request->input('url'));
+        }
+
         if ($request->filled('asset_maintenance_type')) {
             $maintenances->where('asset_maintenance_type', '=', $request->input('asset_maintenance_type'));
         }

app/Http/Controllers/Api/UploadedFilesController.php

@@ -193,8 +193,12 @@ public function destroy($object_type, $id, $file_id) : JsonResponse
 
 
         // Check for the file
-        $log = Actionlog::find($file_id)->where('item_type', self::$map_object_type[$object_type])
-            ->where('item_id', $object->id)->first();
+        $log = Actionlog::query()
+            ->where('id', $file_id)
+            ->where('action_type', 'uploaded')
+            ->where('item_type', self::$map_object_type[$object_type])
+            ->where('item_id', $object->id)
+            ->first();
 
         if ($log) {
             // Check the file actually exists, and delete it
@@ -213,4 +217,4 @@ public function destroy($object_type, $id, $file_id) : JsonResponse
         return response()->json(Helper::formatStandardApiResponse('error', null, trans_choice('general.file_upload_status.delete.error', 1)), 500);
 
     }
-}
+}

app/Http/Controllers/Assets/AssetsController.php

@@ -398,6 +398,7 @@ public function update(ImageUploadRequest $request, Asset $asset) : RedirectResp
             $asset->assigned_to = null;
             $asset->assigned_type = null;
             $asset->accepted = null;
+            $asset->last_checkin = now();
             event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update with '.$status->getStatuslabelType().' status', date('Y-m-d H:i:s'), $originalValues));
         }
 

app/Http/Controllers/MaintenancesController.php

@@ -78,6 +78,7 @@ public function store(ImageUploadRequest $request) : RedirectResponse
             $maintenance->is_warranty = $request->input('is_warranty');
             $maintenance->cost = $request->input('cost');
             $maintenance->notes = $request->input('notes');
+            $maintenance->url = $request->input('url');
 
             // Save the asset maintenance data
             $maintenance->asset_id = $asset->id;
@@ -152,6 +153,7 @@ public function update(ImageUploadRequest $request, Maintenance $maintenance) :
         $maintenance->name = $request->input('name');
         $maintenance->start_date = $request->input('start_date');
         $maintenance->completion_date = $request->input('completion_date');
+        $maintenance->url = $request->input('url');
 
 
         // Todo - put this in a getter/setter?