fixed account transformer

OpenResourceManager · Aug 21, 2017 · 1872b5a · 1872b5a
1 parent f106c58
commit 1872b5a
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/app/Http/Transformers/AccountTransformer.php b/app/Http/Transformers/AccountTransformer.php
@@ -43,8 +43,8 @@ public function transform(Account $item)
             }
         }
 
-        $readLoadStatus = Permission::where('name', 'read-load-status')->first();
-        if (in_array('read-load-status', $permissions) || $user->hasPermission($readLoadStatus)) {
+        $readLoadStatus = Permission::where('name', 'read-load-statuses')->first();
+        if (in_array('read-load-status', $permissions, true) || $user->hasPermission($readLoadStatus)) {
             $transformed['load_status'] = null;
             $loadStatusTransformer = new LoadStatusTransformer();
             if (!empty($item->loadStatus)) {
@@ -53,7 +53,7 @@ public function transform(Account $item)
         }
 
         $readDuty = Permission::where('name', 'read-duty')->first();
-        if (in_array('read-duty', $permissions) || $user->hasPermission($readDuty)) {
+        if (in_array('read-duty', $permissions, true) || $user->hasPermission($readDuty)) {
             $dutyTrans = new DutyTransformer();
             $transformed['primary_duty'] = $dutyTrans->transform($item->primaryDuty);
             $transformed['duties'] = [];
@@ -70,14 +70,14 @@ public function transform(Account $item)
         }
 
         $readClassified = Permission::where('name', 'read-classified')->first();
-        if (in_array('read-classified', $permissions) || $user->hasPermission($readClassified)) {
+        if (in_array('read-classified', $permissions, true) || $user->hasPermission($readClassified)) {
             $transformed['ssn'] = (!empty($item->ssn)) ? strval(decrypt($item->ssn)) : null;
             $transformed['password'] = (!empty($item->password)) ? decrypt($item->password) : null;
             $transformed['birth_date'] = (!empty($item->birth_date)) ? decrypt($item->birth_date) : null;
         }
 
         $readDepartment = Permission::where('name', 'read-department')->first();
-        if (in_array('read-department', $permissions) || $user->hasPermission($readDepartment)) {
+        if (in_array('read-department', $permissions, true) || $user->hasPermission($readDepartment)) {
             $transformed['departments'] = array();
             $departmentTrans = new DepartmentTransformer();
             foreach ($item->departments as $department) {
@@ -86,16 +86,16 @@ public function transform(Account $item)
         }
 
         $readCourse = Permission::where('name', 'read-course')->first();
-        if (in_array('read-course', $permissions) || $user->hasPermission($readCourse)) {
+        if (in_array('read-course', $permissions, true) || $user->hasPermission($readCourse)) {
             $transformed['courses'] = array();
             $courseTrans = new CourseTransformer();
             foreach ($item->courses as $course) {
                 $transformed['courses'][] = $courseTrans->transform($course);
             }
         }
 
-        $readSchool = Permission::where('name', 'read-school')->first();
-        if (in_array('read-school', $permissions) || $user->hasPermission($readSchool)) {
+        $readSchool = Permission::where('name', 'read-schools')->first();
+        if (in_array('read-school', $permissions, true) || $user->hasPermission($readSchool)) {
             $transformed['schools'] = array();
             $schoolTrans = new SchoolTransformer();
             foreach ($item->schools as $school) {
@@ -104,7 +104,7 @@ public function transform(Account $item)
         }
 
         $readEmail = Permission::where('name', 'read-email')->first();
-        if (in_array('read-email', $permissions) || $user->hasPermission($readEmail)) {
+        if (in_array('read-email', $permissions, true) || $user->hasPermission($readEmail)) {
             $transformed['emails'] = array();
             $emailTrans = new EmailTransformer();
             foreach ($item->emails as $email) {
@@ -113,7 +113,7 @@ public function transform(Account $item)
         }
 
         $readMobilePhone = Permission::where('name', 'read-mobile-phone')->first();
-        if (in_array('read-mobile-phone', $permissions) || $user->hasPermission($readMobilePhone)) {
+        if (in_array('read-mobile-phone', $permissions, true) || $user->hasPermission($readMobilePhone)) {
             $transformed['mobile_phones'] = array();
             $phoneTrans = new MobilePhoneTransformer();
             foreach ($item->mobilePhones as $mobilePhone) {
@@ -122,7 +122,7 @@ public function transform(Account $item)
         }
 
         $readAddress = Permission::where('name', 'read-address')->first();
-        if (in_array('read-address', $permissions) || $user->hasPermission($readAddress)) {
+        if (in_array('read-address', $permissions, true) || $user->hasPermission($readAddress)) {
             $transformed['addresses'] = array();
             $addressTrans = new AddressTransformer();
             foreach ($item->addresses as $address) {
@@ -131,7 +131,7 @@ public function transform(Account $item)
         }
 
         $readAliasAccount = Permission::where('name', 'read-alias-account')->first();
-        if (in_array('read-alias-account', $permissions) || $user->hasPermission($readAliasAccount)) {
+        if (in_array('read-alias-account', $permissions, true) || $user->hasPermission($readAliasAccount)) {
             $transformed['alias_accounts'] = array();
             $aliasTrasnsformer = new AliasAccountTransformer();
             foreach ($item->aliasAccounts as $alias) {