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

formatting

Browse Source
This commit is contained in:
denisdulici 2019-11-16 17:38:48 +03:00
parent 0d53067f7b
commit a8c5aa7efd
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ class Login extends Controller
} }
// Check if is customer // Check if is customer
if ($user->contact) { if ($user->can('read-client-portal')) {
$path = session('url.intended', 'portal'); $path = session('url.intended', 'portal');
// Path must start with 'portal' prefix // Path must start with 'portal' prefix

2
app/Http/Controllers/Auth/Users.php
View File

@ -81,7 +81,7 @@ class Users extends Controller
*/ */
public function edit(User $user) public function edit(User $user)
{ {
if ($user->contact) { if ($user->can('read-client-portal')) {
// Show only roles with customer permission // Show only roles with customer permission
$roles = Role::all()->reject(function ($r) { $roles = Role::all()->reject(function ($r) {
return !$r->hasPermission('read-client-portal'); return !$r->hasPermission('read-client-portal');

2
app/Http/Controllers/Expenses/Bills.php
View File

@ -65,7 +65,7 @@ class Bills extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray(); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$currency = Currency::where('code', $bil->currency_code)->first(); $currency = Currency::where('code', $bill->currency_code)->first();
$account_currency_code = Account::where('id', setting('default.account'))->pluck('currency_code')->first(); $account_currency_code = Account::where('id', setting('default.account'))->pluck('currency_code')->first();

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

@ -27,8 +27,8 @@ class Header
$company = null; $company = null;
// Get customer company // Get customer company
if ($user->contact) { if ($user->can('read-client-portal')) {
$company = (object)[ $company = (object) [
'company_name' => setting('company.name'), 'company_name' => setting('company.name'),
'company_email' => setting('company.email'), 'company_email' => setting('company.email'),
'company_address' => setting('company.address'), 'company_address' => setting('company.address'),

14
app/Listeners/Income/CreateInvoiceTransaction.php
View File

@ -26,10 +26,13 @@ class CreateInvoiceTransaction
} catch (\Exception $e) { } catch (\Exception $e) {
$message = $e->getMessage(); $message = $e->getMessage();
$user = user(); if (!$user = user()) {
flash($message)->error();
if ($user) { redirect()->route('signed.invoices.show', $invoice->id)->send();
if ($user->contact) { }
if ($user->can('read-client-portal')) {
flash($message)->error(); flash($message)->error();
redirect()->route('portal.invoices.show', $invoice->id)->send(); redirect()->route('portal.invoices.show', $invoice->id)->send();
@ -37,10 +40,5 @@ class CreateInvoiceTransaction
throw new \Exception($message); throw new \Exception($message);
} }
flash($message)->error();
redirect()->route('signed.invoices.show', $invoice->id)->send();
}
} }
} }