Completed
Push — development ( 877883...280d38 )
by Ashutosh
10:04
created
app/Model/Common/ChatScript.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,6 +33,6 @@
 block discarded – undo
33 33
         return '';
34 34
 
35 35
         // return "Product  has been {$eventName}";
36
-         // \Auth::user()->activity;
36
+            // \Auth::user()->activity;
37 37
     }
38 38
 }
Please login to merge, or discard this patch.
app/Model/Product/ProductCategory.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,6 +33,6 @@
 block discarded – undo
33 33
         return '';
34 34
 
35 35
         // return "Product  has been {$eventName}";
36
-         // \Auth::user()->activity;
36
+            // \Auth::user()->activity;
37 37
     }
38 38
 }
Please login to merge, or discard this patch.
app/Model/Product/Product.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     protected static $logName = 'Product';
20 20
 
21 21
     protected static $logAttributes = ['name', 'description', 'type', 'file', 'category',
22
-         'github_owner', 'github_repository', 'version',  'subscription', 'hidden', 'product_sku', ];
22
+            'github_owner', 'github_repository', 'version',  'subscription', 'hidden', 'product_sku', ];
23 23
 
24 24
     protected static $logOnlyDirty = true;
25 25
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
     use LogsActivity;
11 11
     protected $table = 'products';
12 12
     protected $fillable = ['name', 'description', 'type', 'group', 'file', 'image', 'require_domain', 'category',
13
-        'can_modify_agent',  'can_modify_quantity', 'show_agent', 'tax_apply', 'show_product_quantity', 'hidden',  'auto_terminate',
13
+        'can_modify_agent', 'can_modify_quantity', 'show_agent', 'tax_apply', 'show_product_quantity', 'hidden', 'auto_terminate',
14 14
         'setup_order_placed', 'setup_first_payment', 'setup_accept_manually',
15 15
         'no_auto_setup', 'shoping_cart_link', 'process_url', 'github_owner',
16 16
         'github_repository',
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
     protected static $logName = 'Product';
20 20
 
21 21
     protected static $logAttributes = ['name', 'description', 'type', 'file', 'category',
22
-         'github_owner', 'github_repository', 'version',  'subscription', 'hidden', 'product_sku', ];
22
+         'github_owner', 'github_repository', 'version', 'subscription', 'hidden', 'product_sku', ];
23 23
 
24 24
     protected static $logOnlyDirty = true;
25 25
 
Please login to merge, or discard this patch.
app/Console/Kernel.php 2 patches
Switch Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -48,15 +48,15 @@
 block discarded – undo
48 48
             $condition = new \App\Model\Mailjob\Condition();
49 49
             $command = $condition->getConditionValue($task);
50 50
             switch ($task) {
51
-            case 'expiryMail':
52
-               if ($expiryMailStatus == 1) {
53
-                   return $this->getCondition($schedule->command('expiry:notification'), $command);
54
-               }
51
+                case 'expiryMail':
52
+                   if ($expiryMailStatus == 1) {
53
+                       return $this->getCondition($schedule->command('expiry:notification'), $command);
54
+                   }
55 55
 
56
-            case 'deleteLogs':
57
-             if ($logDeleteStatus == 1) {
58
-                 return $this->getCondition($schedule->command('activitylog:clean'), $command);
59
-             }
56
+                case 'deleteLogs':
57
+                 if ($logDeleteStatus == 1) {
58
+                     return $this->getCondition($schedule->command('activitylog:clean'), $command);
59
+                 }
60 60
             }
61 61
         }
62 62
     }
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
      */
18 18
     protected $commands = [
19 19
         //
20
-         'App\Console\Commands\Inspire',
21
-         \App\Console\Commands\Install::class,
22
-          CurrencyManage::class,
20
+            'App\Console\Commands\Inspire',
21
+            \App\Console\Commands\Install::class,
22
+            CurrencyManage::class,
23 23
         'App\Console\Commands\ExpiryCron',
24 24
     ];
25 25
 
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
             switch ($task) {
53 53
             case 'expiryMail':
54 54
                if ($expiryMailStatus == 1) {
55
-                   return $this->getCondition($schedule->command('expiry:notification'), $command);
56
-               }
55
+                    return $this->getCondition($schedule->command('expiry:notification'), $command);
56
+                }
57 57
 
