Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 10:04:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2021-03-09 21:34:39 +11:00
parent cc563a9d5e
commit d7d0768eae
7 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Factory/CompanyFactory.php
View File

@ -35,6 +35,7 @@ class CompanyFactory
$company->custom_fields = (object) []; $company->custom_fields = (object) [];
$company->subdomain = ''; $company->subdomain = '';
$company->enabled_modules = config('ninja.enabled_modules'); //32767;//8191; //4095 $company->enabled_modules = config('ninja.enabled_modules'); //32767;//8191; //4095
$company->default_password_timeout = 30;
return $company; return $company;
} }

1
app/Factory/UserFactory.php
View File

@ -28,7 +28,6 @@ class UserFactory
$user->failed_logins = 0; $user->failed_logins = 0;
$user->signature = ''; $user->signature = '';
$user->theme_id = 0; $user->theme_id = 0;
$user->default_password_timeout = 30;
return $user; return $user;
} }

1
app/Models/Company.php
View File

@ -86,6 +86,7 @@ class Company extends BaseModel
'session_timeout', 'session_timeout',
'oauth_password_required', 'oauth_password_required',
'invoice_task_datelog', 'invoice_task_datelog',
'default_password_timeout',
]; ];
protected $hidden = [ protected $hidden = [

1
app/Models/User.php
View File

@ -82,7 +82,6 @@ class User extends Authenticatable implements MustVerifyEmail
'custom_value4', 'custom_value4',
'is_deleted', 'is_deleted',
'google_2fa_secret', 'google_2fa_secret',
'default_password_timeout',
]; ];
/** /**

1
app/Transformers/CompanyTransformer.php
View File

@ -154,6 +154,7 @@ class CompanyTransformer extends EntityTransformer
'expense_amount_is_pretax' =>(bool)true, //@deprecate 1-2-2021 'expense_amount_is_pretax' =>(bool)true, //@deprecate 1-2-2021
'oauth_password_required' => (bool)$company->oauth_password_required, 'oauth_password_required' => (bool)$company->oauth_password_required,
'session_timeout' => (int)$company->session_timeout, 'session_timeout' => (int)$company->session_timeout,
'default_password_timeout' => (int) $company->default_password_timeout,
]; ];
} }

1
database/factories/UserFactory.php
View File

@ -37,7 +37,6 @@ class UserFactory extends Factory
'email_verified_at' => now(), 'email_verified_at' => now(),
'password' => bcrypt(config('ninja.testvars.password')), // secret 'password' => bcrypt(config('ninja.testvars.password')), // secret
'remember_token' => \Illuminate\Support\Str::random(10), 'remember_token' => \Illuminate\Support\Str::random(10),
'default_password_timeout' => 30,
]; ];
} }
} }

5
database/migrations/2021_03_08_205030_add_russian_lang.php
View File

@ -1,5 +1,6 @@
<?php <?php
use App\Models\Company;
use App\Models\Language; use App\Models\Language;
use App\Models\User; use App\Models\User;
use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Migrations\Migration;
@ -21,11 +22,11 @@ class AddRussianLang extends Migration
Language::unguard(); Language::unguard();
Language::create($russian); Language::create($russian);
Schema::table('users', function (Blueprint $table) { Schema::table('companies', function (Blueprint $table) {
$table->integer('default_password_timeout')->default(30); $table->integer('default_password_timeout')->default(30);
}); });
User::whereNotNull('id')->update(['default_password_timeout' => 30]); Company::whereNotNull('id')->update(['default_password_timeout' => 30]);
} }