ladybirdweb / agorainvoicing

app/Http/Controllers/User/ClientController.php

Indentation +26 added lines, -26 removed lines

@@ -78,31 +78,31 @@ 
         $reg_from = $request->input('reg_from');
         $reg_till = $request->input('reg_till');
         $user = $this->advanceSearch($name, $username, $company,
-         $mobile, $email, $country, $industry, $company_type, $company_size, $role, $position, $reg_from, $reg_till);
+            $mobile, $email, $country, $industry, $company_type, $company_size, $role, $position, $reg_from, $reg_till);
 
         return\ DataTables::of($user->get())
-                         ->addColumn('checkbox', function ($model) {
-                             return "<input type='checkbox' class='user_checkbox' 
+                            ->addColumn('checkbox', function ($model) {
+                                return "<input type='checkbox' class='user_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
-                         })
+                            })
                         ->addColumn('first_name', function ($model) {
                             return '<a href='.url('clients/'.$model->id).'>'
                             .ucfirst($model->first_name).' '.ucfirst($model->last_name).'</a>';
                         })
-                         ->addColumn('email', function ($model) {
-                             return $model->email;
-                         })
-                          ->addColumn('created_at', function ($model) {
-                              $ends = $model->created_at;
-                              if ($ends) {
-                                  $date1 = new DateTime($ends);
-                                  $tz = \Auth::user()->timezone()->first()->name;
-                                  $date1->setTimezone(new DateTimeZone($tz));
-                                  $end = $date1->format('M j, Y, g:i a ');
-                              }
-
-                              return $end;
-                          })
+                            ->addColumn('email', function ($model) {
+                                return $model->email;
+                            })
+                            ->addColumn('created_at', function ($model) {
+                                $ends = $model->created_at;
+                                if ($ends) {
+                                    $date1 = new DateTime($ends);
+                                    $tz = \Auth::user()->timezone()->first()->name;
+                                    $date1->setTimezone(new DateTimeZone($tz));
+                                    $end = $date1->format('M j, Y, g:i a ');
+                                }
+
+                                return $end;
+                            })
                         // ->showColumns('email', 'created_at')
                         ->addColumn('active', function ($model) {
                             if ($model->active == 1) {
@@ -225,7 +225,7 @@ 
 
             return view('themes.default1.user.client.show',
                 compact('id', 'client', 'invoices', 'model_popup', 'orders',
-                 'payments', 'invoiceSum', 'amountReceived', 'pendingAmount', 'currency', 'extraAmt', 'comments'));
+                    'payments', 'invoiceSum', 'amountReceived', 'pendingAmount', 'currency', 'extraAmt', 'comments'));
         } catch (\Exception $ex) {
             app('log')->info($ex->getMessage());
             Bugsnag::notifyException($ex);
@@ -397,7 +397,7 @@ 
             return view('themes.default1.user.client.edit',
                 compact('bussinesses', 'user', 'timezones', 'state',
                     'states', 'managers', 'selectedCurrency', 'selectedCompany',
-                     'selectedIndustry', 'selectedCompanySize'));
+                        'selectedIndustry', 'selectedCompanySize'));
         } catch (\Exception $ex) {
             app('log')->error($ex->getMessage());
 
@@ -493,9 +493,9 @@ 
                 return \Response::json([]);
             }
             $users = User::where('email', 'LIKE', '%'.$term.'%')
-             ->orWhere('first_name', 'LIKE', '%'.$term.'%')
-             ->orWhere('last_name', 'LIKE', '%'.$term.'%')
-             ->select('id', 'email', 'profile_pic', 'first_name', 'last_name')->get();
+                ->orWhere('first_name', 'LIKE', '%'.$term.'%')
+                ->orWhere('last_name', 'LIKE', '%'.$term.'%')
+                ->select('id', 'email', 'profile_pic', 'first_name', 'last_name')->get();
             $formatted_tags = [];
 
             foreach ($users as $user) {
@@ -511,8 +511,8 @@ 
     }
 
     public function advanceSearch($name = '', $username = '', $company = '',
-     $mobile = '', $email = '', $country = '', $industry = '',
-      $company_type = '', $company_size = '', $role = '', $position = '', $reg_from = '', $reg_till = '')
+        $mobile = '', $email = '', $country = '', $industry = '',
+        $company_type = '', $company_size = '', $role = '', $position = '', $reg_from = '', $reg_till = '')
     {
         $join = \DB::table('users');
         $join = $this->getNamUserCom($join, $name, $username, $company);
@@ -523,7 +523,7 @@ 
 
         $join = $join->orderBy('created_at', 'desc')
         ->select('id', 'first_name', 'last_name', 'email', 'created_at',
-         'active', 'mobile_verified', 'role', 'position');
+            'active', 'mobile_verified', 'role', 'position');
 
         return $join;
     }

