Merge branch 'laravel-acl' of git://github.com/joshuadwire/invoiceninja into joshuadwire-laravel-acl

Conflicts:
	app/Providers/AuthServiceProvider.php

app/Policies/AccountGatewayPolicy.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Policies;
+
+class AccountGatewayPolicy extends EntityPolicy {
+    public static function edit($user, $item) {
+        return $user->hasPermission('admin');
+    }
+
+    public static function create($user) {
+        return $user->hasPermission('admin');
+    }
+}

app/Policies/BankAccountPolicy.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Policies;
+
+class BankAccountPolicy extends EntityPolicy {
+    public static function edit($user, $item) {
+        return $user->hasPermission('admin');
+    }
+
+    public static function create($user) {
+        return $user->hasPermission('admin');
+    }
+}

app/Policies/PaymentTermPolicy.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Policies;
+
+class PaymentTermPolicy extends EntityPolicy {
+    public static function edit($user, $item) {
+        return $user->hasPermission('admin');
+    }
+
+    public static function create($user) {
+        return $user->hasPermission('admin');
+    }
+}

app/Policies/ProductPolicy.php

@@ -6,4 +6,8 @@ class ProductPolicy extends EntityPolicy {
 	public static function edit($user, $item) {
         return $user->hasPermission('admin');
     }
+
+    public static function create($user) {
+        return $user->hasPermission('admin');
+    }
 }

app/Policies/TaxRatePolicy.php

@@ -6,4 +6,8 @@ class TaxRatePolicy extends EntityPolicy {
 	public static function edit($user, $item) {
         return $user->hasPermission('admin');
     }
+
+    public static function create($user) {
+        return $user->hasPermission('admin');
+    }
 }

app/Policies/TokenPolicy.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Policies;
+
+class TokenPolicy extends EntityPolicy {
+    public static function edit($user, $item) {
+        return $user->hasPermission('admin');
+    }
+
+    public static function create($user) {
+        return $user->hasPermission('admin');
+    }
+}

app/Providers/AuthServiceProvider.php

@@ -23,6 +23,10 @@ class AuthServiceProvider extends ServiceProvider
         \App\Models\Vendor::class => \App\Policies\VendorPolicy::class,
         \App\Models\Product::class => \App\Policies\ProductPolicy::class,
         \App\Models\TaxRate::class => \App\Policies\TaxRatePolicy::class,
+        \App\Models\AccountGateway::class => \App\Policies\AccountGatewayPolicy::class,
+        \App\Models\Token::class => \App\Policies\TokenPolicy::class,
+        \App\Models\BankAccount::class => \App\Policies\BankAccountPolicy::class,
+        \App\Models\PaymentTerm::class => \App\Policies\PaymentTermPolicy::class,
     ];
 
     /**

app/Services/BaseService.php

@@ -3,6 +3,7 @@
 use Auth;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use App\Services\DatatableService;
+use Auth;
 
 class BaseService
 {