58 58
             case 'deleteLogs':
59 59
              if ($logDeleteStatus == 1) {
60
-                 return $this->getCondition($schedule->command('activitylog:clean'), $command);
61
-             }
60
+                    return $this->getCondition($schedule->command('activitylog:clean'), $command);
61
+                }
62 62
             }
63 63
         }
64 64
     }
Please login to merge, or discard this patch.
app/Plugins/Ccavanue/Controllers/ProcessController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -120,10 +120,10 @@
 block discarded – undo
120 120
             $url = '';
121 121
             $crypto = new Crypto();
122 122
             $ccavanue = $this->ccavanue->findOrFail(1);
123
-            $workingKey = $ccavanue->working_key;  //Working Key should be provided here.
124
-            $encResponse = $request->get('encResp');   //This is the response sent by the CCAvenue Server
123
+            $workingKey = $ccavanue->working_key; //Working Key should be provided here.
124
+            $encResponse = $request->get('encResp'); //This is the response sent by the CCAvenue Server
125 125
 
126
-            $rcvdString = \Crypt::decrypt($encResponse, $workingKey);  //Crypto Decryption used as per the specified working key.
126
+            $rcvdString = \Crypt::decrypt($encResponse, $workingKey); //Crypto Decryption used as per the specified working key.
127 127
             $order_status = '';
128 128
             $decryptValues = explode('&', $rcvdString);
129 129
             $dataSize = count($decryptValues);
Please login to merge, or discard this patch.
app/Http/Controllers/Common/BaseTemplateController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,8 @@
 block discarded – undo
25 25
             $currencyAndSymbol = $cart_controller->currency();
26 26
             $currency = $currencyAndSymbol['currency'];
27 27
             $symbol = $currencyAndSymbol['symbol'];
28
-            if ($symbol == '') {  //If user has no currency symbol(In case of old customers)
28
+            if ($symbol == '') {
29
+//If user has no currency symbol(In case of old customers)
29 30
                 $symbol = Currency::where('code', $currency)->pluck('symbol')->first();
30 31
                 $symbol = \Auth::user()->update(['currency_symbol'=> $symbol]);
31 32
             }
Please login to merge, or discard this patch.
app/Http/Controllers/Common/BaseSettingsController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -435,7 +435,7 @@
 block discarded – undo
435 435
 
436 436
         StatusSetting::where('id', 1)->update(['recaptcha_status'=>$status]);
437 437
         ApiKey::where('id', 1)->update(['nocaptcha_sitekey'=> $nocaptcha_sitekey,
438
-         'captcha_secretCheck'                             => $captcha_secretCheck, ]);
438
+            'captcha_secretCheck'                             => $captcha_secretCheck, ]);
439 439
 
440 440
         return ['message' => 'success', 'update'=>'Recaptcha Settings Updated'];
441 441
     }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@
 block discarded – undo
296 296
 
297 297
         // validate detected / default PHP CLI
298 298
         // 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.