Spacing +7 added lines, -7 removed lines

@@ -81,18 +81,18 @@ 
          $mobile, $email, $country, $industry, $company_type, $company_size, $role, $position, $reg_from, $reg_till);
 
         return\ DataTables::of($user->get())
-                         ->addColumn('checkbox', function ($model) {
+                         ->addColumn('checkbox', function($model) {
                              return "<input type='checkbox' class='user_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
                          })
-                        ->addColumn('first_name', function ($model) {
+                        ->addColumn('first_name', function($model) {
                             return '<a href='.url('clients/'.$model->id).'>'
                             .ucfirst($model->first_name).' '.ucfirst($model->last_name).'</a>';
                         })
-                         ->addColumn('email', function ($model) {
+                         ->addColumn('email', function($model) {
                              return $model->email;
                          })
-                          ->addColumn('created_at', function ($model) {
+                          ->addColumn('created_at', function($model) {
                               $ends = $model->created_at;
                               if ($ends) {
                                   $date1 = new DateTime($ends);
@@ -104,7 +104,7 @@ 
                               return $end;
                           })
                         // ->showColumns('email', 'created_at')
-                        ->addColumn('active', function ($model) {
+                        ->addColumn('active', function($model) {
                             if ($model->active == 1) {
                                 $email = "<span class='glyphicon glyphicon-envelope'
                                  style='color:green' title='verified email'></span>";
@@ -122,7 +122,7 @@ 
 
                             return $email.'&nbsp;&nbsp;'.$mobile;
                         })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('clients/'.$model->id.'/edit')
                             ." class='btn btn-sm btn-primary btn-xs'>
                             <i class='fa fa-edit' style='color:white;'> </i>&nbsp;&nbsp;Edit</a>"
@@ -131,7 +131,7 @@ 
                                     <i class='fa fa-eye' style='color:white;'> </i>&nbsp;&nbsp;View</a>";
                             // return 'hhhh';
                         })
-                        ->rawColumns(['checkbox', 'first_name', 'email',  'created_at', 'active', 'action'])
+                        ->rawColumns(['checkbox', 'first_name', 'email', 'created_at', 'active', 'action'])
                         ->make(true);
 
         // ->searchColumns('email', 'first_name')

app/Http/Requests/User/ProfileRequest.php

Indentation +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
                     'zip'                    => 'required|numeric',
                     'user_name'              => 'required|unique:users,user_name,'.$userid,
                     'bussiness'              => 'required',
-                     'profile_pic'           => 'sometimes|mimes:jpeg,jpg,png,gif|max:100000',
+                        'profile_pic'           => 'sometimes|mimes:jpeg,jpg,png,gif|max:100000',
 
         ];
         }
@@ -46,10 +46,10 @@ 
             $userid = \Auth::user()->id;
 
             return [
-                     'first_name'            => 'required|min:3|max:30',
+                        'first_name'            => 'required|min:3|max:30',
                     'last_name'              => 'required|max:30',
-                     'mobile'                => 'required|regex:/[0-9]/|min:5|max:20',
-                     'email'                 => 'required',
+                        'mobile'                => 'required|regex:/[0-9]/|min:5|max:20',
+                        'email'                 => 'required',
                     'mobile_code'            => 'required|numeric',
                     'mobile'                 => 'required|numeric',
                     'zip'                    => 'required|numeric',

app/Model/Product/Product.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     protected static $logName = 'Product';
 
     protected static $logAttributes = ['name', 'description', 'type', 'file', 'category',
-         'github_owner', 'github_repository', 'version',  'subscription', 'hidden', 'product_sku', ];
+            'github_owner', 'github_repository', 'version',  'subscription', 'hidden', 'product_sku', ];
 
     protected static $logOnlyDirty = true;
 

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
     use LogsActivity;
     protected $table = 'products';
     protected $fillable = ['name', 'description', 'type', 'group', 'file', 'image', 'require_domain', 'category',
-        'stock_control',  'stock_qty', 'sort_order', 'tax_apply', 'retired', 'hidden',  'auto_terminate',
+        'stock_control', 'stock_qty', 'sort_order', 'tax_apply', 'retired', 'hidden', 'auto_terminate',
         'setup_order_placed', 'setup_first_payment', 'setup_accept_manually',
         'no_auto_setup', 'shoping_cart_link', 'process_url', 'github_owner',
         'github_repository',
@@ -19,7 +19,7 @@ 
     protected static $logName = 'Product';
 
     protected static $logAttributes = ['name', 'description', 'type', 'file', 'category',
-         'github_owner', 'github_repository', 'version',  'subscription', 'hidden', 'product_sku', ];
+         'github_owner', 'github_repository', 'version', 'subscription', 'hidden', 'product_sku', ];
 
     protected static $logOnlyDirty = true;
 

app/Console/Kernel.php

Indentation +6 added lines, -6 removed lines

@@ -16,8 +16,8 @@ 
      */
     protected $commands = [
         //
-         'App\Console\Commands\Inspire',
-         \App\Console\Commands\Install::class,
+            'App\Console\Commands\Inspire',
+            \App\Console\Commands\Install::class,
         'App\Console\Commands\ExpiryCron',
     ];
 
@@ -50,13 +50,13 @@ 
             switch ($task) {
             case 'expiryMail':
                if ($expiryMailStatus == 1) {
-                   return $this->getCondition($schedule->command('expiry:notification'), $command);
-               }
+                    return $this->getCondition($schedule->command('expiry:notification'), $command);
+                }
 
             case 'deleteLogs':
              if ($logDeleteStatus == 1) {
-                 return $this->getCondition($schedule->command('activitylog:clean'), $command);
-             }
+                    return $this->getCondition($schedule->command('activitylog:clean'), $command);
+                }
             }
         }
     }

Switch Indentation +8 added lines, -8 removed lines

@@ -48,15 +48,15 @@
             $condition = new \App\Model\Mailjob\Condition();
             $command = $condition->getConditionValue($task);
             switch ($task) {
-            case 'expiryMail':
-               if ($expiryMailStatus == 1) {
-                   return $this->getCondition($schedule->command('expiry:notification'), $command);
-               }
+                case 'expiryMail':
+                   if ($expiryMailStatus == 1) {
+                       return $this->getCondition($schedule->command('expiry:notification'), $command);
+                   }
 
-            case 'deleteLogs':
-             if ($logDeleteStatus == 1) {
-                 return $this->getCondition($schedule->command('activitylog:clean'), $command);
-             }
+                case 'deleteLogs':
+                 if ($logDeleteStatus == 1) {
+                     return $this->getCondition($schedule->command('activitylog:clean'), $command);
+                 }
             }
         }
     }

app/Http/Controllers/Order/BaseOrderController.php

Indentation +2 added lines, -2 removed lines

@@ -162,7 +162,7 @@ 
                 $user_id = $this->order->find($orderid)->client;
                 $this->subscription->create(['user_id' => $user_id,
                     'plan_id'                          => $planid, 'order_id' => $orderid, 'ends_at' => $ends_at,
-                     'version'                         => $version, 'product_id' =>$product, ]);
+                        'version'                         => $version, 'product_id' =>$product, ]);
             }
             $licenseStatus = StatusSetting::pluck('license_status')->first();
             if ($licenseStatus == 1) {
@@ -270,7 +270,7 @@ 
         $data = $template->data;
         $replace = [
             'name'         => $user->first_name.' '.$user->last_name,
-             'serialkeyurl'=> $myaccounturl,
+                'serialkeyurl'=> $myaccounturl,
             'downloadurl'  => $downloadurl,
             'invoiceurl'   => $invoiceurl,
             'product'      => $product,

app/Http/Controllers/License/LicenseController.php

Braces +4 added lines, -2 removed lines

@@ -85,7 +85,8 @@ 
       &search_type=product&search_keyword=$product_sku");
 
             $details = json_decode($getProductId);
-            if ($details->api_error_detected == 0 && is_array($details->page_message)) {//This is not true if Product_sku is updated
+            if ($details->api_error_detected == 0 && is_array($details->page_message)) {
+//This is not true if Product_sku is updated
                 $productId = $details->page_message[0]->product_id;
             }
 
@@ -121,7 +122,8 @@ 
       &search_type=client&search_keyword=$email");
 
         $details = json_decode($getUserId);
-        if ($details->api_error_detected == 0 && is_array($details->page_message)) {//This is not true if email is updated
+        if ($details->api_error_detected == 0 && is_array($details->page_message)) {
+//This is not true if email is updated
             $userId = $details->page_message[0]->client_id;
         }
 

app/Http/Controllers/Common/MailChimpController.php

Indentation +20 added lines, -20 removed lines

@@ -82,7 +82,7 @@ 
         try {
             $merge_fields = $this->field($email);
             $interestGroupIdForNo = $this->relation->is_paid_no; //Interest GroupId for IsPaid Is No
-              $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes
+                $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes
             $result = $this->mailchimp->post("lists/$this->list_id/members", [
                 'status'        => $this->mailchimp_set->subscribe_status,
                 'email_address' => $email,
@@ -107,14 +107,14 @@ 
         try {
             $merge_fields = $this->field($email);
             $interestGroupIdForNo = $this->relation->is_paid_no; //Interest GroupId for IsPaid Is No
-              $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes
-              $productGroupId = $this->groupRelation->where('agora_product_id', $productid)
-              ->pluck('mailchimp_group_cat_id')->first();
+                $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes
+                $productGroupId = $this->groupRelation->where('agora_product_id', $productid)
+                ->pluck('mailchimp_group_cat_id')->first();
             $hash = md5($email);
             $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [
-                 'interests'         => [$interestGroupIdForNo => true, $interestGroupIdForYes=>false, $productGroupId =>true],
-                 //refer to https://us7.api.mailchimp.com/playground
-              ]);
+                    'interests'         => [$interestGroupIdForNo => true, $interestGroupIdForYes=>false, $productGroupId =>true],
+                    //refer to https://us7.api.mailchimp.com/playground
+                ]);
         } catch (Exception $ex) {
             $exe = json_decode($ex->getMessage(), true);
         }
@@ -126,16 +126,16 @@ 
         try {
             $merge_fields = $this->field($email);
             $interestGroupIdForNo = $this->relation->is_paid_no; //Interest GroupId for IsPaid Is No
-              $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes
-               $productGroupId = $this->groupRelation->where('agora_product_id', $productid)
-              ->pluck('mailchimp_group_cat_id')->first();
+                $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes
+                $productGroupId = $this->groupRelation->where('agora_product_id', $productid)
+                ->pluck('mailchimp_group_cat_id')->first();
 
             $hash = md5($email);
             $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [
-                 'interests' => [$interestGroupIdForNo => false, $interestGroupIdForYes=>true, $productGroupId =>true],
+                    'interests' => [$interestGroupIdForNo => false, $interestGroupIdForYes=>true, $productGroupId =>true],
 
-                 //refer to https://us7.api.mailchimp.com/playground
-              ]);
+                    //refer to https://us7.api.mailchimp.com/playground
+                ]);
         } catch (Exception $ex) {
             dd($ex);
             $exe = json_decode($ex->getMessage(), true);
@@ -178,7 +178,7 @@ 
             $country = Country::where('country_code_char2', $user->country)->pluck('nicename')->first();
             if ($user) {
                 $fields = ['first_name', 'last_name', 'company', 'mobile',
-                 'address', 'town', 'country', 'state', 'zip', 'active', 'role', 'source', ];
+                    'address', 'town', 'country', 'state', 'zip', 'active', 'role', 'source', ];
                 $relation = $this->relation;
                 $merge_fields = [];
                 foreach ($fields as $field) {
@@ -329,11 +329,11 @@ 
             // this->addIsPaidInterestFieldsToAgora();
 
             $group_fields = $this->groups->where('list_id', $this->list_id)
-          ->select('category_name', 'category_option_id', 'category_id')->get()->toArray();
+            ->select('category_name', 'category_option_id', 'category_id')->get()->toArray();
             // dd($group_fields[0]);
             $relations = MailchimpGroupAgoraRelation::where('id', '!=', 0)
-          ->select('agora_product_id', 'mailchimp_group_cat_id')
-          ->orderBy('id', 'asc')->get()->toArray();
+            ->select('agora_product_id', 'mailchimp_group_cat_id')
+            ->orderBy('id', 'asc')->get()->toArray();
             $productList = [];
             $categoryList = [];
             if (count($relations) != 0) {
@@ -343,7 +343,7 @@ 
                     // code...
                 }
                 // dd(count($categoryList));
-         // dd($productList);
+            // dd($productList);
             }
 
             // $relations = MailchimpGroupAgoraRelation::where('id', '!=', 0)->orderBy('id', 'asc')->get()->toArray();
@@ -377,7 +377,7 @@ 
                 echo '<option value='.$field['category_option_id'].'>'.$field['category_option_name'].'</option>';
 
                 // array_push($responseData, (['selectedCat'=>$selectedCategory, 'catId'=>$field['category_option_id'],'catName'=>$field['category_option_name']]
-                  //  ));
+                    //  ));
             }
             // return $responseData;
         }
