diff --git a/app/Traits/SiteApi.php b/app/Traits/SiteApi.php index bf79ac3e7..0c2a8c5cf 100644 --- a/app/Traits/SiteApi.php +++ b/app/Traits/SiteApi.php @@ -16,7 +16,7 @@ trait SiteApi $headers['headers'] = [ 'Authorization' => 'Bearer ' . setting('apps.api_key'), 'Accept' => 'application/json', - 'Referer' => url('/'), + 'Referer' => app()->runningInConsole() ? config('app.url') : url('/'), 'Akaunting' => version('short'), 'Language' => language()->getShortCode(), ]; diff --git a/app/Utilities/Info.php b/app/Utilities/Info.php index 0d1453eab..57b6d004a 100644 --- a/app/Utilities/Info.php +++ b/app/Utilities/Info.php @@ -2,34 +2,28 @@ namespace App\Utilities; -use DB; +use App\Models\Auth\User; use App\Models\Common\Company; +use DB; 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() { - $v = array(); - - $v['akaunting'] = version('short'); - - $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; + return [ + 'akaunting' => version('short'), + 'php' => static::phpVersion(), + 'mysql' => static::mysqlVersion(), + ]; } public static function phpVersion() @@ -39,11 +33,10 @@ class Info public static function mysqlVersion() { - if(env('DB_CONNECTION') === 'mysql') - { + if (env('DB_CONNECTION') === 'mysql') { return DB::selectOne('select version() as mversion')->mversion; } - return "N/A"; + return 'N/A'; } } \ No newline at end of file