Skip to content

Commit 2fcd8cd

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 0ffa47a + 9c06ff3 commit 2fcd8cd

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/Models/SnipeModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function setPurchaseDateAttribute($value)
2121
*/
2222
public function setPurchaseCostAttribute($value)
2323
{
24-
if (is_float($value)) {
24+
if (is_numeric($value)) {
2525
//value is *already* a floating-point number. Just assign it directly
2626
$this->attributes['purchase_cost'] = $value;
2727
return;

resources/views/partials/bootstrap-table.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1340,7 +1340,7 @@ function numberWithCommas(value) {
13401340
window.location.href = '{{ route('maintenances.create', ['asset_id' => (isset($asset)) ? $asset->id :'' ]) }}';
13411341
},
13421342
attributes: {
1343-
title: '{{ trans('general.create') }}',
1343+
title: '{{ trans('button.add_maintenance') }}',
13441344
}
13451345
},
13461346
@endcan

0 commit comments

Comments
 (0)