Update Namespaces

app/Models/Account.php

@@ -1,4 +1,4 @@
-<?php
+<?php  namespace App\Models;
 
 class Account extends Eloquent
 {

app/Models/AccountGateway.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class AccountGateway extends EntityModel
 {

app/Models/AccountGatewayToken.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class AccountGatewayToken extends Eloquent
 {

app/Models/AccountToken.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class AccountToken extends EntityModel
 {

app/Models/Activity.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Activity extends Eloquent
 {

app/Models/Affiliate.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Affiliate extends Eloquent
 {

app/Models/Client.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Client extends EntityModel
 {

app/Models/Contact.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Contact extends EntityModel
 {

app/Models/Country.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Country extends Eloquent
 {

app/Models/Credit.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Credit extends EntityModel
 {

app/Models/Currency.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Currency extends Eloquent
 {

app/Models/DateFormat.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class DateFormat extends Eloquent
 {

app/Models/DatetimeFormat.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class DatetimeFormat extends Eloquent
 {

app/Models/EntityModel.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class EntityModel extends Eloquent
 {

app/Models/Frequency.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Frequency extends Eloquent
 {

app/Models/Gateway.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Gateway extends Eloquent
 {

app/Models/Industry.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Industry extends Eloquent
 {

app/Models/Invitation.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Invitation extends EntityModel
 {

app/Models/Invoice.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Invoice extends EntityModel
 {

app/Models/InvoiceDesign.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class InvoiceDesign extends Eloquent
 {

app/Models/InvoiceItem.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class InvoiceItem extends EntityModel
 {

app/Models/InvoiceStatus.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class InvoiceStatus extends Eloquent
 {

app/Models/Language.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Language extends Eloquent
 {

app/Models/License.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class License extends Eloquent
 {

app/Models/Payment.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Payment extends EntityModel
 {

app/Models/PaymentLibrary.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class PaymentLibrary extends Eloquent
 {

app/Models/PaymentTerm.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class PaymentTerm extends Eloquent
 {

app/Models/PaymentType.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class PaymentType extends Eloquent
 {

app/Models/Product.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Product extends EntityModel
 {

app/Models/Project.php

@@ -1,4 +1,7 @@
-<?php
+<?php namespace App\Models;
+
+use Auth;
+use Utils;
 
 class Project extends Eloquent
 {

app/Models/ProjectCode.php

@@ -1,4 +1,7 @@
-<?php
+<?php namespace App\Models;
+
+use Auth;
+use Utils;
 
 class ProjectCode extends Eloquent
 {

app/Models/Size.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Size extends Eloquent
 {

app/Models/Subscription.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Subscription extends Eloquent
 {

app/Models/TaxRate.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class TaxRate extends EntityModel
 {

app/Models/Theme.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Theme extends Eloquent
 {

app/Models/Timesheet.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Timesheet extends Eloquent
 {

app/Models/TimesheetEvent.php

@@ -1,4 +1,7 @@
-<?php
+<?php namespace App\Models;
+
+use Auth;
+use Utils;
 
 class TimesheetEvent extends Eloquent
 {

app/Models/TimesheetEventSource.php

@@ -1,4 +1,7 @@
-<?php
+<?php namespace App\Models;
+
+use Auth;
+use Utils;
 
 class TimesheetEventSource extends Eloquent
 {

app/Models/Timezone.php

@@ -1,4 +1,4 @@
-<?php
+<?php namespace App\Models;
 
 class Timezone extends Eloquent
 {

app/Models/User.php

@@ -1,28 +1,17 @@
-<?php
+<?php namespace App\Models;
 
-use Illuminate\Auth\UserInterface;
+use Illuminate\Auth\Authenticatable;
-use Illuminate\Auth\Reminders\RemindableInterface;
+use Illuminate\Database\Eloquent\Model;
-use Zizaco\Confide\ConfideUser;
+use Illuminate\Auth\Passwords\CanResetPassword;
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
+
+class User extends Model implements AuthenticatableContract, CanResetPasswordContract {
+
+    use Authenticatable, CanResetPassword;
 
-class User extends ConfideUser implements UserInterface, RemindableInterface
-{
     protected $softDelete = true;
 
-    public static $rules = array(
-        /*
-    	'username' => 'required|unique:users',
-        'password' => 'required|between:6,32|confirmed',
-        'password_confirmation' => 'between:6,32',
-        */
-    );
-
-    protected $updateRules = array(
-        /*
-        'email' => 'required|unique:users',
-        'username' => 'required|unique:users',
-        */
-    );
-
     /**
      * The database table used by the model.
      *
@@ -30,6 +19,22 @@ class User extends ConfideUser implements UserInterface, RemindableInterface
      */
     protected $table = 'users';
 
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = ['email', 'password','agency_id'];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    protected $hidden = ['password', 'remember_token'];
+
+
     public function account()
     {
         return $this->belongsTo('Account');