DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

adds status labels to confirmation emails

Browse source
This commit is contained in:
Godfrey M 2024-07-24 11:24:30 -07:00
parent 8368fb5c41
commit 99741db645
6 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Account/AcceptanceController.php
View file

@ -218,6 +218,7 @@ class AcceptanceController extends Controller
'item_tag' => $item->asset_tag, 'item_tag' => $item->asset_tag,
'item_model' => $display_model, 'item_model' => $display_model,
'item_serial' => $item->serial, 'item_serial' => $item->serial,
'item_status' => $item->assetstatus->name ?: '',
'eula' => $item->getEula(), 'eula' => $item->getEula(),
'note' => $request->input('note'), 'note' => $request->input('note'),
'check_out_date' => Carbon::parse($acceptance->created_at)->format('Y-m-d'), 'check_out_date' => Carbon::parse($acceptance->created_at)->format('Y-m-d'),
@ -308,6 +309,7 @@ class AcceptanceController extends Controller
'item_tag' => $item->asset_tag, 'item_tag' => $item->asset_tag,
'item_model' => $display_model, 'item_model' => $display_model,
'item_serial' => $item->serial, 'item_serial' => $item->serial,
'item_status' => $item->assetstatus->name ?: '',
'note' => $request->input('note'), 'note' => $request->input('note'),
'declined_date' => Carbon::parse($acceptance->declined_at)->format('Y-m-d'), 'declined_date' => Carbon::parse($acceptance->declined_at)->format('Y-m-d'),
'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null, 'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,

2
app/Notifications/AcceptanceAssetAcceptedNotification.php
View file

@ -24,6 +24,7 @@ class AcceptanceAssetAcceptedNotification extends Notification
$this->item_tag = $params['item_tag']; $this->item_tag = $params['item_tag'];
$this->item_model = $params['item_model']; $this->item_model = $params['item_model'];
$this->item_serial = $params['item_serial']; $this->item_serial = $params['item_serial'];
$this->item_status = $params['item_status'];
$this->accepted_date = Helper::getFormattedDateObject($params['accepted_date'], 'date', false); $this->accepted_date = Helper::getFormattedDateObject($params['accepted_date'], 'date', false);
$this->assigned_to = $params['assigned_to']; $this->assigned_to = $params['assigned_to'];
$this->note = $params['note']; $this->note = $params['note'];
@ -65,6 +66,7 @@ class AcceptanceAssetAcceptedNotification extends Notification
'item_tag' => $this->item_tag, 'item_tag' => $this->item_tag,
'item_model' => $this->item_model, 'item_model' => $this->item_model,
'item_serial' => $this->item_serial, 'item_serial' => $this->item_serial,
'item_status' => $this->item_status,
'note' => $this->note, 'note' => $this->note,
'accepted_date' => $this->accepted_date, 'accepted_date' => $this->accepted_date,
'assigned_to' => $this->assigned_to, 'assigned_to' => $this->assigned_to,

2
app/Notifications/AcceptanceAssetDeclinedNotification.php
View file

@ -24,6 +24,7 @@ class AcceptanceAssetDeclinedNotification extends Notification
$this->item_tag = $params['item_tag']; $this->item_tag = $params['item_tag'];
$this->item_model = $params['item_model']; $this->item_model = $params['item_model'];
$this->item_serial = $params['item_serial']; $this->item_serial = $params['item_serial'];
$this->item_status = $params['item_status'];
$this->declined_date = Helper::getFormattedDateObject($params['declined_date'], 'date', false); $this->declined_date = Helper::getFormattedDateObject($params['declined_date'], 'date', false);
$this->note = $params['note']; $this->note = $params['note'];
$this->assigned_to = $params['assigned_to']; $this->assigned_to = $params['assigned_to'];
@ -63,6 +64,7 @@ class AcceptanceAssetDeclinedNotification extends Notification
'item_tag' => $this->item_tag, 'item_tag' => $this->item_tag,
'item_model' => $this->item_model, 'item_model' => $this->item_model,
'item_serial' => $this->item_serial, 'item_serial' => $this->item_serial,
'item_status' => $this->item_status,
'note' => $this->note, 'note' => $this->note,
'declined_date' => $this->declined_date, 'declined_date' => $this->declined_date,
'assigned_to' => $this->assigned_to, 'assigned_to' => $this->assigned_to,

1
app/Notifications/CheckoutAssetNotification.php
View file

@ -209,6 +209,7 @@ public function toGoogleChat()
[ [
'item' => $this->item, 'item' => $this->item,
'admin' => $this->admin, 'admin' => $this->admin,
'status' => $this->item->assetstatus(),
'note' => $this->note, 'note' => $this->note,
'target' => $this->target, 'target' => $this->target,
'fields' => $fields, 'fields' => $fields,

3
resources/views/notifications/markdown/asset-acceptance.blade.php
View file

@ -16,6 +16,9 @@
@if (isset($note)) @if (isset($note))
| **{{ trans('general.notes') }}** | {{ $note }} | | **{{ trans('general.notes') }}** | {{ $note }} |
@endif @endif
@if (isset($item_status))
| **{{ trans('general.status') }}** | {{ $item_status }} |
@endif
@if ((isset($item_tag)) && ($item_tag!='')) @if ((isset($item_tag)) && ($item_tag!=''))
| **{{ trans('mail.asset_tag') }}** | {{ $item_tag }} | | **{{ trans('mail.asset_tag') }}** | {{ $item_tag }} |
@endif @endif

3
resources/views/notifications/markdown/checkout-asset.blade.php
View file

@ -31,6 +31,9 @@
@if (isset($last_checkout)) @if (isset($last_checkout))
| **{{ trans('mail.checkout_date') }}** | {{ $last_checkout }} | | **{{ trans('mail.checkout_date') }}** | {{ $last_checkout }} |
@endif @endif
@if (isset($status))
| **{{ trans('general.status') }}** | {{ $status }} |
@endif
@if ((isset($expected_checkin)) && ($expected_checkin!='')) @if ((isset($expected_checkin)) && ($expected_checkin!=''))
| **{{ trans('mail.expecting_checkin_date') }}** | {{ $expected_checkin }} | | **{{ trans('mail.expecting_checkin_date') }}** | {{ $expected_checkin }} |
@endif @endif