DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #3104, #2914 and #2918 - auto-increment incorrectly generating next ID

Browse source
This commit is contained in:
snipe 2017-01-06 02:52:10 -08:00
parent 3e4152c966
commit a8839e0ef4
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Models/Asset.php
View file

@ -485,9 +485,12 @@ class Asset extends Depreciable
$settings = \App\Models\Setting::getSettings(); $settings = \App\Models\Setting::getSettings();
if ($settings->auto_increment_assets == '1') { if ($settings->auto_increment_assets == '1') {
$asset_tag = \DB::table('assets') $temp_asset_tag = \DB::table('assets')
->where('physical', '=', '1') ->where('physical', '=', '1')
->max('id'); ->max('asset_tag');
$asset_tag_digits = number_format(preg_replace('/\D/', '', $temp_asset_tag));
$asset_tag = number_format(preg_replace('/^0*/', '', $asset_tag_digits));
if ($settings->zerofill_count > 0) { if ($settings->zerofill_count > 0) {
return $settings->auto_increment_prefix.Asset::zerofill(($asset_tag + 1),$settings->zerofill_count); return $settings->auto_increment_prefix.Asset::zerofill(($asset_tag + 1),$settings->zerofill_count);