Skip to content

A free open source IT asset/license management system

Apply pint to enums and events

snipef7b82ad1ff51
diff --git a/app/Enums/ActionType.php b/app/Enums/ActionType.php
index 6798a6b78e..59278995c9 100644
--- a/app/Enums/ActionType.php
+++ b/app/Enums/ActionType.php
@@ -1,6 +1,7 @@
<?php
namespace App\Enums;
+
enum ActionType: string
{
// General
@@ -30,4 +31,4 @@ enum ActionType: string
// File Uploads
case Uploaded = 'uploaded';
case UploadDeleted = 'upload deleted';
-}
\ No newline at end of file
+}
diff --git a/app/Events/CheckoutAccepted.php b/app/Events/CheckoutAccepted.php
index cd5ee19776..0730be45b6 100644
--- a/app/Events/CheckoutAccepted.php
+++ b/app/Events/CheckoutAccepted.php
@@ -3,7 +3,6 @@
namespace App\Events;
use App\Models\CheckoutAcceptance;
-use App\Models\Contracts\Acceptable;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
diff --git a/app/Events/CheckoutDeclined.php b/app/Events/CheckoutDeclined.php
index 01d84b30f3..6331210b94 100644
--- a/app/Events/CheckoutDeclined.php
+++ b/app/Events/CheckoutDeclined.php
@@ -3,7 +3,6 @@
namespace App\Events;
use App\Models\CheckoutAcceptance;
-use App\Models\Contracts\Acceptable;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
diff --git a/app/Events/CheckoutableCheckedIn.php b/app/Events/CheckoutableCheckedIn.php
index fedbd49fbe..f6a20fd3d2 100644
--- a/app/Events/CheckoutableCheckedIn.php
+++ b/app/Events/CheckoutableCheckedIn.php
@@ -11,10 +11,15 @@ class CheckoutableCheckedIn
use Dispatchable, SerializesModels;
public $checkoutable;
+
public $checkedOutTo;
+
public $checkedInBy;
+
public $note;
+
public $action_date; // Date setted in the hardware.checkin view at the checkin_at input, for the action log
+
public $originalValues;
/**
diff --git a/app/Events/CheckoutableCheckedOut.php b/app/Events/CheckoutableCheckedOut.php
index d82a9a7ad4..f75ddcc5cb 100644
--- a/app/Events/CheckoutableCheckedOut.php
+++ b/app/Events/CheckoutableCheckedOut.php
@@ -11,10 +11,15 @@ class CheckoutableCheckedOut
use Dispatchable, SerializesModels;
public $checkoutable;
+
public $checkedOutTo;
+
public $checkedOutBy;
+
public $note;
+
public $originalValues;
+
public int $quantity;
/**
diff --git a/app/Events/CheckoutablesCheckedOutInBulk.php b/app/Events/CheckoutablesCheckedOutInBulk.php
index 4b75b32145..0f785976b3 100644
--- a/app/Events/CheckoutablesCheckedOutInBulk.php
+++ b/app/Events/CheckoutablesCheckedOutInBulk.php
@@ -19,6 +19,5 @@ class CheckoutablesCheckedOutInBulk
public string $checkout_at,
public string $expected_checkin,
public string $note,
- ) {
- }
+ ) {}
}
diff --git a/app/Events/UserMerged.php b/app/Events/UserMerged.php
index 3a7f4d6a2c..6a95344367 100644
--- a/app/Events/UserMerged.php
+++ b/app/Events/UserMerged.php
@@ -2,9 +2,9 @@
namespace App\Events;
+use App\Models\User;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
-use App\Models\User;
class UserMerged
{
@@ -17,8 +17,8 @@ class UserMerged
*/
public function __construct(User $from_user, User $to_user, ?User $admin)
{
- $this->merged_from = $from_user;
- $this->merged_to = $to_user;
- $this->admin = $admin;
+ $this->merged_from = $from_user;
+ $this->merged_to = $to_user;
+ $this->admin = $admin;
}
}