Merge pull request #5 from updivision/dev

v1.1 Beta
updivision · Jan 25, 2018 · 14bf810 · 14bf810
2 parents bbdb8b3 + bb7c3bb
commit 14bf810
Show file tree

Hide file tree

Showing 126 changed files with 8,392 additions and 879 deletions.
diff --git a/.env.example b/.env.example
@@ -30,3 +30,6 @@ MAIL_ENCRYPTION=null
 PUSHER_APP_ID=
 PUSHER_KEY=
 PUSHER_SECRET=
+
+ADMIN_ROLE_NAME=administrator
+CLIENT_ROLE_NAME=client
diff --git a/app/Http/Controllers/Admin/AttributeCrudController.php b/app/Http/Controllers/Admin/AttributeCrudController.php
@@ -38,6 +38,13 @@ public function setUp()
             ]
         ]);
 
+        /*
+        |--------------------------------------------------------------------------
+        | PERMISSIONS
+        |-------------------------------------------------------------------------
+        */
+        $this->setPermissions();
+
         /*
         |--------------------------------------------------------------------------
         | FIELDS
@@ -52,18 +59,39 @@ public function setUp()
         */
         $this->crud->enableAjaxTable();
 
-        /*
-        |--------------------------------------------------------------------------
-        | ACCESS
-        |--------------------------------------------------------------------------
-        */
-        // $this->crud->denyAccess(['delete']);
-        //
     }
 
-    public function setFields()
+    public function setPermissions()
     {
+        // Get authenticated user
+        $user = auth()->user();
+
+        // Deny all accesses
+        $this->crud->denyAccess(['list', 'create', 'update', 'delete']);
+
+        // Allow list access
+        if ($user->can('list_attributes')) {
+            $this->crud->allowAccess('list');
+        }
+
+        // Allow create access
+        if ($user->can('create_attribute')) {
+            $this->crud->allowAccess('create');
+        }
 
+        // Allow update access
+        if ($user->can('update_attribute')) {
+            $this->crud->allowAccess('update');
+        }
+
+        // Allow delete access
+        if ($user->can('delete_attribute')) {
+            $this->crud->allowAccess('delete');
+        }
+    }
+
+    public function setFields()
+    {
         $this->crud->addFields([
             [
                 'name'  => 'name',
@@ -102,7 +130,6 @@ public function setFields()
                 'type'  => 'attribute_types',
             ]
         ]);
-
     }
 
 	public function store(StoreRequest $request)

diff --git a/app/Http/Controllers/Admin/AttributeSetCrudController.php b/app/Http/Controllers/Admin/AttributeSetCrudController.php
@@ -35,6 +35,13 @@ public function setUp()
             ]
         ]);
 
+        /*
+        |--------------------------------------------------------------------------
+        | PERMISSIONS
+        |-------------------------------------------------------------------------
+        */
+        $this->setPermissions();
+
         /*
         |--------------------------------------------------------------------------
         | FIELDS
@@ -51,9 +58,37 @@ public function setUp()
 
     }
 
-    public function setFields()
+    public function setPermissions()
     {
+        // Get authenticated user
+        $user = auth()->user();
+
+        // Deny all accesses
+        $this->crud->denyAccess(['list', 'create', 'update', 'delete']);
+
+        // Allow list access
+        if ($user->can('list_attribute_sets')) {
+            $this->crud->allowAccess('list');
+        }
+
+        // Allow create access
+        if ($user->can('create_attribute_set')) {
+            $this->crud->allowAccess('create');
+        }
+
+        // Allow update access
+        if ($user->can('update_attribute_set')) {
+            $this->crud->allowAccess('update');
+        }
 
+        // Allow delete access
+        if ($user->can('delete_attribute_set')) {
+            $this->crud->allowAccess('delete');
+        }
+    }
+
+    public function setFields()
+    {
         $this->crud->addFields([
             [
                 'name'      => 'name',
@@ -70,7 +105,6 @@ public function setFields()
                 'pivot'     => true,
             ]
         ]);
-
     }
 
     public function ajaxGetAttributesBySetId(Request $request, Attribute $attribute)

diff --git a/app/Http/Controllers/Admin/CarrierCrudController.php b/app/Http/Controllers/Admin/CarrierCrudController.php
@@ -35,6 +35,13 @@ public function setUp()
             ]
         ]);
 
+        /*
+        |--------------------------------------------------------------------------
+        | PERMISSIONS
+        |-------------------------------------------------------------------------
+        */
+        $this->setPermissions();
+
         /*
         |--------------------------------------------------------------------------
         | FIELDS
@@ -51,9 +58,37 @@ public function setUp()
 
     }
 
-    public function setFields()
+    public function setPermissions()
     {
+        // Get authenticated user
+        $user = auth()->user();
+
+        // Deny all accesses
+        $this->crud->denyAccess(['list', 'create', 'update', 'delete']);
+
+        // Allow list access
+        if ($user->can('list_carriers')) {
+            $this->crud->allowAccess('list');
+        }
+
+        // Allow create access
+        if ($user->can('create_carrier')) {
+            $this->crud->allowAccess('create');
+        }
+
+        // Allow update access
+        if ($user->can('update_carrier')) {
+            $this->crud->allowAccess('update');
+        }
+
+        // Allow delete access
+        if ($user->can('delete_carrier')) {
+            $this->crud->allowAccess('delete');
+        }
+    }
 
+    public function setFields()
+    {
         $this->crud->addFields([
             [
                 'name'  => 'name',
@@ -83,7 +118,6 @@ public function setFields()
                 'prefix'  => 'uploads/carriers/'
             ]
         ]);
-
     }