formatting

akaunting · Nov 16, 2019 · a8c5aa7 · a8c5aa7
1 parent 0d53067
commit a8c5aa7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/app/Http/Controllers/Auth/Login.php b/app/Http/Controllers/Auth/Login.php
@@ -84,7 +84,7 @@ public function store(Request $request)
         }
 
         // Check if is customer
-        if ($user->contact) {
+        if ($user->can('read-client-portal')) {
             $path = session('url.intended', 'portal');
 
             // Path must start with 'portal' prefix

diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php
@@ -81,7 +81,7 @@ public function store(Request $request)
      */
     public function edit(User $user)
     {
-        if ($user->contact) {
+        if ($user->can('read-client-portal')) {
             // Show only roles with customer permission
             $roles = Role::all()->reject(function ($r) {
                 return !$r->hasPermission('read-client-portal');

diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php
@@ -65,7 +65,7 @@ public function show(Bill $bill)
 
         $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();
 

diff --git a/app/Http/ViewComposers/Header.php b/app/Http/ViewComposers/Header.php
@@ -27,8 +27,8 @@ public function compose(View $view)
         $company = null;
 
         // Get customer company
-        if ($user->contact) {
-            $company = (object)[
+        if ($user->can('read-client-portal')) {
+            $company = (object) [
                 'company_name' => setting('company.name'),
                 'company_email' => setting('company.email'),
                 'company_address' => setting('company.address'),

diff --git a/app/Listeners/Income/CreateInvoiceTransaction.php b/app/Listeners/Income/CreateInvoiceTransaction.php
@@ -26,21 +26,19 @@ public function handle(Event $event)
         } catch (\Exception $e) {
             $message = $e->getMessage();
 
-            $user = user();
-
-            if ($user) {
-                if ($user->contact) {
-                    flash($message)->error();
+            if (!$user = user()) {
+                flash($message)->error();
+
+                redirect()->route('signed.invoices.show', $invoice->id)->send();
+            }
 
-                    redirect()->route('portal.invoices.show', $invoice->id)->send();
-                }
+            if ($user->can('read-client-portal')) {
+                flash($message)->error();
 
-                throw new \Exception($message);
+                redirect()->route('portal.invoices.show', $invoice->id)->send();
             }
 
-            flash($message)->error();
-
-            redirect()->route('signed.invoices.show', $invoice->id)->send();
+            throw new \Exception($message);
         }
     }
 }