@@ -427,7 +427,7 @@ 
             MailchimpGroupAgoraRelation::where('id', '!=', 0)->delete();
             foreach ($request->row as $key => $value) {
                 MailchimpGroupAgoraRelation::create(['agora_product_id'=> $value[0],
-             'mailchimp_group_cat_id'                                  => $value[1], ]);
+                'mailchimp_group_cat_id'                                  => $value[1], ]);
             }
 
             return redirect()->back()->with('success', \Lang::get('message.updated-successfully'));

app/Http/Controllers/Common/BaseSettingsController.php

Indentation +5 added lines, -5 removed lines

@@ -215,11 +215,11 @@ 
             }
         }
         $delLogDays = ['720'=> '720 Days', '365'=>'365 days', '180'=>'180 Days',
-       '150'                => '150 Days', '60'=>'60 Days', '30'=>'30 Days', '15'=>'15 Days', '5'=>'5 Days', '2'=>'2 Days', '0'=>'Delete All Logs', ];
+        '150'                => '150 Days', '60'=>'60 Days', '30'=>'30 Days', '15'=>'15 Days', '5'=>'5 Days', '2'=>'2 Days', '0'=>'Delete All Logs', ];
         $beforeLogDay[] = ActivityLogDay::first()->days;
 
         return view('themes.default1.common.cron.cron', compact('cronPath','warn', 'commands', 'condition',
-             'status', 'expiryDays', 'selectedDays', 'delLogDays', 'beforeLogDay', 'execEnabled', 'paths'));
+                'status', 'expiryDays', 'selectedDays', 'delLogDays', 'beforeLogDay', 'execEnabled', 'paths'));
     }
 
     public function postSchedular(StatusSetting $status, Request $request)