299
-        $paths = array_values(array_filter($paths, function ($path) {
299
+        $paths = array_values(array_filter($paths, function($path) {
300 300
             return is_executable($path) && preg_match("/php[0-9\.a-z]{0,3}$/i", $path);
301 301
         }));
302 302
 
Please login to merge, or discard this patch.
app/Http/Controllers/Common/PaymentSettingsController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@
 block discarded – undo
87 87
                         ->addColumn('version', function ($model) {
88 88
                             return $model['version'];
89 89
                         })
90
-                      ->rawColumns(['name', 'description', 'author', 'website', 'version'])
90
+                        ->rawColumns(['name', 'description', 'author', 'website', 'version'])
91 91
                             ->make(true);
92 92
     }
93 93
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
         return \DataTables::of(new Collection($plugins))
17 17
                         // ->searchColumns('name')
18
-                        ->addColumn('name', function ($model) {
18
+                        ->addColumn('name', function($model) {
19 19
                             if (array_has($model, 'path')) {
20 20
                                 if ($model['status'] == 0) {
21 21
                                     $activate = '<a href='.url('plugin/status/'.$model['name']).'>Activate</a>';
@@ -51,16 +51,16 @@  discard block
 block discarded – undo
51 51
 
52 52
                             return ucfirst($model['name']).$action;
53 53
                         })
54
-                        ->addColumn('description', function ($model) {
54
+                        ->addColumn('description', function($model) {
55 55
                             return $model['description'];
56 56
                         })
57
-                        ->addColumn('author', function ($model) {
57
+                        ->addColumn('author', function($model) {
58 58
                             return ucfirst($model['author']);
59 59
                         })
60
-                        ->addColumn('website', function ($model) {
60
+                        ->addColumn('website', function($model) {
61 61
                             return '<a href='.$model['website'].' target=_blank>'.$model['website'].'</a>';
62 62
                         })
63
-                        ->addColumn('version', function ($model) {
63
+                        ->addColumn('version', function($model) {
64 64
                             return $model['version'];
65 65
                         })
66 66
                       ->rawColumns(['name', 'description', 'author', 'website', 'version'])
Please login to merge, or discard this patch.
app/Http/Controllers/Common/SettingsController.php 3 patches
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -279,37 +279,37 @@  discard block
 block discarded – undo
279 279
             $query = $this->advanceSearch($from, $till, $delFrom, $delTill);
280 280
 
281 281
             return \DataTables::of($query->take(50))
282
-             ->setTotalRecords($query->count())
283
-             ->addColumn('checkbox', function ($model) {
284
-                 return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
285
-             })
286
-                           ->addColumn('name', function ($model) {
287
-                               return ucfirst($model->log_name);
288
-                           })
289
-                             ->addColumn('description', function ($model) {
290
-                                 return ucfirst($model->description);
291
-                             })
292
-                          ->addColumn('username', function ($model) {
293
-                              $causer_id = $model->causer_id;
294
-                              $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
295
-                              foreach ($names as $key => $value) {
296
-                                  $fullName = $key.' '.$value;
297
-
298
-                                  return $fullName;
299
-                              }
300
-                          })
301
-                              ->addColumn('role', function ($model) {
302
-                                  $causer_id = $model->causer_id;
303
-                                  $role = User::where('id', $causer_id)->pluck('role');
304
-
305
-                                  return json_decode($role);
306
-                              })
307
-                               ->addColumn('new', function ($model) {
308
-                                   $properties = ($model->properties);
309
-                                   $newEntry = $this->getNewEntry($properties, $model);
310
-
311
-                                   return $newEntry;
312
-                               })
282
+                ->setTotalRecords($query->count())
283
+                ->addColumn('checkbox', function ($model) {
284
+                    return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
285
+                })
286
+                            ->addColumn('name', function ($model) {
287
+                                return ucfirst($model->log_name);
288
+                            })
289
+                                ->addColumn('description', function ($model) {
290
+                                    return ucfirst($model->description);
291
+                                })
292
+                            ->addColumn('username', function ($model) {
293
+                                $causer_id = $model->causer_id;
294
+                                $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
295
+                                foreach ($names as $key => $value) {
296
+                                    $fullName = $key.' '.$value;
297
+
298
+                                    return $fullName;
299
+                                }
300
+                            })
301
+                                ->addColumn('role', function ($model) {
302
+                                    $causer_id = $model->causer_id;
303
+                                    $role = User::where('id', $causer_id)->pluck('role');
304
+
305
+                                    return json_decode($role);
306
+                                })
307
+                                ->addColumn('new', function ($model) {
308
+                                    $properties = ($model->properties);
309
+                                    $newEntry = $this->getNewEntry($properties, $model);
310
+
311
+                                    return $newEntry;
312
+                                })
313 313
                                 ->addColumn('old', function ($model) {
314 314
                                     $data = ($model->properties);
315 315
                                     $oldEntry = $this->getOldEntry($data, $model);
@@ -354,39 +354,39 @@  discard block
 block discarded – undo
354 354
             $email_log = \DB::table('email_log')->get();
355 355
 
356 356
             return\ DataTables::of($email_log)
357
-             ->addColumn('checkbox', function ($model) {
358
-                 return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
359
-             })
360
-                           ->addColumn('date', function ($model) {
361
-                               return ucfirst($model->date);
362
-                           })
363
-                             ->addColumn('from', function ($model) {
364
-                                 $from = Markdown::convertToHtml(ucfirst($model->from));
365
-
366
-                                 return $from;
367
-                             })
368
-                              ->addColumn('to', function ($model) {
369
-                                  $to = Markdown::convertToHtml(ucfirst($model->to));
370
-
371
-                                  return $to;
372
-                              })
373
-                             ->addColumn('cc', function ($model) {
374
-                                 $cc = '--';
375
-
376
-                                 return $cc;
377
-                             })
378
-
379
-                               ->addColumn('subject', function ($model) {
380
-                                   return ucfirst($model->subject);
381
-                               })
357
+                ->addColumn('checkbox', function ($model) {
358
+                    return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
359
+                })
360
+                            ->addColumn('date', function ($model) {
361
+                                return ucfirst($model->date);
362
+                            })
363
+                                ->addColumn('from', function ($model) {
364
+                                    $from = Markdown::convertToHtml(ucfirst($model->from));
365
+
366
+                                    return $from;
367
+                                })
368
+                                ->addColumn('to', function ($model) {
369
+                                    $to = Markdown::convertToHtml(ucfirst($model->to));
370
+
371
+                                    return $to;
372
+                                })
373
+                                ->addColumn('cc', function ($model) {
374
+                                    $cc = '--';
375
+
376
+                                    return $cc;
377
+                                })
378
+
379
+                                ->addColumn('subject', function ($model) {
380
+                                    return ucfirst($model->subject);
381
+                                })
382 382
                                 ->addColumn('headers', function ($model) {
383 383
                                     $headers = Markdown::convertToHtml(ucfirst($model->headers));
384 384
 
385 385
                                     return $headers;
386 386
                                 })
387
-                              ->addColumn('status', function ($model) {
388
-                                  return ucfirst($model->status);
389
-                              })
387
+                                ->addColumn('status', function ($model) {
388
+                                    return ucfirst($model->status);
389
+                                })
390 390
 
391 391
                             ->rawColumns(['checkbox', 'date', 'from', 'to', 'cc',
392 392
                                 'bcc', 'subject', 'headers', 'status', ])
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,8 @@
 block discarded – undo
96 96
                     $pluginName[] = $plugin->name; //get the name of active plugin
97 97
                 }
98 98
 
99
-                if (count($models) > 0) {//If more than 1 plugin is active it will check the currencies allowed for that plugin.If the currencies allowed matches the passed arguement(currency),that plugin name is returned
99
+                if (count($models) > 0) {
100
+//If more than 1 plugin is active it will check the currencies allowed for that plugin.If the currencies allowed matches the passed arguement(currency),that plugin name is returned
100 101
                     for ($i = 0; $i < count($pluginName); $i++) {
101 102
                         $currencies = explode(',', $models[$i]->currencies);
102 103
                         if (in_array($currency, $currencies)) {
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
             $mobileauthkey = $apikeys->pluck('msg91_auth_key')->first();
68 68
             $updateUrl = $apikeys->pluck('update_api_url')->first();
69 69
             $emailStatus = StatusSetting::pluck('emailverification_status')->first();
70
-            $twitterKeys = $apikeys->select('twitter_consumer_key','twitter_consumer_secret',
70
+            $twitterKeys = $apikeys->select('twitter_consumer_key', 'twitter_consumer_secret',
71 71
                 'twitter_access_token', 'access_tooken_secret')->first();
72 72
             $twitterStatus = $this->statusSetting->pluck('twitter_status')->first();
73 73
             $zohoStatus = $this->statusSetting->pluck('zoho_status')->first();
@@ -299,16 +299,16 @@  discard block
 block discarded – undo
299 299
 
300 300
             return \DataTables::of($query->take(50))
301 301
              ->setTotalRecords($query->count())
302
-             ->addColumn('checkbox', function ($model) {
302
+             ->addColumn('checkbox', function($model) {
303 303
                  return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
304 304
              })
305
-                           ->addColumn('name', function ($model) {
305
+                           ->addColumn('name', function($model) {
306 306
                                return ucfirst($model->log_name);
307 307
                            })
308
-                             ->addColumn('description', function ($model) {
308
+                             ->addColumn('description', function($model) {
309 309
                                  return ucfirst($model->description);
310 310
                              })
311
-                          ->addColumn('username', function ($model) {
311
+                          ->addColumn('username', function($model) {
312 312
                               $causer_id = $model->causer_id;
313 313
                               $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
314 314
                               foreach ($names as $key => $value) {
@@ -317,41 +317,41 @@  discard block
 block discarded – undo
317 317
                                   return $fullName;
318 318
                               }
319 319
                           })
320
-                              ->addColumn('role', function ($model) {
320
+                              ->addColumn('role', function($model) {
321 321
                                   $causer_id = $model->causer_id;
322 322
                                   $role = User::where('id', $causer_id)->pluck('role');
323 323
 
324 324
                                   return json_decode($role);
325 325
                               })
326
-                               ->addColumn('new', function ($model) {
326
+                               ->addColumn('new', function($model) {
327 327
                                    $properties = ($model->properties);
328 328
                                    $newEntry = $this->getNewEntry($properties, $model);
329 329
 
330 330
                                    return $newEntry;
331 331
                                })
332
-                                ->addColumn('old', function ($model) {
332
+                                ->addColumn('old', function($model) {
333 333
                                     $data = ($model->properties);
334 334
                                     $oldEntry = $this->getOldEntry($data, $model);
335 335
 
336 336
                                     return $oldEntry;
337 337
                                 })
338
-                                ->addColumn('created_at', function ($model) {
338
+                                ->addColumn('created_at', function($model) {
339 339
                                     $newDate = $this->getDate($model->created_at);
340 340
 
341 341
                                     return $newDate;
342 342
                                 })
343 343
 
344
-                                    ->filterColumn('log_name', function ($query, $keyword) {
344
+                                    ->filterColumn('log_name', function($query, $keyword) {
345 345
                                         $sql = 'log_name like ?';
346 346
                                         $query->whereRaw($sql, ["%{$keyword}%"]);
347 347
                                     })
348 348
 
349
-                                ->filterColumn('description', function ($query, $keyword) {
349
+                                ->filterColumn('description', function($query, $keyword) {
350 350
                                     $sql = 'description like ?';
351 351
                                     $query->whereRaw($sql, ["%{$keyword}%"]);
352 352
                                 })
353 353
 
354
-                            ->filterColumn('causer_id', function ($query, $keyword) {
354
+                            ->filterColumn('causer_id', function($query, $keyword) {
355 355
                                 $sql = 'first_name like ?';
356 356
                                 $query->whereRaw($sql, ["%{$keyword}%"]);
357 357
                             })
@@ -373,37 +373,37 @@  discard block
 block discarded – undo
373 373
             $email_log = \DB::table('email_log')->get();
374 374
 
375 375
             return\ DataTables::of($email_log)
376
-             ->addColumn('checkbox', function ($model) {
376
+             ->addColumn('checkbox', function($model) {
377 377
                  return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
378 378
              })
379
-                           ->addColumn('date', function ($model) {
379
+                           ->addColumn('date', function($model) {
380 380
                                return ucfirst($model->date);
381 381
                            })
382
-                             ->addColumn('from', function ($model) {
382
+                             ->addColumn('from', function($model) {
383 383
                                  $from = Markdown::convertToHtml(ucfirst($model->from));
384 384
 
385 385
                                  return $from;
386 386
                              })
387
-                              ->addColumn('to', function ($model) {
387
+                              ->addColumn('to', function($model) {
388 388
                                   $to = Markdown::convertToHtml(ucfirst($model->to));
389 389
 
390 390
                                   return $to;
391 391
                               })
392
-                             ->addColumn('cc', function ($model) {
392
+                             ->addColumn('cc', function($model) {
393 393
                                  $cc = '--';
394 394
 
395 395
                                  return $cc;
396 396
                              })
397 397
 
398
-                               ->addColumn('subject', function ($model) {
398
+                               ->addColumn('subject', function($model) {
399 399
                                    return ucfirst($model->subject);
400 400
                                })
401
-                                ->addColumn('headers', function ($model) {
401
+                                ->addColumn('headers', function($model) {
402 402
                                     $headers = Markdown::convertToHtml(ucfirst($model->headers));
403 403
 
404 404
                                     return $headers;
405 405
                                 })
406
-                              ->addColumn('status', function ($model) {
406
+                              ->addColumn('status', function($model) {
407 407
                                   return ucfirst($model->status);
408 408
                               })
409 409
 
Please login to merge, or discard this patch.