formatting

This commit is contained in:
denisdulici 2019-12-18 15:29:59 +03:00
parent 4914e34f6c
commit 2a35ffe2ec
2 changed files with 18 additions and 25 deletions

View File

@ -16,7 +16,7 @@ trait SiteApi
$headers['headers'] = [ $headers['headers'] = [
'Authorization' => 'Bearer ' . setting('apps.api_key'), 'Authorization' => 'Bearer ' . setting('apps.api_key'),
'Accept' => 'application/json', 'Accept' => 'application/json',
'Referer' => url('/'), 'Referer' => app()->runningInConsole() ? config('app.url') : url('/'),
'Akaunting' => version('short'), 'Akaunting' => version('short'),
'Language' => language()->getShortCode(), 'Language' => language()->getShortCode(),
]; ];

View File

@ -2,34 +2,28 @@
namespace App\Utilities; namespace App\Utilities;
use DB; use App\Models\Auth\User;
use App\Models\Common\Company; use App\Models\Common\Company;
use DB;
class Info class Info
{ {
public static function all()
{
return array_merge(static::versions(), [
'api_key' => setting('apps.api_key'),
'companies' => Company::all()->count(),
'users' => User::all()->count(),
]);
}
public static function versions() public static function versions()
{ {
$v = array(); return [
'akaunting' => version('short'),
$v['akaunting'] = version('short'); 'php' => static::phpVersion(),
'mysql' => static::mysqlVersion(),
$v['php'] = static::phpVersion(); ];
$v['mysql'] = static::mysqlVersion();
return $v;
}
public static function all()
{
$data = static::versions();
$data['token'] = setting('apps.api_key');
$data['companies'] = Company::all()->count();
return $data;
} }
public static function phpVersion() public static function phpVersion()
@ -39,11 +33,10 @@ class Info
public static function mysqlVersion() public static function mysqlVersion()
{ {
if(env('DB_CONNECTION') === 'mysql') if (env('DB_CONNECTION') === 'mysql') {
{
return DB::selectOne('select version() as mversion')->mversion; return DB::selectOne('select version() as mversion')->mversion;
} }
return "N/A"; return 'N/A';
} }
} }