DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #8671 from mzack5020/patch-1

Browse source 
Fixed #8624 #8312: Re-Added Accessories API
This commit is contained in:
snipe 2020-11-03 13:50:38 -08:00 committed by GitHub
parent df5972c4fa 911841d188
commit 432263f09f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ReportsController.php
View file

@ -682,7 +682,7 @@ class ReportsController extends Controller
$diff = ($asset->purchase_cost - $depreciation); $diff = ($asset->purchase_cost - $depreciation);
$row[] = Helper::formatCurrencyOutput($depreciation); $row[] = Helper::formatCurrencyOutput($depreciation);
$row[] = Helper::formatCurrencyOutput($diff); $row[] = Helper::formatCurrencyOutput($diff);
$row[] = ($asset->depreciated_date()!='') ? $asset->depreciated_date()->format('Y-m-d') : ''; $row[] = ($asset->depreciation) ? $asset->depreciated_date()->format('Y-m-d') : '';
} }
if ($request->filled('checkout_date')) { if ($request->filled('checkout_date')) {

8
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v5.0.5', 'app_version' => 'v5.0.5-pre',
'full_app_version' => 'v5.0.5 - build 5457-', 'full_app_version' => 'v5.0.5-pre - build 5457-',
'build_version' => '5457', 'build_version' => '5457',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => '', 'hash_version' => '',
'full_hash' => 'v5.0.4', 'full_hash' => 'v5.0.5-pre',
'branch' => 'develop', 'branch' => 'master',
); );

2
resources/lang/en/admin/settings/general.php
View file

@ -6,7 +6,7 @@ return array(
'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.',
'ad_append_domain_label' => 'Append domain name', 'ad_append_domain_label' => 'Append domain name',
'ad_append_domain' => 'Append domain name to username field', 'ad_append_domain' => 'Append domain name to username field',
'ad_append_domain_help' => 'User doesn\'t require to write "username@domain.local", they can just type "username".' , 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".' ,
'admin_cc_email' => 'CC Email', 'admin_cc_email' => 'CC Email',
'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
'is_ad' => 'This is an Active Directory server', 'is_ad' => 'This is an Active Directory server',

6
routes/api.php
View file

@ -808,10 +808,10 @@ Route::group(['prefix' => 'v1','namespace' => 'Api', 'middleware' => 'auth:api']
); );
Route::get('{user}/licenses', Route::get('{user}/accessories',
[ [
'as' => 'api.users.licenselist', 'as' => 'api.users.accessorieslist',
'uses' => 'UsersController@licenses' 'uses' => 'UsersController@accessories'
] ]
); );