familytree365 / backend

app/Http/Controllers/DashboardController.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
         $familiesjoined = Family::all()->count();
         $peoplesattached = Person::all()->count();
         $chart = array($male, $female, $unknown);
-        return ['chart' => $chart,'familiesjoined' => $familiesjoined,'peoplesattached' => $peoplesattached];
+        return ['chart' => $chart, 'familiesjoined' => $familiesjoined, 'peoplesattached' => $peoplesattached];
     }
 
     /**
@@ -37,7 +37,7 @@ 
     {
         $user = auth()->user();
         $company = $user->Company();
-        $trees =Tree::where('company_id',$company->id)->get();
+        $trees = Tree::where('company_id', $company->id)->get();
         return $trees;
     }
 
@@ -48,7 +48,7 @@ 
     }
 
     public function getTree() {
-        $trees =Tree::where('company_id',request('company_id'))->get();
+        $trees = Tree::where('company_id', request('company_id'))->get();
         return $trees;
     }
     public function changedb(Request $request)
@@ -130,7 +130,7 @@ 
     public function trial()
     {
         $user = auth()->user();
-        if($user->subscribed('default')) {
+        if ($user->subscribed('default')) {
             $days = Carbon::now()->diffInDays(Carbon::parse($user->subscription('default')->asStripeSubscription()->current_period_end));
         } else {
             $days = Carbon::now()->diffInDays($user->trial_ends_at);

app/Http/Controllers/PersonAssoController.php

Spacing +10 added lines, -10 removed lines

@@ -16,34 +16,34 @@ 
     {
         $query = PersonAsso::query();
 
-        if($request->has('searchTerm')) {
-            $columnsToSearch = ['group','indi','rela','import_confirm'];
+        if ($request->has('searchTerm')) {
+            $columnsToSearch = ['group', 'indi', 'rela', 'import_confirm'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%');
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -135,7 +135,7 @@ 
     public function destroy($id)
     {
         $personasso = PersonAsso::find($id);
-        if($personasso) {
+        if ($personasso) {
             $personasso->delete();
             return "true";
         }

app/Http/Controllers/FamilyEventController.php

Spacing +11 added lines, -11 removed lines

@@ -18,36 +18,36 @@ 
      */
     public function index(Request $request)
     {
-        $query = FamilyEvent::query()->with(['family','place']);
+        $query = FamilyEvent::query()->with(['family', 'place']);
 
-        if($request->has('searchTerm')) {
-            $columnsToSearch = ['family_id','places_id','date','title','description','year','month','day','type','plac','phon','caus','age','agnc','husb','wife','converted_date','addr_id'];
+        if ($request->has('searchTerm')) {
+            $columnsToSearch = ['family_id', 'places_id', 'date', 'title', 'description', 'year', 'month', 'day', 'type', 'plac', 'phon', 'caus', 'age', 'agnc', 'husb', 'wife', 'converted_date', 'addr_id'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%');
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -207,7 +207,7 @@ 
     public function destroy($id)
     {
         $familyevent = FamilyEvent::find($id);
-        if($familyevent) {
+        if ($familyevent) {
             $familyevent->delete();
             return "true";
         }

app/Http/Controllers/AddrController.php

Spacing +10 added lines, -10 removed lines

@@ -16,34 +16,34 @@ 
     {
         $query = Addr::query();
 
-        if($request->has('searchTerm')) {
-            $columnsToSearch = ['adr1','adr2','city','stae','post','ctry'];
+        if ($request->has('searchTerm')) {
+            $columnsToSearch = ['adr1', 'adr2', 'city', 'stae', 'post', 'ctry'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%');
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -142,7 +142,7 @@ 
     public function destroy($id)
     {
         $addr = Addr::find($id);
-        if($addr) {
+        if ($addr) {
             $addr->delete();
             return "true";
         }

app/Http/Controllers/TreeController.php

Spacing +42 added lines, -42 removed lines

@@ -31,41 +31,41 @@ 
 
         $query = Tree::query()->with('company');
 
-        if($request->has('searchTerm')) {
+        if ($request->has('searchTerm')) {
             $columnsToSearch = ['name'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%');
                 }
             }
         }
 
-        $user =  auth()->user();
+        $user = auth()->user();
         $company = $user->Company()->pluck('companies.id');
-        $query->whereIn('company_id',$company);
+        $query->whereIn('company_id', $company);
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
-        if(!count($request->all())) {
+        if (!count($request->all())) {
             $rows = $query->get()->toArray();
         }
 
@@ -85,7 +85,7 @@ 
         $roles = $user->roles;
         $role = $roles[0]->id;
         if ($role == 7 || $role == 8) {
-            if(Tree::whereIn('company_id', $companies_id)->count() < 1){
+            if (Tree::whereIn('company_id', $companies_id)->count() < 1) {
                 return response()->json(['create_tree' => true]);
             } else {
                 return response()->json(['create_tree' => false]);
@@ -93,7 +93,7 @@ 
         }
 
         else if ($role == 5 || $role == 6) {
-            if(Tree::whereIn('company_id', $companies_id)->count() < 10){
+            if (Tree::whereIn('company_id', $companies_id)->count() < 10) {
                return response()->json(['create_tree' => true]);
             } else {
                 return response()->json(['create_tree' => false]);
@@ -129,12 +129,12 @@ 
                 ])->id;
 
         $tenant_id = DB::connection($this->getConnectionName())->table('tenants')->insertGetId([
-            'name' => 'tenant'.$tree_id,
+            'name' => 'tenant' . $tree_id,
             'tree_id' => $tree_id,
-            'database' => 'tenant'.$tree_id
+            'database' => 'tenant' . $tree_id
         ]);
 
-        DB::statement('create database tenant'.$tree_id);
+        DB::statement('create database tenant' . $tree_id);
 
         Artisan::call('tenants:artisan "migrate --database=tenant --force"');
     }
@@ -194,11 +194,11 @@ 
                     $_families = Family::on($conn)->where('husband_id', $father->id)->orwhere('wife_id', $father->id)->select('id')->get();
                     $_union_ids = [];
                     foreach ($_families as $item) {
-                        $_union_ids[] = 'u'.$item->id;
+                        $_union_ids[] = 'u' . $item->id;
                     }
                     $father->setAttribute('own_unions', $_union_ids);
                     $this->persons[$father->id] = $father;
-                    $this->links[] = [$father->id, 'u'.$family_id];
+                    $this->links[] = [$father->id, 'u' . $family_id];
                 }
                 if (isset($mother->id)) {
                     $_families = Family::on($conn)->where('husband_id', $mother->id)->orwhere('wife_id', $mother->id)->select('id')->get();
@@ -208,7 +208,7 @@ 
                     }
                     $mother->setAttribute('own_unions', $_union_ids);
                     $this->persons[$mother->id] = $mother;
-                    $this->links[] = [$mother->id, 'u'.$family_id];
+                    $this->links[] = [$mother->id, 'u' . $family_id];
                 }
 
                 // find children
@@ -228,7 +228,7 @@ 
                     $this->persons[$child_id] = $child_data;
 
                     // add union-child link
-                    $this->links[] = ['u'.$family_id, $child_id];
+                    $this->links[] = ['u' . $family_id, $child_id];
 
                     // make union child filds
                     $children_ids[] = $child_id;
@@ -237,10 +237,10 @@ 
 
                 // compose union item and add to unions
                 $union = [];
-                $union['id'] = 'u'.$family_id;
+                $union['id'] = 'u' . $family_id;
                 $union['partner'] = [isset($father->id) ? $father->id : null, isset($mother->id) ? $mother->id : null];
                 $union['children'] = $children_ids;
-                $this->unions['u'.$family_id] = $union;
+                $this->unions['u' . $family_id] = $union;
             }
         }
 
@@ -266,27 +266,27 @@ 
                 return;
             }
             // do self
-            if (! array_key_exists($start_id, $this->persons)) {
+            if (!array_key_exists($start_id, $this->persons)) {
                 // this is not added
                 $_families = Family::on($conn)->where('husband_id', $start_id)->orwhere('wife_id', $start_id)->select('id')->get();
                 $_union_ids = [];
                 foreach ($_families as $item) {
-                    $_union_ids[] = 'u'.$item->id;
+                    $_union_ids[] = 'u' . $item->id;
                     // add current family link
                     // $this->links[] = [$start_id, 'u'.$item->id];
-                    array_unshift($this->links, [$start_id, 'u'.$item->id]);
+                    array_unshift($this->links, [$start_id, 'u' . $item->id]);
                 }
                 $person->setAttribute('own_unions', $_union_ids);
-                $person->setAttribute('parent_union', 'u'.$person->child_in_family_id);
+                $person->setAttribute('parent_union', 'u' . $person->child_in_family_id);
                 // add to persons
                 $this->persons[$start_id] = $person;
 
                 // get self's parents data
                 $p_family_id = $person->child_in_family_id;
-                if (! empty($p_family_id)) {
+                if (!empty($p_family_id)) {
                     // add parent family link
                     // $this->links[] = ['u'.$p_family_id,  $start_id] ;
-                    array_unshift($this->links, ['u'.$p_family_id,  $start_id]);
+                    array_unshift($this->links, ['u' . $p_family_id, $start_id]);
                     $p_family = Family::on($conn)->find($p_family_id);
                     if (isset($p_family->husband_id)) {
                         $p_fatherid = $p_family->husband_id;
@@ -305,27 +305,27 @@ 
                 $father = Person::on($conn)->find($family->husband_id);
                 $mother = Person::on($conn)->find($family->wife_id);
                 if (isset($father->id)) {
-                    if (! array_key_exists($father->id, $this->persons)) {
+                    if (!array_key_exists($father->id, $this->persons)) {
                         // this is not added
                         $_families = Family::on($conn)->where('husband_id', $father->id)->orwhere('wife_id', $father->id)->select('id')->get();
                         $_union_ids = [];
                         foreach ($_families as $item) {
-                            $_union_ids[] = 'u'.$item->id;
+                            $_union_ids[] = 'u' . $item->id;
                         }
                         $father->setAttribute('own_unions', $_union_ids);
-                        $father->setAttribute('parent_union', 'u'.$father->child_in_family_id);
+                        $father->setAttribute('parent_union', 'u' . $father->child_in_family_id);
                         // add to persons
                         $this->persons[$father->id] = $father;
 
                         // add current family link
                         // $this->links[] = [$father->id, 'u'.$family_id];
-                        array_unshift($this->links, [$father->id, 'u'.$family_id]);
+                        array_unshift($this->links, [$father->id, 'u' . $family_id]);
                         // get husband's parents data
                         $p_family_id = $father->child_in_family_id;
-                        if (! empty($p_family_id)) {
+                        if (!empty($p_family_id)) {
                             // add parent family link
                             // $this->links[] = ['u'.$p_family_id,  $father->id] ;
-                            array_unshift($this->links, ['u'.$p_family_id,  $father->id]);
+                            array_unshift($this->links, ['u' . $p_family_id, $father->id]);
                             $p_family = Family::on($conn)->find($p_family_id);
                             if (isset($p_family->husband_id)) {
                                 $p_fatherid = $p_family->husband_id;
@@ -339,7 +339,7 @@ 
                     }
                 }
                 if (isset($mother->id)) {
-                    if (! array_key_exists($mother->id, $this->persons)) {
+                    if (!array_key_exists($mother->id, $this->persons)) {
                         // this is not added
                         $_families = Family::on($conn)->where('husband_id', $mother->id)->orwhere('wife_id', $mother->id)->select('id')->get();
                         $_union_ids = [];
@@ -347,18 +347,18 @@ 
                             $_union_ids[] = $item->id;
                         }
                         $mother->setAttribute('own_unions', $_union_ids);
-                        $mother->setAttribute('parent_union', 'u'.$mother->child_in_family_id);
+                        $mother->setAttribute('parent_union', 'u' . $mother->child_in_family_id);
                         // add to person
                         $this->persons[$mother->id] = $mother;
                         // add current family link
                         // $this->links[] = [$mother->id, 'u'.$family_id];
-                        array_unshift($this->links, [$mother->id, 'u'.$family_id]);
+                        array_unshift($this->links, [$mother->id, 'u' . $family_id]);
                         // get wifee's parents data
                         $p_family_id = $mother->child_in_family_id;
-                        if (! empty($p_family_id)) {
+                        if (!empty($p_family_id)) {
                             // add parent family link
                             // $this->links[] = ['u'.$p_family_id,  $father->id] ;
-                            array_unshift($this->links, ['u'.$p_family_id,  $mother->id]);
+                            array_unshift($this->links, ['u' . $p_family_id, $mother->id]);
 
                             $p_family = Family::on($conn)->find($p_family_id);
                             if (isset($p_family->husband_id)) {
@@ -383,10 +383,10 @@ 
 
                 // compose union item and add to unions
                 $union = [];
-                $union['id'] = 'u'.$family_id;
+                $union['id'] = 'u' . $family_id;
                 $union['partner'] = [isset($father->id) ? $father->id : null, isset($mother->id) ? $mother->id : null];
                 $union['children'] = $children_ids;
-                $this->unions['u'.$family_id] = $union;
+                $this->unions['u' . $family_id] = $union;
             }
             // get brother/sisters
             $brothers = Person::on($conn)->where('child_in_family_id', $person->child_in_family_id)
@@ -443,7 +443,7 @@ 
     public function destroy($id)
     {
         $tree = Tree::find($id);
-        if($tree) {
+        if ($tree) {
             $tree->delete();
             return "true";
         }

app/Http/Controllers/SourceRepoController.php

Spacing +9 added lines, -9 removed lines

@@ -16,34 +16,34 @@ 
     {
         $query = SourceRepo::query();
 
-        if($request->has('searchTerm')) {
+        if ($request->has('searchTerm')) {
             $columnsToSearch = ['group', 'repo_id', 'caln'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%');
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -136,7 +136,7 @@ 
     public function destroy($id)
     {
         $sourcerepo = SourceRepo::find($id);
-        if($sourcerepo) {
+        if ($sourcerepo) {
             $sourcerepo->delete();
             return "true";
         }

app/Http/Controllers/PersonEventController.php

Spacing +10 added lines, -10 removed lines

@@ -16,34 +16,34 @@ 
     {
         $query = PersonEvent::query();
 
-        if($request->has('searchTerm')) {
-            $columnsToSearch = ['converted_date', 'year', 'month','day','type','attr','plac','addr_id','phon','caus','age','agnc','adop','adop_famc','person_id','title','date','description','places_id'];
+        if ($request->has('searchTerm')) {
+            $columnsToSearch = ['converted_date', 'year', 'month', 'day', 'type', 'attr', 'plac', 'addr_id', 'phon', 'caus', 'age', 'agnc', 'adop', 'adop_famc', 'person_id', 'title', 'date', 'description', 'places_id'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%');
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }
 
@@ -199,7 +199,7 @@ 
     public function destroy($id)
     {
         $personevent = PersonEvent::find($id);
-        if($personevent) {
+        if ($personevent) {
             $personevent->delete();
             return "true";
         }

app/Http/Controllers/StripeController.php

Spacing +9 added lines, -9 removed lines

@@ -17,8 +17,8 @@ 
     }
 
     public function getPlans() {
-        foreach($this->plans as $plan) {
-            switch($plan->nickname) {
+        foreach ($this->plans as $plan) {
+            switch ($plan->nickname) {
                 case 'UTY':
                     $plan->title = '50GBP for unlimited trees yearly';
                 break;
@@ -65,11 +65,11 @@ 
         $user = auth()->user();
         $user->syncRoles('OTY');
         $plan_id = request()->plan_id;
-        if(request()->has('payment_method')) {
+        if (request()->has('payment_method')) {
             $paymentMethod = request()->payment_method;
-            $user->newSubscription('default', $plan_id)->create($paymentMethod,['name' => request()->card_holder_name, "address" => ["country" => 'GB', "state" => 'England', "city" => 'Abberley', "postal_code" => 'WR6', "line1" => 'test', "line2" => ""]]);
+            $user->newSubscription('default', $plan_id)->create($paymentMethod, ['name' => request()->card_holder_name, "address" => ["country" => 'GB', "state" => 'England', "city" => 'Abberley', "postal_code" => 'WR6', "line1" => 'test', "line2" => ""]]);
             $user->notify(new SubscribeSuccessfully($plan_id));
-        } else if($user->hasDefaultPaymentMethod()) {
+        } else if ($user->hasDefaultPaymentMethod()) {
             $paymentMethod = $user->defaultPaymentMethod();
             $user->newSubscription('default', $plan_id)->create($paymentMethod->id);
             $user->notify(new SubscribeSuccessfully($plan_id));
@@ -91,11 +91,11 @@ 
     public function webhook() {
         $data = request()->all();
         $user = User::where('stripe_id', $data['data']['object']['customer'])->first();
-        if($user) {
+        if ($user) {
             $plan_nickname = $data['data']['object']['items']['data'][0]['plan']['nickname'];
-            foreach($this->plans as $plan) {
-                if($plan->nickname == $plan_nickname) {
-                    switch($plan->nickname) {
+            foreach ($this->plans as $plan) {
+                if ($plan->nickname == $plan_nickname) {
+                    switch ($plan->nickname) {
                         case 'UTY':
                             $user->syncRoles('UTY');
                         break;

app/Http/Controllers/DnaController.php

Spacing +8 added lines, -8 removed lines

@@ -18,34 +18,34 @@
     {
         $query = Dna::query();
 
-        if($request->has('searchTerm')) {
+        if ($request->has('searchTerm')) {
             $columnsToSearch = ['name'];
             $search_term = json_decode($request->searchTerm)->searchTerm;
-            if(!empty($search_term)) {
+            if (!empty($search_term)) {
                 $searchQuery = '%' . $search_term . '%';
-                foreach($columnsToSearch as $column) {
+                foreach ($columnsToSearch as $column) {
                     $query->orWhere($column, 'LIKE', $searchQuery);
                 }
             }
         }
 
-        if($request->has('columnFilters')) {
+        if ($request->has('columnFilters')) {
 
             $filters = get_object_vars(json_decode($request->columnFilters));
 
-            foreach($filters as $key => $value) {
-                if(!empty($value)) {
+            foreach ($filters as $key => $value) {
+                if (!empty($value)) {
                     $query->orWhere($key, 'like', '%' . $value . '%'); 
                 }
             }
         }
 
-        if($request->has('sort.0')) {
+        if ($request->has('sort.0')) {
             $sort = json_decode($request->sort[0]);
             $query->orderBy($sort->field, $sort->type);
         }
 
-        if($request->has("perPage")) {
+        if ($request->has("perPage")) {
             $rows = $query->paginate($request->perPage);
         }