Skip to content

Commit 14e4319

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents 0c1b2a5 + 6cf88b1 commit 14e4319

File tree

9 files changed

+62
-50
lines changed

9 files changed

+62
-50
lines changed

‎app/Http/Controllers/Assets/AssetsController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ public function update(ImageUploadRequest $request, Asset $asset) : RedirectResp
398398
$asset->assigned_to = null;
399399
$asset->assigned_type = null;
400400
$asset->accepted = null;
401+
$asset->last_checkin = now();
401402
event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update with '.$status->getStatuslabelType().' status', date('Y-m-d H:i:s'), $originalValues));
402403
}
403404

‎resources/macros/macros.php‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -104,23 +104,6 @@
104104
return $select;
105105
});
106106

107-
108-
Form::macro('name_display_format', function ($name = 'name_display_format', $selected = null, $class = null) {
109-
$formats = [
110-
'first_last' => trans('general.firstname_lastname_display'),
111-
'last_first' => trans('general.lastname_firstname_display'),
112-
];
113-
114-
$select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
115-
foreach ($formats as $format => $label) {
116-
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
117-
}
118-
119-
$select .= '</select>';
120-
121-
return $select;
122-
});
123-
124107
/**
125108
* Barcode macro
126109
* Generates the dropdown menu of available 1D barcodes
@@ -168,32 +151,6 @@
168151
return $select;
169152
});
170153

171-
Form::macro('email_format', function ($name = 'email_format', $selected = null, $class = null) {
172-
$formats = [
173-
'firstname.lastname' => trans('admin/settings/general.email_formats.firstname_lastname_format'),
174-
'firstname' => trans('admin/settings/general.email_formats.first_name_format'),
175-
'lastname' => trans('admin/settings/general.email_formats.last_name_format'),
176-
'filastname' => trans('admin/settings/general.email_formats.filastname_format'),
177-
'lastnamefirstinitial' => trans('admin/settings/general.email_formats.lastnamefirstinitial_format'),
178-
'firstname_lastname' => trans('admin/settings/general.email_formats.firstname_lastname_underscore_format'),
179-
'firstinitial.lastname' => trans('admin/settings/general.email_formats.firstinitial_lastname'),
180-
'lastname_firstinitial' => trans('admin/settings/general.email_formats.lastname_firstinitial'),
181-
'lastname.firstinitial' => trans('admin/settings/general.email_formats.lastname_dot_firstinitial_format'),
182-
'firstnamelastname' => trans('admin/settings/general.email_formats.firstnamelastname'),
183-
'firstnamelastinitial' => trans('admin/settings/general.email_formats.firstnamelastinitial'),
184-
'lastname.firstname' => trans('admin/settings/general.email_formats.lastnamefirstname'),
185-
];
186-
187-
$select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
188-
foreach ($formats as $format => $label) {
189-
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
190-
}
191-
192-
$select .= '</select>';
193-
194-
return $select;
195-
});
196-
197154
Form::macro('username_format', function ($name = 'username_format', $selected = null, $class = null) {
198155
$formats = [
199156
'firstname.lastname' => trans('admin/settings/general.username_formats.firstname_lastname_format'),

‎resources/views/blade/input/email-format-select.blade.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
@php
2+
$formats = [
3+
'firstname.lastname' => trans('admin/settings/general.email_formats.firstname_lastname_format'),
4+
'firstname' => trans('admin/settings/general.email_formats.first_name_format'),
5+
'lastname' => trans('admin/settings/general.email_formats.last_name_format'),
6+
'filastname' => trans('admin/settings/general.email_formats.filastname_format'),
7+
'lastnamefirstinitial' => trans('admin/settings/general.email_formats.lastnamefirstinitial_format'),
8+
'firstname_lastname' => trans('admin/settings/general.email_formats.firstname_lastname_underscore_format'),
9+
'firstinitial.lastname' => trans('admin/settings/general.email_formats.firstinitial_lastname'),
10+
'lastname_firstinitial' => trans('admin/settings/general.email_formats.lastname_firstinitial'),
11+
'lastname.firstinitial' => trans('admin/settings/general.email_formats.lastname_dot_firstinitial_format'),
12+
'firstnamelastname' => trans('admin/settings/general.email_formats.firstnamelastname'),
13+
'firstnamelastinitial' => trans('admin/settings/general.email_formats.firstnamelastinitial'),
14+
'lastname.firstname' => trans('admin/settings/general.email_formats.lastnamefirstname'),
15+
];
16+
@endphp
17+
18+
<x-input.select {{ $attributes }}>
19+
@foreach($formats as $format => $label)
20+
<option
21+
value="{{ $format }}"
22+
@selected($selected == $format)
23+
>
24+
{{ $label }}
25+
</option>
26+
@endforeach
27+
</x-input.select>

‎resources/views/partials/forms/edit/image-upload.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
@elseif (isset($item) && (isset($item->model)) && ($item->model->image != ''))
3939
<div class="form-group">
4040
<div class="col-md-8 col-md-offset-3">
41-
<p class="text-info">
42-
<x-icon type="info-circle" /> {{ trans('general.use_cloned_no_image_help') }}
41+
<p class="help-block">
42+
<x-icon type="info-circle" class="text-primary" /> {{ trans('general.use_cloned_no_image_help') }}
4343
</p>
4444
</div>
4545
</div>

‎resources/views/reports/licenses.blade.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class="table table-striped snipe-table"
3131
<th class="col-sm-1">{{ trans('admin/licenses/form.seats') }}</th>
3232
<th class="col-sm-1">{{ trans('admin/licenses/form.remaining_seats') }}</th>
3333
<th class="col-sm-1">{{ trans('admin/licenses/form.expiration') }}</th>
34+
<th class="col-sm-1">{{ trans('admin/licenses/form.termination_date') }}</th>
3435
<th class="col-sm-1">{{ trans('general.purchase_date') }}</th>
3536
<th class="col-sm-1 text-right" class="col-sm-1">{{ trans('general.purchase_cost') }}</th>
3637
<th class="col-sm-1">{{ trans('general.depreciation') }}</th>
@@ -54,6 +55,12 @@ class="table table-striped snipe-table"
5455
<td>{{ $license->seats }}</td>
5556
<td>{{ $license->remaincount() }}</td>
5657
<td>{{ $license->expiration_date }}</td>
58+
<td>{{ $license->termination_date }}
59+
@if ($license->isTerminated())
60+
<span class="text-danger">
61+
<x-icon type="warning" class="text-warning" />
62+
</span>
63+
@endif</td>
5764
<td>{{ $license->purchase_date }}</td>
5865
<td class="text-right">
5966
{{ $snipeSettings->default_currency }}{{ Helper::formatCurrencyOutput($license->purchase_cost) }}

‎resources/views/settings/general.blade.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,12 @@
8787
<label for="email_format">{{ trans('admin/settings/general.email_formats.email_format') }}</label>
8888
</div>
8989
<div class="col-md-8">
90-
{!! Form::email_format('email_format', old('email_format', $setting->email_format), 'select2') !!}
90+
<x-input.email-format-select
91+
name="email_format"
92+
:selected="old('email_format', $setting->email_format)"
93+
style="width: 100%"
94+
aria-label="email_format"
95+
/>
9196
{!! $errors->first('email_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
9297
</div>
9398
</div>

‎resources/views/settings/localization.blade.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@
5858
<label for="name_display_format">{{ trans('general.name_display_format') }}</label>
5959
</div>
6060
<div class="col-md-5 col-xs-12">
61-
{!! Form::name_display_format('name_display_format', old('name_display_format', $setting->name_display_format), 'select2') !!}
62-
61+
<x-input.select
62+
name="name_display_format"
63+
:options="['first_last' => trans('general.firstname_lastname_display'), 'last_first' => trans('general.lastname_firstname_display')]"
64+
:selected="old('name_display_format', $setting->name_display_format)"
65+
style="width: 100%"
66+
/>
6367
{!! $errors->first('name_display_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
6468
</div>
6569
</div>

‎resources/views/users/edit.blade.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,14 @@
295295

296296
<div class="col-md-8 col-md-offset-3">
297297
<label class="form-control form-control--disabled">
298-
{{ Form::checkbox('send_welcome', '1', old('send_welcome'), ['id' => "email_user_checkbox", 'aria-label'=>'send_welcome']) }}
298+
<input
299+
type="checkbox"
300+
name="send_welcome"
301+
id="email_user_checkbox"
302+
value="1"
303+
aria-label="send_welcome"
304+
@checked(old('send_welcome'))
305+
/>
299306
{{ trans('general.send_welcome_email_to_users') }}
300307
</label>
301308

‎tests/Feature/Assets/Ui/EditAssetTest.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ public function testNewCheckinIsLoggedIfStatusChangedToUndeployable()
7575
$user = User::factory()->create();
7676
$deployable_status = Statuslabel::factory()->rtd()->create();
7777
$achived_status = Statuslabel::factory()->archived()->create();
78-
$asset = Asset::factory()->assignedToUser($user)->create(['status_id' => $deployable_status->id]);
78+
$asset = Asset::factory()->assignedToUser($user)->create([
79+
'status_id' => $deployable_status->id,
80+
'last_checkin' => null,
81+
]);
7982
$this->assertTrue($asset->assignedTo->is($user));
8083

8184
$currentTimestamp = now();
@@ -96,6 +99,7 @@ public function testNewCheckinIsLoggedIfStatusChangedToUndeployable()
9699
$this->assertNull($asset->assigned_to);
97100
$this->assertNull($asset->assigned_type);
98101
$this->assertEquals($achived_status->id, $asset->status_id);
102+
$this->assertNotNull($asset->last_checkin);
99103

100104
Event::assertDispatched(function (CheckoutableCheckedIn $event) use ($currentTimestamp) {
101105
return (int) Carbon::parse($event->action_date)->diffInSeconds($currentTimestamp, true) < 2;

0 commit comments

Comments
 (0)