Completed
Push — development ( 2b1a43...b28ccc )
by Ashutosh
11:47 queued 01:44
created
app/Console/Kernel.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
      */
17 17
     protected $commands = [
18 18
         //
19
-         'App\Console\Commands\Inspire',
20
-         \App\Console\Commands\Install::class,
19
+            'App\Console\Commands\Inspire',
20
+            \App\Console\Commands\Install::class,
21 21
         'App\Console\Commands\ExpiryCron',
22 22
     ];
23 23
 
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
50 50
             switch ($task) {
51 51
             case 'expiryMail':
52 52
                if ($expiryMailStatus == 1) {
53
-                   return $this->getCondition($schedule->command('expiry:notification'), $command);
54
-               }
53
+                    return $this->getCondition($schedule->command('expiry:notification'), $command);
54
+                }
55 55
 
56 56
             case 'deleteLogs':
57 57
              if ($logDeleteStatus == 1) {
58
-                 return $this->getCondition($schedule->command('activitylog:clean'), $command);
59
-             }
58
+                    return $this->getCondition($schedule->command('activitylog:clean'), $command);
59
+                }
60 60
             }
61 61
         }
62 62
     }
Please login to merge, or discard this patch.
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.
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['path']).'>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   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
             $mobileauthkey = $apikeys->pluck('msg91_auth_key')->first();
69 69
             $updateUrl = $apikeys->pluck('update_api_url')->first();
70 70
             $emailStatus = StatusSetting::pluck('emailverification_status')->first();
71
-            $twitterKeys = $apikeys->select('twitter_consumer_key','twitter_consumer_secret',
71
+            $twitterKeys = $apikeys->select('twitter_consumer_key', 'twitter_consumer_secret',
72 72
                 'twitter_access_token', 'access_tooken_secret')->first();
73 73
             $twitterStatus = $this->statusSetting->pluck('twitter_status')->first();
74 74
             $zohoStatus = $this->statusSetting->pluck('zoho_status')->first();
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
             $mailchimpKey = MailchimpSetting::pluck('api_key')->first();
80 80
             $model = $apikeys->find(1);
81 81
 
82
-            return view('themes.default1.common.apikey', compact('model', 'status', 'licenseSecret', 'licenseUrl', 'siteKey', 'secretKey', 'captchaStatus', 'updateStatus', 'updateSecret', 'updateUrl', 'mobileStatus', 'mobileauthkey', 'emailStatus', 'twitterStatus', 'twitterKeys', 'zohoStatus', 'zohoKey', 'rzpStatus', 'rzpKeys','mailchimpSetting','mailchimpKey'));
82
+            return view('themes.default1.common.apikey', compact('model', 'status', 'licenseSecret', 'licenseUrl', 'siteKey', 'secretKey', 'captchaStatus', 'updateStatus', 'updateSecret', 'updateUrl', 'mobileStatus', 'mobileauthkey', 'emailStatus', 'twitterStatus', 'twitterKeys', 'zohoStatus', 'zohoKey', 'rzpStatus', 'rzpKeys', 'mailchimpSetting', 'mailchimpKey'));
83 83
         } catch (\Exception $ex) {
84 84
             return redirect('/')->with('fails', $ex->getMessage());
85 85
         }
@@ -302,16 +302,16 @@  discard block
 block discarded – undo
302 302
 
303 303
             return \DataTables::of($query->take(50))
304 304
              ->setTotalRecords($query->count())
