Skip to content

A free open source IT asset/license management system

WIP

Marcus Moore134f374adaf2
diff --git a/app/Mail/BulkAssetCheckoutMail.php b/app/Mail/BulkAssetCheckoutMail.php
index 25a8bfde5a..7b309901c4 100644
--- a/app/Mail/BulkAssetCheckoutMail.php
+++ b/app/Mail/BulkAssetCheckoutMail.php
@@ -73,6 +73,33 @@ class BulkAssetCheckoutMail extends Mailable
return trans('mail.Asset_Checkout_Notification', ['tag' => $this->assets->first()->asset_tag]);
}
+ private function loadCustomFieldsOnAssets(): void
+ {
+ $this->assets = $this->assets->map(function (Asset $asset) {
+ $fields = $asset->model?->fieldset?->fields->filter(function (CustomField $field) {
+ return $field->show_in_email && !$field->field_encrypted;
+ });
+
+ $asset->setRelation('fields', $fields);
+
+ return $asset;
+ });
+ }
+
+ private function loadEulasOnAssets(): void
+ {
+ $this->assets = $this->assets->map(function (Asset $asset) {
+ $asset->eula = $asset->getEula();
+
+ return $asset;
+ });
+ }
+
+ private function groupAssetsByCategory(): Collection
+ {
+ return $this->assets->groupBy(fn($asset) => $asset->model->category->id);
+ }
+
private function getIntroduction(): string
{
if ($this->target instanceof Location) {
@@ -107,33 +134,6 @@ class BulkAssetCheckoutMail extends Mailable
}
}
- private function loadCustomFieldsOnAssets(): void
- {
- $this->assets = $this->assets->map(function (Asset $asset) {
- $fields = $asset->model?->fieldset?->fields->filter(function (CustomField $field) {
- return $field->show_in_email && !$field->field_encrypted;
- });
-
- $asset->setRelation('fields', $fields);
-
- return $asset;
- });
- }
-
- private function loadEulasOnAssets(): void
- {
- $this->assets = $this->assets->map(function (Asset $asset) {
- $asset->eula = $asset->getEula();
-
- return $asset;
- });
- }
-
- private function groupAssetsByCategory(): Collection
- {
- return $this->assets->groupBy(fn($asset) => $asset->model->category->id);
- }
-
private function requiresAcceptance(): bool
{
return (bool) $this->assets->reduce(