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

fixed error pages

Browse Source
This commit is contained in:
denisdulici
2019-12-26 10:53:50 +03:00
parent ef95a33648
commit 6f7d94e676
11 changed files with 374 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
app/Http/ViewComposers/Header.php
View File

@ -2,7 +2,6 @@
namespace App\Http\ViewComposers;
use Auth;
use App\Utilities\Updater;
use Illuminate\View\View;
use App\Traits\Modules as RemoteModules;
@ -21,42 +20,43 @@ class Header
{
$user = user();
$bills = [];
$invoices = [];
$notifications = 0;
$invoices = $bills = [];
$updates = $notifications = 0;
$company = null;
// Get customer company
if ($user->can('read-client-portal')) {
$company = (object) [
'company_name' => setting('company.name'),
'company_email' => setting('company.email'),
'company_address' => setting('company.address'),
'company_logo' => setting('company.logo'),
];
}
$undereads = $user->unreadNotifications;
foreach ($undereads as $underead) {
$data = $underead->getAttribute('data');
switch ($underead->getAttribute('type')) {
case 'App\Notifications\Expense\Bill':
$bills[$data['bill_id']] = $data['amount'];
$notifications++;
break;
case 'App\Notifications\Income\Invoice':
$invoices[$data['invoice_id']] = $data['amount'];
$notifications++;
break;
if (!empty($user)) {
// Get customer company
if ($user->can('read-client-portal')) {
$company = (object) [
'company_name' => setting('company.name'),
'company_email' => setting('company.email'),
'company_address' => setting('company.address'),
'company_logo' => setting('company.logo'),
];
}
$undereads = $user->unreadNotifications;
foreach ($undereads as $underead) {
$data = $underead->getAttribute('data');
switch ($underead->getAttribute('type')) {
case 'App\Notifications\Expense\Bill':
$bills[$data['bill_id']] = $data['amount'];
$notifications++;
break;
case 'App\Notifications\Income\Invoice':
$invoices[$data['invoice_id']] = $data['amount'];
$notifications++;
break;
}
}
$updates = count(Updater::all());
$this->loadSuggestions();
}
$updates = count(Updater::all());
$this->loadSuggestions();
$view->with([
'user' => $user,
'notifications' => $notifications,

2
app/Http/ViewComposers/Notifications.php
View File

@ -19,7 +19,7 @@ class Notifications
public function compose(View $view)
{
// No need to add suggestions in console
if (app()->runningInConsole() || !env('APP_INSTALLED')) {
if (app()->runningInConsole() || !env('APP_INSTALLED') || !user()) {
return;
}

32
app/Http/ViewComposers/Suggestions.php
View File

@ -26,26 +26,28 @@ class Suggestions
$modules = false;
$path = Route::current()->uri();
if (user()) {
$path = Route::current()->uri();
if ($path) {
$suggestions = $this->getSuggestions($path);
if ($path) {
$suggestions = $this->getSuggestions($path);
if ($suggestions) {
$suggestion_modules = $suggestions->modules;
foreach ($suggestion_modules as $key => $module) {
$installed = Module::where('company_id', session('company_id'))->where('alias', $module->alias)->first();
if ($suggestions) {
$suggestion_modules = $suggestions->modules;
foreach ($suggestion_modules as $key => $module) {
$installed = Module::where('company_id', '=', session('company_id'))->where('alias', '=', $module->alias)->first();
if ($installed) {
unset($suggestion_modules[$key]);
if ($installed) {
unset($suggestion_modules[$key]);
}
}
}
if ($suggestion_modules) {
shuffle($suggestion_modules);
if ($suggestion_modules) {
shuffle($suggestion_modules);
$modules[] = $suggestion_modules[0];
$modules[] = $suggestion_modules[0];
}
}
}
}