305
-             ->addColumn('checkbox', function ($model) {
305
+             ->addColumn('checkbox', function($model) {
306 306
                  return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
307 307
              })
308
-                           ->addColumn('name', function ($model) {
308
+                           ->addColumn('name', function($model) {
309 309
                                return ucfirst($model->log_name);
310 310
                            })
311
-                             ->addColumn('description', function ($model) {
311
+                             ->addColumn('description', function($model) {
312 312
                                  return ucfirst($model->description);
313 313
                              })
314
-                          ->addColumn('username', function ($model) {
314
+                          ->addColumn('username', function($model) {
315 315
                               $causer_id = $model->causer_id;
316 316
                               $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
317 317
                               foreach ($names as $key => $value) {
@@ -320,41 +320,41 @@  discard block
 block discarded – undo
320 320
                                   return $fullName;
321 321
                               }
322 322
                           })
323
-                              ->addColumn('role', function ($model) {
323
+                              ->addColumn('role', function($model) {
324 324
                                   $causer_id = $model->causer_id;
325 325
                                   $role = User::where('id', $causer_id)->pluck('role');
326 326
 
327 327
                                   return json_decode($role);
328 328
                               })
329
-                               ->addColumn('new', function ($model) {
329
+                               ->addColumn('new', function($model) {
330 330
                                    $properties = ($model->properties);
331 331
                                    $newEntry = $this->getNewEntry($properties, $model);
332 332
 
333 333
                                    return $newEntry;
334 334
                                })
335
-                                ->addColumn('old', function ($model) {
335
+                                ->addColumn('old', function($model) {
336 336
                                     $data = ($model->properties);
337 337
                                     $oldEntry = $this->getOldEntry($data, $model);
338 338
 
339 339
                                     return $oldEntry;
340 340
                                 })
341
-                                ->addColumn('created_at', function ($model) {
341
+                                ->addColumn('created_at', function($model) {
342 342
                                     $newDate = $this->getDate($model->created_at);
343 343
 
344 344
                                     return $newDate;
345 345
                                 })
346 346
 
347
-                                    ->filterColumn('log_name', function ($query, $keyword) {
347
+                                    ->filterColumn('log_name', function($query, $keyword) {
348 348
                                         $sql = 'log_name like ?';
349 349
                                         $query->whereRaw($sql, ["%{$keyword}%"]);
350 350
                                     })
351 351
 
352
-                                ->filterColumn('description', function ($query, $keyword) {
352
+                                ->filterColumn('description', function($query, $keyword) {
353 353
                                     $sql = 'description like ?';
354 354
                                     $query->whereRaw($sql, ["%{$keyword}%"]);
355 355
                                 })
356 356
 
357
-                            ->filterColumn('causer_id', function ($query, $keyword) {
357
+                            ->filterColumn('causer_id', function($query, $keyword) {
358 358
                                 $sql = 'first_name like ?';
359 359
                                 $query->whereRaw($sql, ["%{$keyword}%"]);
360 360
                             })
@@ -376,37 +376,37 @@  discard block
 block discarded – undo
376 376
             $email_log = \DB::table('email_log')->get();
377 377
 
378 378
             return\ DataTables::of($email_log)
379
-             ->addColumn('checkbox', function ($model) {
379
+             ->addColumn('checkbox', function($model) {
380 380
                  return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
381 381
              })
382
-                           ->addColumn('date', function ($model) {
382
+                           ->addColumn('date', function($model) {
383 383
                                return ucfirst($model->date);
384 384
                            })
385
-                             ->addColumn('from', function ($model) {
385
+                             ->addColumn('from', function($model) {
386 386
                                  $from = Markdown::convertToHtml(ucfirst($model->from));
387 387
 
388 388
                                  return $from;
389 389
                              })
390
-                              ->addColumn('to', function ($model) {
390
+                              ->addColumn('to', function($model) {
391 391
                                   $to = Markdown::convertToHtml(ucfirst($model->to));
392 392
 
393 393
                                   return $to;
394 394
                               })
395
-                             ->addColumn('cc', function ($model) {
395
+                             ->addColumn('cc', function($model) {
396 396
                                  $cc = '--';
397 397
 
398 398
                                  return $cc;
399 399
                              })
400 400
 
401
-                               ->addColumn('subject', function ($model) {
401
+                               ->addColumn('subject', function($model) {
402 402
                                    return ucfirst($model->subject);
403 403
                                })
404
-                                ->addColumn('headers', function ($model) {
404
+                                ->addColumn('headers', function($model) {
405 405
                                     $headers = Markdown::convertToHtml(ucfirst($model->headers));
406 406
 
407 407
                                     return $headers;
408 408
                                 })
409
-                              ->addColumn('status', function ($model) {
409
+                              ->addColumn('status', function($model) {
410 410
                                   return ucfirst($model->status);
411 411
                               })
412 412
 
Please login to merge, or discard this patch.
app/Http/Controllers/Product/PlanController.php 2 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -87,22 +87,22 @@  discard block
 block discarded – undo
87 87
 
88 88
                             return ucfirst($response);
89 89
                         })
90
-                         ->addColumn('price', function ($model) use ($defaultCurrency) {
91
-                             $price = PlanPrice::where('plan_id', $model->id)->where('currency', $defaultCurrency)
90
+                            ->addColumn('price', function ($model) use ($defaultCurrency) {
91
+                                $price = PlanPrice::where('plan_id', $model->id)->where('currency', $defaultCurrency)
92 92
                             ->pluck('add_price')->first();
93
-                             if ($price != null) {
94
-                                 return $price;
95
-                             } else {
96
-                                 return 'Not Available';
97
-                             }
98
-                         })
99
-                         ->addColumn('currency', function ($model) use ($defaultCurrency) {
100
-                             if ($defaultCurrency && $defaultCurrency != null) {
101
-                                 return $defaultCurrency;
102
-                             } else {
103
-                                 return 'Not Available';
104
-                             }
105
-                         })
93
+                                if ($price != null) {
94
+                                    return $price;
95
+                                } else {
96
+                                    return 'Not Available';
97
+                                }
98
+                            })
99
+                            ->addColumn('currency', function ($model) use ($defaultCurrency) {
100
+                                if ($defaultCurrency && $defaultCurrency != null) {
101
+                                    return $defaultCurrency;
102
+                                } else {
103
+                                    return 'Not Available';
104
+                                }
105
+                            })
106 106
                         ->addColumn('action', function ($model) {
107 107
                             return '<a href='.url('plans/'.$model->id.'/edit')." 
108 108
                             class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' 
@@ -206,10 +206,10 @@  discard block
 block discarded – undo
206 206
         $agentQuantity = $plan->planPrice->first()->no_of_agents;
207 207
         foreach ($products as $key => $product) {
208 208
             $selectedProduct = $this->product->where('id', $plan->product)
209
-          ->pluck('name', 'id', 'subscription')->toArray();
209
+            ->pluck('name', 'id', 'subscription')->toArray();
210 210
         }
211 211
         $selectedPeriods = $this->period->where('days', $plan->days)
212
-       ->pluck('name', 'days')->toArray();
212
+        ->pluck('name', 'days')->toArray();
213 213
 
214 214
         return view(
215 215
             'themes.default1.product.plan.edit',
@@ -247,8 +247,8 @@  discard block
 block discarded – undo
247 247
             'name'                => 'required',
248 248
             'add_price.*'         => 'required',
249 249
             'product'             => 'required',
250
-              'days'              => $days_rule.'numeric',
251
-               'product_quantity' => 'required_without:no_of_agents|integer|min:0',
250
+                'days'              => $days_rule.'numeric',
251
+                'product_quantity' => 'required_without:no_of_agents|integer|min:0',
252 252
             'no_of_agents'        => 'required_without:product_quantity|integer|min:0',
253 253
         ]);
254 254
         $product_quantity = $request->input('product_quantity');
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -61,14 +61,14 @@  discard block
 block discarded – undo
61 61
         $defaultCurrency = Setting::where('id', 1)->value('default_currency');
62 62
 
63 63
         return\ DataTables::of($new_plan)
64
-                        ->addColumn('checkbox', function ($model) {
64
+                        ->addColumn('checkbox', function($model) {
65 65
                             return "<input type='checkbox' class='plan_checkbox' 
66 66
                             value=".$model->id.' name=select[] id=check>';
67 67
                         })
68
-                        ->addColumn('name', function ($model) {
68
+                        ->addColumn('name', function($model) {
69 69
                             return ucfirst($model->name);
70 70
                         })
71
-                        ->addColumn('days', function ($model) {
71
+                        ->addColumn('days', function($model) {
72 72
                             if ($model->days != '') {
73 73
                                 $months = $model->days / 30;
74 74
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
                             return 'Not Available';
79 79
                         })
80
-                        ->addColumn('product', function ($model) {
80
+                        ->addColumn('product', function($model) {
81 81
                             $productid = $model->product;
82 82
                             $product = $this->product->where('id', $productid)->first();
83 83
                             $response = '';
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
                             return ucfirst($response);
89 89
                         })
90
-                         ->addColumn('price', function ($model) use ($defaultCurrency) {
90
+                         ->addColumn('price', function($model) use ($defaultCurrency) {
91 91
                              $price = PlanPrice::where('plan_id', $model->id)->where('currency', $defaultCurrency)
92 92
                             ->pluck('add_price')->first();
93 93
                              if ($price != null) {
@@ -96,14 +96,14 @@  discard block
 block discarded – undo
96 96
                                  return 'Not Available';
97 97
                              }
98 98
                          })
99
-                         ->addColumn('currency', function ($model) use ($defaultCurrency) {
99
+                         ->addColumn('currency', function($model) use ($defaultCurrency) {
100 100
                              if ($defaultCurrency && $defaultCurrency != null) {
101 101
                                  return $defaultCurrency;
102 102
                              } else {
103 103
                                  return 'Not Available';
104 104
                              }
105 105
                          })
106
-                        ->addColumn('action', function ($model) {
106
+                        ->addColumn('action', function($model) {
107 107
                             return '<a href='.url('plans/'.$model->id.'/edit')." 
108 108
                             class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' 
109 109
                             style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
Please login to merge, or discard this patch.
app/Http/Controllers/Product/ExtendedBaseProductController.php 3 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,28 +19,28 @@
 block discarded – undo
19 19
         ->get();
20 20
 
21 21
         return \DataTables::of($new_upload)
22
-        ->addColumn('checkbox', function ($model) {
22
+        ->addColumn('checkbox', function($model) {
23 23
             return "<input type='checkbox' class='upload_checkbox' value=".$model->id.' name=select[] id=checks>';
24 24
         })
25 25
 
26
-        ->addColumn('product_id', function ($model) {
26
+        ->addColumn('product_id', function($model) {
27 27
             return ucfirst($this->product->where('id', $model->product_id)->first()->name);
28 28
         })
29 29
 
30
-        ->addColumn('title', function ($model) {
30
+        ->addColumn('title', function($model) {
31 31
             return ucfirst($model->title);
32 32
         })
33
-        ->addColumn('description', function ($model) {
33
+        ->addColumn('description', function($model) {
34 34
             return ucfirst($model->description);
35 35
         })
36
-        ->addColumn('version', function ($model) {
36
+        ->addColumn('version', function($model) {
37 37
             return $model->version;
38 38
         })
39 39
 
40
-        ->addColumn('file', function ($model) {
40
+        ->addColumn('file', function($model) {
41 41
             return $model->file;
42 42
         })
43
-        ->addColumn('action', function ($model) {
43
+        ->addColumn('action', function($model) {
44 44
             return '<a href='.('#edit-upload-option/'.$model->id).' 
45 45
          class=" btn btn-sm btn-primary " data-title="'.$model->title.'"
46 46
           data-description="'.$model->description.'" data-version="'
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,8 @@
 block discarded – undo
58 58
         $file_upload->description = $request->input('description');
59 59
         $file_upload->version = $request->input('version');
60 60
         $autoUpdateStatus = StatusSetting::pluck('update_settings')->first();
61
-        if ($autoUpdateStatus == 1) { //If License Setting Status is on,Add Product to the License Manager
61
+        if ($autoUpdateStatus == 1) {
62
+//If License Setting Status is on,Add Product to the License Manager
62 63
             $productSku = $file_upload->product->product_sku;
63 64
             $updateClassObj = new \App\Http\Controllers\AutoUpdate\AutoUpdateController();
64 65
             $addProductToAutoUpdate = $updateClassObj->editVersion($request->input('version'), $productSku);
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
             return '<a href='.('#edit-upload-option/'.$model->id).' 
45 45
          class=" btn btn-sm btn-primary " data-title="'.$model->title.'"
46 46
           data-description="'.$model->description.'" data-version="'
47
-              .$model->version.'" data-id="'.$model->id.'" onclick="openEditPopup(this)" >Edit</a>';
47
+                .$model->version.'" data-id="'.$model->id.'" onclick="openEditPopup(this)" >Edit</a>';
48 48
         })
49 49
         ->rawcolumns(['checkbox', 'product_id', 'title', 'description', 'version', 'file', 'action'])
50 50
         ->make(true);
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
             if ($product->require_domain == 1) {
102 102
                 $field .= "<div class='col-md-4 form-group'>
103 103
                         <label class='required'>"./* @scrutinizer ignore-type */
104
-                         \Lang::get('message.domain')."</label>
104
+                            \Lang::get('message.domain')."</label>
105 105
                         <input type='text' name='domain' class='form-control' 
106 106
                         id='domain' placeholder='http://example.com'>
107 107
                 </div>";
Please login to merge, or discard this patch.
app/Http/Controllers/Product/ProductController.php 3 patches
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -183,7 +183,8 @@  discard block
 block discarded – undo
183 183
             $this->product_upload->save();
184 184
             $this->product->where('id', $product_id->id)->update(['version'=>$request->input('version')]);
185 185
             $autoUpdateStatus = StatusSetting::pluck('update_settings')->first();
186
-            if ($autoUpdateStatus == 1) { //If License Setting Status is on,Add Product to the License Manager
186
+            if ($autoUpdateStatus == 1) {
187
+//If License Setting Status is on,Add Product to the License Manager
187 188
                 $updateClassObj = new \App\Http\Controllers\AutoUpdate\AutoUpdateController();
188 189
                 $addProductToAutoUpdate = $updateClassObj->addNewVersion($product_id->id, $request->input('version'), '1');
189 190
             }
@@ -270,7 +271,8 @@  discard block
 block discarded – undo
270 271
 
271 272
         try {
272 273
             $licenseStatus = StatusSetting::pluck('license_status')->first();
273
-            if ($licenseStatus == 1) { //If License Setting Status is on,Add Product to the License Manager
274
+            if ($licenseStatus == 1) {
275
+//If License Setting Status is on,Add Product to the License Manager
274 276
                 $addProductToLicensing = $this->licensing->addNewProduct($input['name'], $input['product_sku']);
275 277
             }
276 278
             $licenseCont = new \App\Http\Controllers\AutoUpdate\AutoUpdateController();
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -120,10 +120,10 @@  discard block
 block discarded – undo
120 120
                             ->addColumn('name', function ($model) {
121 121
                                 return ucfirst($model->name);
122 122
                             })
123
-                              ->addColumn('image', function ($model) {
124
-                                  // return $model->image;
125
-                                  return "<img src= '$model->image' + height=\"80\"/>";
126
-                              })
123
+                                ->addColumn('image', function ($model) {
124
+                                    // return $model->image;
125
+                                    return "<img src= '$model->image' + height=\"80\"/>";
126
+                                })
127 127
                             ->addColumn('type', function ($model) {
128 128
                                 if ($this->type->where('id', $model->type)->first()) {
129 129
                                     return $this->type->where('id', $model->type)->first()->name;
@@ -141,8 +141,8 @@  discard block
 block discarded – undo
141 141
                             })
142 142
 
143 143
                             ->addColumn('Action', function ($model) {
144
-                               $permissions = LicensePermissionsController::getPermissionsForProduct($model->id);
145
-                               $url = '';
144
+                                $permissions = LicensePermissionsController::getPermissionsForProduct($model->id);
145
+                                $url = '';
146 146
                                 if ($permissions['downloadPermission'] == 1) {
147 147
                                     $url = '<a href='.url('product/download/'.$model->id).
148 148
                                     " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-download' 
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -113,18 +113,18 @@  discard block
 block discarded – undo
113 113
             $new_product = Product::select('id', 'name', 'type', 'image', 'group', 'image')->get();
114 114
             return\ DataTables::of($new_product)
115 115
 
116
-                            ->addColumn('checkbox', function ($model) {
116
+                            ->addColumn('checkbox', function($model) {
117 117
                                 return "<input type='checkbox' class='product_checkbox' 
118 118
                                 value=".$model->id.' name=select[] id=check>';
119 119
                             })
120
-                            ->addColumn('name', function ($model) {
120
+                            ->addColumn('name', function($model) {
121 121
                                 return ucfirst($model->name);
122 122
                             })
123
-                              ->addColumn('image', function ($model) {
123
+                              ->addColumn('image', function($model) {
124 124
                                   // return $model->image;
125 125
                                   return "<img src= '$model->image' + height=\"80\"/>";
126 126
                               })
127
-                            ->addColumn('type', function ($model) {
127
+                            ->addColumn('type', function($model) {
128 128
                                 if ($this->type->where('id', $model->type)->first()) {
129 129
                                     return $this->type->where('id', $model->type)->first()->name;
130 130
                                 } else {
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
                                 }
133 133
                             })
134 134
 
135
-                            ->addColumn('group', function ($model) {
135
+                            ->addColumn('group', function($model) {
136 136
                                 if ($this->group->where('id', $model->group)->first()) {
137 137
                                     return $this->group->where('id', $model->group)->first()->name;
138 138
                                 } else {
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
                                 }
141 141
                             })
142 142
 
143
-                            ->addColumn('Action', function ($model) {
143
+                            ->addColumn('Action', function($model) {
144 144
                                $permissions = LicensePermissionsController::getPermissionsForProduct($model->id);
145 145
                                $url = '';
146 146
                                 if ($permissions['downloadPermission'] == 1) {
Please login to merge, or discard this patch.