@@ -359,8 +359,8 @@ 
         if ($request['expiryday'] != null) {
             foreach ($request['expiryday'] as $key => $value) {
                 $daysList->create([
-          'days'=> $value,
-           ]);
+            'days'=> $value,
+            ]);
             }
         }
         ActivityLogDay::findorFail(1)->update(['days'=>$request->logdelday]);
@@ -406,7 +406,7 @@ 
 
         StatusSetting::where('id', 1)->update(['recaptcha_status'=>$status]);
         ApiKey::where('id', 1)->update(['nocaptcha_sitekey'=> $nocaptcha_sitekey,
-         'captcha_secretCheck'                             => $captcha_secretCheck, ]);
+            'captcha_secretCheck'                             => $captcha_secretCheck, ]);
 
         return ['message' => 'success', 'update'=>'Recaptcha Settings Updated'];
     }

Spacing +2 added lines, -2 removed lines

@@ -218,7 +218,7 @@ 
        '150'                => '150 Days', '60'=>'60 Days', '30'=>'30 Days', '15'=>'15 Days', '5'=>'5 Days', '2'=>'2 Days', '0'=>'Delete All Logs', ];
         $beforeLogDay[] = ActivityLogDay::first()->days;
 
-        return view('themes.default1.common.cron.cron', compact('cronPath','warn', 'commands', 'condition',
+        return view('themes.default1.common.cron.cron', compact('cronPath', 'warn', 'commands', 'condition',
              'status', 'expiryDays', 'selectedDays', 'delLogDays', 'beforeLogDay', 'execEnabled', 'paths'));
     }
 
@@ -279,7 +279,7 @@ 
 
         // validate detected / default PHP CLI
         // Because array_filter() preserves keys, you should consider the resulting array to be an associative array even if the original array had integer keys for there may be holes in your sequence of keys. This means that, for example, json_encode() will convert your result array into an object instead of an array. Call array_values() on the result array to guarantee json_encode() gives you an array.
-        $paths = array_values(array_filter($paths, function ($path) {
+        $paths = array_values(array_filter($paths, function($path) {
             return is_executable($path) && preg_match("/php[0-9\.a-z]{0,3}$/i", $path);
         }));
 

app/Http/Controllers/Common/SettingsController.php

Indentation +59 added lines, -59 removed lines

@@ -254,37 +254,37 @@ 
             //     'subject_id', 'subject_type', 'causer_id', 'properties', 'created_at')->orderBy('id', 'desc');
 
             return \DataTables::of($query->take(50))
-             ->setTotalRecords($query->count())
-             ->addColumn('checkbox', function ($model) {
-                 return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
-             })
-                           ->addColumn('name', function ($model) {
-                               return ucfirst($model->log_name);
-                           })
-                             ->addColumn('description', function ($model) {
-                                 return ucfirst($model->description);
-                             })
-                          ->addColumn('username', function ($model) {
-                              $causer_id = $model->causer_id;
-                              $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
-                              foreach ($names as $key => $value) {
-                                  $fullName = $key.' '.$value;
-
-                                  return $fullName;
-                              }
-                          })
-                              ->addColumn('role', function ($model) {
-                                  $causer_id = $model->causer_id;
-                                  $role = User::where('id', $causer_id)->pluck('role');
-
-                                  return json_decode($role);
-                              })
-                               ->addColumn('new', function ($model) {
-                                   $properties = ($model->properties);
-                                   $newEntry = $this->getNewEntry($properties, $model);
-
-                                   return $newEntry;
-                               })
+                ->setTotalRecords($query->count())
+                ->addColumn('checkbox', function ($model) {
+                    return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
+                })
+                            ->addColumn('name', function ($model) {
+                                return ucfirst($model->log_name);
+                            })
+                                ->addColumn('description', function ($model) {
+                                    return ucfirst($model->description);
+                                })
+                            ->addColumn('username', function ($model) {
+                                $causer_id = $model->causer_id;
+                                $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
+                                foreach ($names as $key => $value) {
+                                    $fullName = $key.' '.$value;
+
+                                    return $fullName;
+                                }
+                            })
+                                ->addColumn('role', function ($model) {
+                                    $causer_id = $model->causer_id;
+                                    $role = User::where('id', $causer_id)->pluck('role');
+
+                                    return json_decode($role);
+                                })
+                                ->addColumn('new', function ($model) {
+                                    $properties = ($model->properties);
+                                    $newEntry = $this->getNewEntry($properties, $model);
+
+                                    return $newEntry;
+                                })
                                 ->addColumn('old', function ($model) {
                                     $data = ($model->properties);
                                     $oldEntry = $this->getOldEntry($data, $model);
@@ -329,39 +329,39 @@ 
             $email_log = \DB::table('email_log')->get();
 
             return\ DataTables::of($email_log)
-             ->addColumn('checkbox', function ($model) {
-                 return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
-             })
-                           ->addColumn('date', function ($model) {
-                               return ucfirst($model->date);
-                           })
-                             ->addColumn('from', function ($model) {
-                                 $from = Markdown::convertToHtml(ucfirst($model->from));
-
-                                 return $from;
-                             })
-                              ->addColumn('to', function ($model) {
-                                  $to = Markdown::convertToHtml(ucfirst($model->to));
-
-                                  return $to;
-                              })
-                             ->addColumn('cc', function ($model) {
-                                 $cc = '--';
-
-                                 return $cc;
-                             })
-
-                               ->addColumn('subject', function ($model) {
-                                   return ucfirst($model->subject);
-                               })
+                ->addColumn('checkbox', function ($model) {
+                    return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
+                })
+                            ->addColumn('date', function ($model) {
+                                return ucfirst($model->date);
+                            })
+                                ->addColumn('from', function ($model) {
+                                    $from = Markdown::convertToHtml(ucfirst($model->from));
+
+                                    return $from;
+                                })
+                                ->addColumn('to', function ($model) {
+                                    $to = Markdown::convertToHtml(ucfirst($model->to));
+
+                                    return $to;
+                                })
+                                ->addColumn('cc', function ($model) {
+                                    $cc = '--';
+
+                                    return $cc;
+                                })
+
+                                ->addColumn('subject', function ($model) {
+                                    return ucfirst($model->subject);
+                                })
                                 ->addColumn('headers', function ($model) {
                                     $headers = Markdown::convertToHtml(ucfirst($model->headers));
 
                                     return $headers;
                                 })
-                              ->addColumn('status', function ($model) {
-                                  return ucfirst($model->status);
-                              })
+                                ->addColumn('status', function ($model) {
+                                    return ucfirst($model->status);
+                                })
 
                             ->rawColumns(['checkbox', 'date', 'from', 'to', 'cc',
                                 'bcc', 'subject', 'headers', 'status', ])

Spacing +19 added lines, -19 removed lines

@@ -255,16 +255,16 @@ 
 
             return \DataTables::of($query->take(50))
              ->setTotalRecords($query->count())
-             ->addColumn('checkbox', function ($model) {
+             ->addColumn('checkbox', function($model) {
                  return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
              })
-                           ->addColumn('name', function ($model) {
+                           ->addColumn('name', function($model) {
                                return ucfirst($model->log_name);
                            })
-                             ->addColumn('description', function ($model) {
+                             ->addColumn('description', function($model) {
                                  return ucfirst($model->description);
                              })
-                          ->addColumn('username', function ($model) {
+                          ->addColumn('username', function($model) {
                               $causer_id = $model->causer_id;
                               $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
                               foreach ($names as $key => $value) {
@@ -273,41 +273,41 @@ 
                                   return $fullName;
                               }
                           })
-                              ->addColumn('role', function ($model) {
+                              ->addColumn('role', function($model) {
                                   $causer_id = $model->causer_id;
                                   $role = User::where('id', $causer_id)->pluck('role');
 
                                   return json_decode($role);
                               })
-                               ->addColumn('new', function ($model) {
+                               ->addColumn('new', function($model) {
                                    $properties = ($model->properties);
                                    $newEntry = $this->getNewEntry($properties, $model);
 
                                    return $newEntry;
                                })
-                                ->addColumn('old', function ($model) {
+                                ->addColumn('old', function($model) {
                                     $data = ($model->properties);
                                     $oldEntry = $this->getOldEntry($data, $model);
 
                                     return $oldEntry;
                                 })
-                                ->addColumn('created_at', function ($model) {
+                                ->addColumn('created_at', function($model) {
                                     $newDate = $this->getDate($model->created_at);
 
                                     return $newDate;
                                 })
 
-                                    ->filterColumn('log_name', function ($query, $keyword) {
+                                    ->filterColumn('log_name', function($query, $keyword) {
                                         $sql = 'log_name like ?';
                                         $query->whereRaw($sql, ["%{$keyword}%"]);
                                     })
 
-                                ->filterColumn('description', function ($query, $keyword) {
+                                ->filterColumn('description', function($query, $keyword) {
                                     $sql = 'description like ?';
                                     $query->whereRaw($sql, ["%{$keyword}%"]);
                                 })
 
-                            ->filterColumn('causer_id', function ($query, $keyword) {
+                            ->filterColumn('causer_id', function($query, $keyword) {
                                 $sql = 'first_name like ?';
                                 $query->whereRaw($sql, ["%{$keyword}%"]);
                             })
@@ -329,37 +329,37 @@ 
             $email_log = \DB::table('email_log')->get();
 
             return\ DataTables::of($email_log)
-             ->addColumn('checkbox', function ($model) {
+             ->addColumn('checkbox', function($model) {
                  return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
              })
-                           ->addColumn('date', function ($model) {
+                           ->addColumn('date', function($model) {
                                return ucfirst($model->date);
                            })
-                             ->addColumn('from', function ($model) {
+                             ->addColumn('from', function($model) {
                                  $from = Markdown::convertToHtml(ucfirst($model->from));
 
                                  return $from;
                              })
-                              ->addColumn('to', function ($model) {
+                              ->addColumn('to', function($model) {
                                   $to = Markdown::convertToHtml(ucfirst($model->to));
 
                                   return $to;
                               })
-                             ->addColumn('cc', function ($model) {
+                             ->addColumn('cc', function($model) {
                                  $cc = '--';
 
                                  return $cc;
                              })
 
-                               ->addColumn('subject', function ($model) {
+                               ->addColumn('subject', function($model) {
                                    return ucfirst($model->subject);
                                })
-                                ->addColumn('headers', function ($model) {
+                                ->addColumn('headers', function($model) {
                                     $headers = Markdown::convertToHtml(ucfirst($model->headers));
 
                                     return $headers;
                                 })
-                              ->addColumn('status', function ($model) {
+                              ->addColumn('status', function($model) {
                                   return ucfirst($model->status);
                               })