From 0dc9b3fceb08d5a6a47dd1994ea25ff5cf364585 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 4 Jul 2016 19:49:01 +0300
Subject: [PATCH] Made 'viewable' scope default behavior

---
 app/Http/Controllers/CreditController.php  | 2 +-
 app/Http/Controllers/PaymentController.php | 3 +--
 app/Http/Controllers/QuoteController.php   | 2 +-
 app/Http/Controllers/TaskController.php    | 4 ++--
 app/Models/EntityModel.php                 | 9 ---------
 database/seeds/UserTableSeeder.php         | 2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index e9b66d6e8b85..1a3db4b8d7cf 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -62,7 +62,7 @@ class CreditController extends BaseController
             'method' => 'POST',
             'url' => 'credits',
             'title' => trans('texts.new_credit'),
-            'clients' => Client::scope()->viewable()->with('contacts')->orderBy('name')->get(), 
+            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(), 
         ];
 
         return View::make('credits.edit', $data);
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 2d6c32de18a3..847e7fc0f024 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -94,7 +94,6 @@ class PaymentController extends BaseController
     public function create(PaymentRequest $request)
     {
         $invoices = Invoice::scope()
-                    ->viewable()
                     ->invoiceType(INVOICE_TYPE_STANDARD)
                     ->where('is_recurring', '=', false)
                     ->where('invoices.balance', '>', 0)
@@ -111,7 +110,7 @@ class PaymentController extends BaseController
             'url' => 'payments',
             'title' => trans('texts.new_payment'),
             'paymentTypeId' => Input::get('paymentTypeId'),
-            'clients' => Client::scope()->viewable()->with('contacts')->orderBy('name')->get(), ];
+            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(), ];
 
         return View::make('payments.edit', $data);
     }
diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index d57b9f192969..996febdc5f39 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -123,7 +123,7 @@ class QuoteController extends BaseController
           'taxRateOptions' => $options,
           'defaultTax' => $defaultTax,
           'countries' => Cache::get('countries'),
-          'clients' => Client::scope()->viewable()->with('contacts', 'country')->orderBy('name')->get(),
+          'clients' => Client::scope()->with('contacts', 'country')->orderBy('name')->get(),
           'taxRates' => TaxRate::scope()->orderBy('name')->get(),
           'currencies' => Cache::get('currencies'),
           'sizes' => Cache::get('sizes'),
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index d63aea8cf92c..fb0248be401d 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -213,7 +213,7 @@ class TaskController extends BaseController
     private static function getViewModel()
     {
         return [
-            'clients' => Client::scope()->viewable()->with('contacts')->orderBy('name')->get(),
+            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(),
             'account' => Auth::user()->account,
         ];
     }
@@ -302,7 +302,7 @@ class TaskController extends BaseController
             }
         }
     }
-    
+
     private function checkTimezone()
     {
         if (!Auth::user()->account->timezone) {
diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php
index 9e350f9ba8b7..22874ace4a65 100644
--- a/app/Models/EntityModel.php
+++ b/app/Models/EntityModel.php
@@ -121,15 +121,6 @@ class EntityModel extends Eloquent
             }
         }
 
-        return $query;
-    }
-
-    /**
-     * @param $query
-     * @return mixed
-     */
-    public function scopeViewable($query)
-    {
         if (Auth::check() && ! Auth::user()->hasPermission('view_all')) {
             $query->where($this->getEntityType(). 's.user_id', '=', Auth::user()->id);
         }
diff --git a/database/seeds/UserTableSeeder.php b/database/seeds/UserTableSeeder.php
index 990c7c53ae6f..ec4f0ae8f40b 100644
--- a/database/seeds/UserTableSeeder.php
+++ b/database/seeds/UserTableSeeder.php
@@ -77,7 +77,7 @@ class UserTableSeeder extends Seeder
             'account_id' => $account->id,
             'client_id' => $client->id,
             'public_id' => 1,
-            'email' => TEST_USERNAME,
+            'email' => env('TEST_EMAIL', TEST_USERNAME),
             'is_primary' => true,
         ]);