Completed
Push — development ( 24d50c...7ed4f4 )
by Ashutosh
10:17
created
app/Model/Github/Github.php 3 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,18 +9,18 @@
 block discarded – undo
9 9
     protected $table = 'githubs';
10 10
     protected $fillable = ['client_id', 'client_secret', 'username', 'password'];
11 11
 
12
-   public function getPasswordAttribute($value)
12
+    public function getPasswordAttribute($value)
13 13
     {
14
-    	if($value){
15
-    	$value = \Crypt::decrypt($value);
16
-     }
17
-     return $value;
14
+        if($value){
15
+        $value = \Crypt::decrypt($value);
16
+        }
17
+        return $value;
18 18
     }
19 19
 
20 20
     public function setPasswordAttribute($value)
21 21
     {
22
-    	$value = \Crypt::encrypt($value);
23
-    	$this->attributes['password'] = $value;
22
+        $value = \Crypt::encrypt($value);
23
+        $this->attributes['password'] = $value;
24 24
     	
25 25
     }
26 26
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 
12 12
    public function getPasswordAttribute($value)
13 13
     {
14
-    	if($value){
14
+    	if ($value) {
15 15
     	$value = \Crypt::decrypt($value);
16 16
      }
17 17
      return $value;
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@
 block discarded – undo
10 10
     protected $fillable = ['client_id', 'client_secret', 'username', 'password'];
11 11
 
12 12
    public function getPasswordAttribute($value)
13
-    {
14
-    	if($value){
13
+   {
14
+    	if($value) {
15 15
     	$value = \Crypt::decrypt($value);
16 16
      }
17 17
      return $value;
Please login to merge, or discard this patch.
app/Http/Controllers/Common/SettingsController.php 2 patches
Indentation   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
     {
82 82
         try {
83 83
             $set = $settings->find(1);
84
-             $state = \App\Http\Controllers\Front\CartController::getStateByCode($set->state);
84
+                $state = \App\Http\Controllers\Front\CartController::getStateByCode($set->state);
85 85
             $selectedCountry = \DB::table('countries')->where('country_code_char2',$set->country)
86 86
             ->pluck('nicename','country_code_char2')->toArray();
87
-             $states = \App\Http\Controllers\Front\CartController::findStateByRegionId($set->country);
87
+                $states = \App\Http\Controllers\Front\CartController::findStateByRegionId($set->country);
88 88
 
89 89
             return view('themes.default1.common.setting.system', compact('set','selectedCountry','state','states'));
90 90
         } catch (\Exception $ex) {
@@ -226,37 +226,37 @@  discard block
 block discarded – undo
226 226
                 'subject_id', 'subject_type', 'causer_id', 'properties', 'created_at');
227 227
 
228 228
             return \DataTables::of($activity_log->take(50))
229
-             ->setTotalRecords($activity_log->count())
230
-             ->addColumn('checkbox', function ($model) {
231
-                 return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
232
-             })
233
-                           ->addColumn('name', function ($model) {
234
-                               return ucfirst($model->log_name);
235
-                           })
236
-                             ->addColumn('description', function ($model) {
237
-                                 return ucfirst($model->description);
238
-                             })
239
-                          ->addColumn('username', function ($model) {
240
-                              $causer_id = $model->causer_id;
241
-                              $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
242
-                              foreach ($names as $key => $value) {
243
-                                  $fullName = $key.' '.$value;
244
-
245
-                                  return $fullName;
246
-                              }
247
-                          })
248
-                              ->addColumn('role', function ($model) {
249
-                                  $causer_id = $model->causer_id;
250
-                                  $role = User::where('id', $causer_id)->pluck('role');
251
-
252
-                                  return json_decode($role);
253
-                              })
254
-                               ->addColumn('new', function ($model) {
255
-                                   $properties = ($model->properties);
256
-                                   $newEntry = $this->getNewEntry($properties, $model);
257
-
258
-                                   return $newEntry;
259
-                               })
229
+                ->setTotalRecords($activity_log->count())
230
+                ->addColumn('checkbox', function ($model) {
231
+                    return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
232
+                })
233
+                            ->addColumn('name', function ($model) {
234
+                                return ucfirst($model->log_name);
235
+                            })
236
+                                ->addColumn('description', function ($model) {
237
+                                    return ucfirst($model->description);
238
+                                })
239
+                            ->addColumn('username', function ($model) {
240
+                                $causer_id = $model->causer_id;
241
+                                $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
242
+                                foreach ($names as $key => $value) {
243
+                                    $fullName = $key.' '.$value;
244
+
245
+                                    return $fullName;
246
+                                }
247
+                            })
248
+                                ->addColumn('role', function ($model) {
249
+                                    $causer_id = $model->causer_id;
250
+                                    $role = User::where('id', $causer_id)->pluck('role');
251
+
252
+                                    return json_decode($role);
253
+                                })
254
+                                ->addColumn('new', function ($model) {
255
+                                    $properties = ($model->properties);
256
+                                    $newEntry = $this->getNewEntry($properties, $model);
257
+
258
+                                    return $newEntry;
259
+                                })
260 260
                                 ->addColumn('old', function ($model) {
261 261
                                     $data = ($model->properties);
262 262
                                     $oldEntry = $this->getOldEntry($data, $model);
@@ -300,40 +300,40 @@  discard block
 block discarded – undo
300 300
             $email_log = \DB::table('email_log')->get();
301 301
 
302 302
             return\ DataTables::of($email_log)
303
-             ->addColumn('checkbox', function ($model) {
304
-                 return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
305
-             })
306
-                           ->addColumn('date', function ($model) {
307
-                               return ucfirst($model->date);
308
-                           })
309
-                             ->addColumn('from', function ($model) {
310
-                                 $from = Markdown::convertToHtml(ucfirst($model->from));
311
-
312
-                                 return $from;
313
-                             })
314
-                              ->addColumn('to', function ($model) {
315
-                                  $to = Markdown::convertToHtml(ucfirst($model->to));
316
-
317
-                                  return $to;
318
-                              })
319
-                             ->addColumn('cc', function ($model) {
320
-                                 $cc = '--';
321
-
322
-                                 return $cc;
323
-                             })
324
-
325
-                               ->addColumn('subject', function ($model) {
326
-                                   return ucfirst($model->subject);
327
-                               })
328
-
329
-                              ->addColumn('headers', function ($model) {
330
-                                  $headers = Markdown::convertToHtml(ucfirst($model->headers));
331
-
332
-                                  return $headers;
333
-                              })
334
-                              ->addColumn('status', function ($model) {
335
-                                  return ucfirst($model->status);
336
-                              })
303
+                ->addColumn('checkbox', function ($model) {
304
+                    return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
305
+                })
306
+                            ->addColumn('date', function ($model) {
307
+                                return ucfirst($model->date);
308
+                            })
309
+                                ->addColumn('from', function ($model) {
310
+                                    $from = Markdown::convertToHtml(ucfirst($model->from));
311
+
312
+                                    return $from;
313
+                                })
314
+                                ->addColumn('to', function ($model) {
315
+                                    $to = Markdown::convertToHtml(ucfirst($model->to));
316
+
317
+                                    return $to;
318
+                                })
319
+                                ->addColumn('cc', function ($model) {
320
+                                    $cc = '--';
321
+
322
+                                    return $cc;
323
+                                })
324
+
325
+                                ->addColumn('subject', function ($model) {
326
+                                    return ucfirst($model->subject);
327
+                                })
328
+
329
+                                ->addColumn('headers', function ($model) {
330
+                                    $headers = Markdown::convertToHtml(ucfirst($model->headers));
331
+
332
+                                    return $headers;
333
+                                })
334
+                                ->addColumn('status', function ($model) {
335
+                                    return ucfirst($model->status);
336
+                                })
337 337
 
338 338
                             ->rawColumns(['checkbox', 'date', 'from', 'to', 'cc',
339 339
                                 'bcc', 'subject', 'headers', 'status', ])
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -82,11 +82,11 @@  discard block
 block discarded – undo
82 82
         try {
83 83
             $set = $settings->find(1);
84 84
              $state = \App\Http\Controllers\Front\CartController::getStateByCode($set->state);
85
-            $selectedCountry = \DB::table('countries')->where('country_code_char2',$set->country)
86
-            ->pluck('nicename','country_code_char2')->toArray();
85
+            $selectedCountry = \DB::table('countries')->where('country_code_char2', $set->country)
86
+            ->pluck('nicename', 'country_code_char2')->toArray();
87 87
              $states = \App\Http\Controllers\Front\CartController::findStateByRegionId($set->country);
88 88
 
89
-            return view('themes.default1.common.setting.system', compact('set','selectedCountry','state','states'));
89
+            return view('themes.default1.common.setting.system', compact('set', 'selectedCountry', 'state', 'states'));
90 90
         } catch (\Exception $ex) {
91 91
             return redirect()->back()->with('fails', $ex->getMessage());
92 92
         }
@@ -227,16 +227,16 @@  discard block
 block discarded – undo
227 227
 
228 228
             return \DataTables::of($activity_log->take(50))
229 229
              ->setTotalRecords($activity_log->count())
230
-             ->addColumn('checkbox', function ($model) {
230
+             ->addColumn('checkbox', function($model) {
231 231
                  return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
232 232
              })
233
-                           ->addColumn('name', function ($model) {
233
+                           ->addColumn('name', function($model) {
234 234
                                return ucfirst($model->log_name);
235 235
                            })
236
-                             ->addColumn('description', function ($model) {
236
+                             ->addColumn('description', function($model) {
237 237
                                  return ucfirst($model->description);
238 238
                              })
239
-                          ->addColumn('username', function ($model) {
239
+                          ->addColumn('username', function($model) {
240 240
                               $causer_id = $model->causer_id;
241 241
                               $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
242 242
                               foreach ($names as $key => $value) {
@@ -245,41 +245,41 @@  discard block
 block discarded – undo
245 245
                                   return $fullName;
246 246
                               }
247 247
                           })
248
-                              ->addColumn('role', function ($model) {
248
+                              ->addColumn('role', function($model) {
249 249
                                   $causer_id = $model->causer_id;
250 250
                                   $role = User::where('id', $causer_id)->pluck('role');
251 251
 
252 252
                                   return json_decode($role);
253 253
                               })
254
-                               ->addColumn('new', function ($model) {
254
+                               ->addColumn('new', function($model) {
255 255
                                    $properties = ($model->properties);
256 256
                                    $newEntry = $this->getNewEntry($properties, $model);
257 257
 
258 258
                                    return $newEntry;
259 259
                                })
260
-                                ->addColumn('old', function ($model) {
260
+                                ->addColumn('old', function($model) {
261 261
                                     $data = ($model->properties);
262 262
                                     $oldEntry = $this->getOldEntry($data, $model);
263 263
 
264 264
                                     return $oldEntry;
265 265
                                 })
266
-                                ->addColumn('created_at', function ($model) {
266
+                                ->addColumn('created_at', function($model) {
267 267
                                     $newDate = $this->getDate($model->created_at);
268 268
 
269 269
                                     return $newDate;
270 270
                                 })
271 271
 
272
-                                    ->filterColumn('log_name', function ($query, $keyword) {
272
+                                    ->filterColumn('log_name', function($query, $keyword) {
273 273
                                         $sql = 'log_name like ?';
274 274
                                         $query->whereRaw($sql, ["%{$keyword}%"]);
275 275
                                     })
276 276
 
277
-                                ->filterColumn('description', function ($query, $keyword) {
277
+                                ->filterColumn('description', function($query, $keyword) {
278 278
                                     $sql = 'description like ?';
279 279
                                     $query->whereRaw($sql, ["%{$keyword}%"]);
280 280
                                 })
281 281
 
282
-                            ->filterColumn('causer_id', function ($query, $keyword) {
282
+                            ->filterColumn('causer_id', function($query, $keyword) {
283 283
                                 $sql = 'first_name like ?';
284 284
                                 $query->whereRaw($sql, ["%{$keyword}%"]);
285 285
                             })
@@ -300,38 +300,38 @@  discard block
 block discarded – undo
300 300
             $email_log = \DB::table('email_log')->get();
301 301
 
302 302
             return\ DataTables::of($email_log)
303
-             ->addColumn('checkbox', function ($model) {
303
+             ->addColumn('checkbox', function($model) {
304 304
                  return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
305 305
              })
306
-                           ->addColumn('date', function ($model) {
306
+                           ->addColumn('date', function($model) {
307 307
                                return ucfirst($model->date);
308 308
                            })
309
-                             ->addColumn('from', function ($model) {
309
+                             ->addColumn('from', function($model) {
310 310
                                  $from = Markdown::convertToHtml(ucfirst($model->from));
311 311
 
312 312
                                  return $from;
313 313
                              })
314
-                              ->addColumn('to', function ($model) {
314
+                              ->addColumn('to', function($model) {
315 315
                                   $to = Markdown::convertToHtml(ucfirst($model->to));
316 316
 
317 317
                                   return $to;
318 318
                               })
319
-                             ->addColumn('cc', function ($model) {
319
+                             ->addColumn('cc', function($model) {
320 320
                                  $cc = '--';
321 321
 
322 322
                                  return $cc;
323 323
                              })
324 324
 
325
-                               ->addColumn('subject', function ($model) {
325
+                               ->addColumn('subject', function($model) {
326 326
                                    return ucfirst($model->subject);
327 327
                                })
328 328
 
329
-                              ->addColumn('headers', function ($model) {
329
+                              ->addColumn('headers', function($model) {
330 330
                                   $headers = Markdown::convertToHtml(ucfirst($model->headers));
331 331
 
332 332
                                   return $headers;
333 333
                               })
334
-                              ->addColumn('status', function ($model) {
334
+                              ->addColumn('status', function($model) {
335 335
                                   return ucfirst($model->status);
336 336
                               })
337 337
 
Please login to merge, or discard this patch.