DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 13:57:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5 from snipe/develop

Browse source 
Develop
This commit is contained in:
Nuraeil 2021-11-19 11:51:16 +01:00 committed by GitHub
parent 7084703b5a df0b240a05
commit 6eb120d101
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 961 additions and 553 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Presenters/AccessoryPresenter.php
View file

@ -103,6 +103,7 @@ class AccessoryPresenter extends Presenter
'sortable' => true,
'title' => trans('general.purchase_cost'),
'footerFormatter' => 'sumFormatter',
'class' => 'text-right',
], [
'field' => 'order_number',
'searchable' => true,

1
app/Presenters/AssetAuditPresenter.php
View file

@ -130,6 +130,7 @@ class AssetAuditPresenter extends Presenter
'visible' => false,
'title' => trans('general.purchase_cost'),
'footerFormatter' => 'sumFormatter',
'class' => 'text-right',
], [
'field' => 'order_number',
'searchable' => true,

1
app/Presenters/AssetMaintenancesPresenter.php
View file

@ -100,6 +100,7 @@ class AssetMaintenancesPresenter extends Presenter
'searchable' => true,
'sortable' => true,
'title' => trans('admin/asset_maintenances/form.cost'),
'class' => 'text-right',
], [
'field' => 'user_id',
'searchable' => true,

1
app/Presenters/AssetPresenter.php
View file

@ -146,6 +146,7 @@ class AssetPresenter extends Presenter
'sortable' => true,
'title' => trans('general.purchase_cost'),
'footerFormatter' => 'sumFormatter',
'class' => 'text-right',
], [
'field' => 'order_number',
'searchable' => true,

1
app/Presenters/ComponentPresenter.php
View file

@ -102,6 +102,7 @@ class ComponentPresenter extends Presenter
'title' => trans('general.purchase_cost'),
'visible' => true,
'footerFormatter' => 'sumFormatter',
'class' => 'text-right',
],
];

1
app/Presenters/ConsumablePresenter.php
View file

@ -114,6 +114,7 @@ class ConsumablePresenter extends Presenter
'title' => trans('general.purchase_cost'),
'visible' => true,
'footerFormatter' => 'sumFormatter',
'class' => 'text-right',
], [
'field' => 'change',
'searchable' => false,

3
app/Presenters/DepreciationReportPresenter.php
View file

@ -128,6 +128,7 @@ class DepreciationReportPresenter extends Presenter
"visible" => true,
"title" => trans('general.purchase_cost'),
"footerFormatter" => 'sumFormatter',
"class" => "text-right",
], [
"field" => "order_number",
"searchable" => true,
@ -148,6 +149,7 @@ class DepreciationReportPresenter extends Presenter
"visible" => true,
"title" => trans('admin/hardware/table.book_value'),
"footerFormatter" => 'sumFormatter',
"class" => "text-right",
], [
"field" => "monthly_depreciation",
"searchable" => true,
@ -161,6 +163,7 @@ class DepreciationReportPresenter extends Presenter
"visible" => true,
"title" => trans('admin/hardware/table.diff'),
"footerFormatter" => 'sumFormatter',
"class" => "text-right",
],[
"field" => "warranty_expires",
"searchable" => false,

1
app/Presenters/LicensePresenter.php
View file

@ -137,6 +137,7 @@ class LicensePresenter extends Presenter
'visible' => false,
'title' => trans('general.purchase_cost'),
'footerFormatter' => 'sumFormatter',
'class' => 'text-right',
], [
'field' => 'purchase_order',
'searchable' => true,

12
composer.json
View file

@ -11,7 +11,7 @@
"license": "AGPL-3.0-or-later",
"type": "project",
"require": {
"php": "^7.3",
"php": ">=7.4 <8.1",
"ext-curl": "*",
"ext-fileinfo": "*",
"ext-json": "*",
@ -19,7 +19,7 @@
"ext-pdo": "*",
"adldap2/adldap2": "^10.2",
"alek13/slack": "^2.0",
"bacon/bacon-qr-code": "^1.0",
"bacon/bacon-qr-code": "^2.0",
"barryvdh/laravel-debugbar": "^3.6",
"doctrine/cache": "^1.10",
"doctrine/common": "^2.12",
@ -42,13 +42,13 @@
"laravel/tinker": "^2.6",
"laravel/ui": "^3.3",
"laravelcollective/html": "^6.2",
"lcobucci/clock": "1.2.0",
"lcobucci/jwt": "^3.4.5",
"lcobucci/clock": "1.2.0|2.0.0",
"lcobucci/jwt": "^3.4.5|^4.0.4",
"league/csv": "^9.7",
"league/flysystem-aws-s3-v3": "^1.0",
"league/flysystem-cached-adapter": "^1.1",
"livewire/livewire": "^2.4",
"mediconesystems/livewire-datatables": "^0.4.3",
"mediconesystems/livewire-datatables": "^0.5.0",
"neitanod/forceutf8": "^2.0",
"nesbot/carbon": "^2.32",
"nunomaduro/collision": "^5.4",
@ -71,7 +71,7 @@
"codeception/module-laravel5": "^1.1",
"codeception/module-rest": "^1.2",
"codeception/module-webdriver": "^1.0",
"fzaninotto/faker": "^1.9",
"fzaninotto/faker": "master@dev",
"overtrue/phplint": "^3.0",
"phpunit/php-token-stream": "^3.1",
"phpunit/phpunit": "^8.5",

1490
composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
routes/web/components.php
View file

@ -23,7 +23,7 @@ Route::group(['prefix' => 'components', 'middleware' => ['auth']], function () {
Route::post(
'{componentID}/checkin/{backto?}',
[Components\ComponentCheckinController::class, 'store']
)->name('checkout/component');
)->name('component.checkin.save');
});