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

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-07 08:17:58 -07:00
parent 27ab0271a1 9f2fc21649
commit 508576544b
2 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
database/factories/LicenseFactory.php
View file

@ -31,13 +31,6 @@ $factory->state(App\Models\License::class, 'photoshop', function ($faker) {
'seats' => 10, 'seats' => 10,
]; ];
for ($x = 0; $x < $data['seats']; $x++) {
$seat = new App\Models\LicenseSeat;
$seat->license_id = 1;
$seat->create();
}
return $data; return $data;
}); });
@ -52,11 +45,6 @@ $factory->state(App\Models\License::class, 'acrobat', function ($faker) {
'seats' => 10, 'seats' => 10,
]; ];
for ($x = 0; $x < $data['seats']; $x++) {
$seat = new App\Models\LicenseSeat;
$seat->license_id = 2;
$seat->create();
}
return $data; return $data;
}); });
@ -70,11 +58,6 @@ $factory->state(App\Models\License::class, 'indesign', function ($faker) {
'seats' => 10, 'seats' => 10,
]; ];
for ($x = 0; $x < $data['seats']; $x++) {
$seat = new App\Models\LicenseSeat;
$seat->license_id = 3;
$seat->create();
}
return $data; return $data;
}); });
@ -89,11 +72,6 @@ $factory->state(App\Models\License::class, 'office', function ($faker) {
'seats' => 20, 'seats' => 20,
]; ];
for ($x = 0; $x < $data['seats']; $x++) {
$seat = new App\Models\LicenseSeat;
$seat->license_id = 4;
$seat->create();
}
return $data; return $data;
}); });

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

@ -167,7 +167,7 @@
'settings' => 'Settings', 'settings' => 'Settings',
'sign_in' => 'Sign in', 'sign_in' => 'Sign in',
'signature' => 'Signature', 'signature' => 'Signature',
'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation, and the data in this system will reset daily.', 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation and the data in this system will reset daily.',
'site_name' => 'Site Name', 'site_name' => 'Site Name',
'state' => 'State', 'state' => 'State',
'status_labels' => 'Status Labels', 'status_labels' => 'Status Labels',