gavin/snipe-it
1
0
Fork 0
mirror of https://github.com/grokability/snipe-it.git synced 2026-03-12 17:52:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source 
# Conflicts:
#	public/js/dist/all.js
#	public/js/dist/all.js.map
#	public/mix-manifest.json
This commit is contained in:
snipe
2025-12-12 04:26:35 +00:00
parent 181cd7f0dc add1810fcc
commit 09e660a38c
12 changed files with 88 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Models/CheckoutAcceptance.php
View File

@@ -48,6 +48,30 @@ class CheckoutAcceptance extends Model
default => class_basename($type),
};
}
/**
* Accessor for the checkoutable item's category name.
*
* @return Attribute
*/
protected function checkoutableCategoryName(): Attribute
{
return Attribute::make(
get: function () {
$item = $this->checkoutable;
if ($item instanceof Asset) {
return $item->model?->category?->name;
}
if ($item instanceof LicenseSeat) {
return $item->license?->category?->name;
}
return $item->category?->name;
},
);
}
/**
* The resource that was is out
*

2
app/Models/Supplier.php
View File

@@ -35,7 +35,7 @@ class Supplier extends SnipeModel
'state' => 'min:2|max:191|nullable',
'country' => 'min:2|max:191|nullable',
'zip' => 'max:10|nullable',
'url' => 'sometimes|nullable|string|max:250',
'url' => 'sometimes|url|nullable|string|max:250',
];
/**

6
package-lock.json generated
View File

@@ -42,7 +42,7 @@
"devDependencies": {
"all-contributors-cli": "^6.26.1",
"axios": "^1.11.0",
"jquery": "<3.6.0",
"jquery": "^3.7.1",
"laravel-mix": "^6.0.49",
"lodash": "^4.17.20",
"postcss": "^8.5.6",
@@ -6678,7 +6678,9 @@
}
},
"node_modules/jquery": {
"version": "3.5.1",
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
"integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
"license": "MIT"
},
"node_modules/jquery-knob": {

2
package.json
View File

@@ -18,7 +18,7 @@
"devDependencies": {
"all-contributors-cli": "^6.26.1",
"axios": "^1.11.0",
"jquery": "<3.6.0",
"jquery": "^3.7.1",
"laravel-mix": "^6.0.49",
"lodash": "^4.17.20",
"postcss": "^8.5.6",

2
public/js/dist/all.js vendored
View File

File diff suppressed because one or more lines are too long

20
public/js/dist/all.js.LICENSE.txt vendored
View File

@@ -28,17 +28,6 @@
* https://github.com/select2/select2/blob/master/LICENSE.md
*/
/*!
* Sizzle CSS Selector Engine v2.3.5
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
* Date: 2020-03-14
*/
/*!
* clipboard.js v2.0.11
* https://clipboardjs.com/
@@ -47,17 +36,14 @@
*/
/*!
* jQuery JavaScript Library v3.5.1
* jQuery JavaScript Library v3.7.1
* https://jquery.com/
*
* Includes Sizzle.js
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2020-05-04T22:49Z
* Date: 2023-08-28T13:37Z
*/
/*!

2
public/js/dist/all.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@@ -1,5 +1,5 @@
{
"/js/dist/all.js": "/js/dist/all.js?id=eaf7be52c739b83e9282d20981db0a07",
"/js/dist/all.js": "/js/dist/all.js?id=2dd258bb47be82b0a9237c513bddf2d1",
"/css/build/overrides.css": "/css/build/overrides.css?id=955f1204631dbea12cd1b6cdf5c12b50",
"/css/build/app.css": "/css/build/app.css?id=92f5873bc1425b14b040c51ad53db7a3",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=bdf169bc2141f453390614c138cdce95",

2
resources/views/account/accept/index.blade.php
View File

@@ -31,6 +31,7 @@
<tr>
<th>{{ trans('general.name')}}</th>
<th>{{ trans('general.type')}}</th>
<th>{{ trans('general.category')}}</th>
<th>{{ trans('general.qty') }}</th>
<th>{{ trans('general.serial_number')}}</th>
<th>{{ trans('table.actions')}}</th>
@@ -42,6 +43,7 @@
@if ($acceptance->checkoutable)
<td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->present()->name : '' }}</td>
<td>{{ $acceptance->checkoutable_item_type }}</td>
<td>{{ $acceptance->checkoutable_category_name ?? '' }}</td>
<td>{{ $acceptance->qty ?? '1' }}</td>
<td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->serial : '' }}</td>
<td><a href="{{ route('account.accept.item', $acceptance) }}" class="btn btn-theme btn-sm">{{ trans('general.accept_decline') }}</a></td>

19
resources/views/layouts/default.blade.php
View File

@@ -62,7 +62,7 @@
--table-border-row: 1px solid var(--table-border-row-color);
--table-stripe-bg-alt: light-dark(rgba(211, 211, 211, 0.25), #323131);
--table-stripe-bg: light-dark(#ffffff, #494747);
--text-danger: light-dark(#a94442,#dd4b39);
--text-danger: light-dark(#a94442, #fa5b48);
--text-help: light-dark(#605e5e,#a6a4a4);
--text-info: light-dark(#31708f,#2baae6);
--text-success: light-dark(#039516,#4ced61);
@@ -148,7 +148,7 @@
.footer-links a {
color: light-dark(hsl(from var(--link-color) h s calc(l + 10)),hsl(from var(--link-color) h s calc(l - 32))) !important;
color: var(--link-color) !important;
}
h2 small {
@@ -666,7 +666,7 @@
.table > tfoot > tr > th,
.table > thead > tr > td,
.table > tbody > tr > td,
.table > tfoot > tr > td,
.table > tfoot > tr > td
{
border-top-color: var(--box-header-bottom-border-color) !important;
@@ -685,6 +685,10 @@
color: var(--text-danger) !important;
}
.has-error .form-control {
border-color: var(--text-danger);
}
.alert a {
color: white !important;
}
@@ -735,6 +739,15 @@
box-shadow: inset 1em 1em hsl(from var(--main-theme-color) h s calc(l - 20)) !important;
}
input[type="checkbox"],
input[type="radio"],
label.form-control
{
cursor: pointer !important;
}
.callout.callout-legend {
background-color: var(--callout-bg-color);
border-left: 5px solid var(--callout-left-border);

33
resources/views/modals/supplier.blade.php
View File

@@ -12,6 +12,39 @@
<div class="dynamic-form-row">
@include('partials.forms.edit.name', [ 'item' => new \App\Models\Supplier(), 'translated_name' => trans('admin/suppliers/table.name')])
</div>
<div class="dynamic-form-row">
<div class="form-group {{ $errors->has('contact') ? ' has-error' : '' }}">
<label for="contact" class="col-md-3 control-label">{{ trans('admin/suppliers/table.contact') }}</label>
<div class="col-md-7">
<input class="form-control" name="contact" type="text" id="contact" value="{{ old('contact') }}">
</div>
</div>
</div>
<div class="dynamic-form-row">
<div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
<label for="contact" class="col-md-3 control-label">{{ trans('general.url') }}</label>
<div class="col-md-7">
<input class="form-control" name="url" type="text" id="url" value="{{ old('url') }}">
</div>
</div>
</div>
<div class="dynamic-form-row">
@include('partials.forms.edit.phone', [ 'item' => new \App\Models\Supplier(), 'translated_name' => trans('admin/suppliers/table.phone')])
</div>
<div class="dynamic-form-row">
@include('partials.forms.edit.fax', [ 'item' => new \App\Models\Supplier(), 'translated_name' => trans('admin/suppliers/table.fax')])
</div>
<div class="dynamic-form-row">
@include('partials.forms.edit.email', [ 'item' => new \App\Models\Supplier(), 'translated_name' => trans('admin/suppliers/table.email')])
</div>
<div class="dynamic-form-row">
@include ('partials.forms.edit.notes')
</div>
</form>
</div>
<div class="dynamic-form-row">

3
resources/views/partials/bootstrap-table.blade.php
View File

@@ -745,7 +745,7 @@
window.location.href = '{{ route('licenses.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@@ -761,7 +761,6 @@
window.location.href = '{{ route('licenses.export', ['category_id' => (isset($category)) ? $category->id :'' ]) }}';
},
attributes: {
class: 'btn-warning',
title: '{{ trans('general.export_all_to_csv') }}',
}
},