shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated maintenance mode, commands and login

Browse Source
This commit is contained in:
denisdulici
2020-02-11 00:12:14 +03:00
parent 1b27e6fac8
commit b76698dbe1
7 changed files with 14 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Commands/FinishUpdate.php
View File

@@ -37,7 +37,7 @@ class FinishUpdate extends Command
*/
public function handle()
{
set_time_limit(900); // 15 minutes
set_time_limit(3600); // 1 hour
$this->info('Finishing update...');
@@ -56,7 +56,11 @@ class FinishUpdate extends Command
// Set locale for modules
if ($alias != 'core') {
app()->setLocale(Company::find($company_id)->locale);
$company = Company::find($company_id);
if (!empty($company->locale)) {
app()->setLocale($company->locale);
}
}
session(['company_id' => $company_id]);

2
app/Console/Commands/Update.php
View File

@@ -47,7 +47,7 @@ class Update extends Command
*/
public function handle()
{
set_time_limit(900); // 15 minutes
set_time_limit(3600); // 1 hour
$this->alias = $this->argument('alias');

11
app/Http/Controllers/Auth/Forgot.php
View File

@@ -10,17 +10,6 @@ use Illuminate\Support\Facades\Password;
class Forgot extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset emails and
| includes a trait which assists in sending these notifications from
| your application to your users. Feel free to explore this trait.
|
*/
use SendsPasswordResetEmails;
/**

17
app/Http/Controllers/Auth/Login.php
View File

@@ -9,17 +9,6 @@ use Illuminate\Support\Str;
class Login extends Controller
{
/*
|--------------------------------------------------------------------------
| Login Controller
|--------------------------------------------------------------------------
|
| This controller handles authenticating users for the application and
| redirecting them to your home screen. The controller uses a trait
| to conveniently provide its functionality to your applications.
|
*/
use AuthenticatesUsers;
/**
@@ -34,10 +23,6 @@ class Login extends Controller
*
* @return void
*/
/*public function __construct()
{
$this->middleware('guest')->except('logout');
}*/
public function __construct()
{
$this->middleware('guest', ['except' => 'destroy']);
@@ -104,7 +89,7 @@ class Login extends Controller
return response()->json($response);
}
session(['dashboard_id' => $user->dashboards()->pluck('id')->first()]);
session(['dashboard_id' => $user->dashboards()->enabled()->pluck('id')->first()]);
$response = [
'status' => null,

11
app/Http/Controllers/Auth/Reset.php
View File

@@ -10,17 +10,6 @@ use Illuminate\Support\Str;
class Reset extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset requests
| and uses a simple trait to include this behavior. You're free to
| explore this trait and override any methods you wish to tweak.
|
*/
use ResetsPasswords;
/**

2
app/Models/Common/Company.php
View File

@@ -268,7 +268,7 @@ class Company extends Eloquent
$search = $request->get('search');
$limit = $request->get('limit', setting('default.list_limit', '25'));
return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
return user()->companies()->usingSearchString($search)->sortable($sort)->paginate($limit);
}
/**