@@ -16,8 +16,8 @@ discard block |
||
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 |
||
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 | } |
@@ -48,15 +48,15 @@ |
||
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 | } |
@@ -120,10 +120,10 @@ |
||
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); |
@@ -25,7 +25,8 @@ |
||
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 | } |
@@ -435,7 +435,7 @@ |
||
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 | } |
@@ -296,7 +296,7 @@ |
||
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 |
@@ -87,7 +87,7 @@ |
||
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 |
@@ -15,7 +15,7 @@ discard block |
||
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 |
||
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']) |
@@ -279,37 +279,37 @@ discard block |
||
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 |
||
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', ]) |
@@ -96,7 +96,8 @@ |
||
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)) { |
@@ -67,7 +67,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -87,22 +87,22 @@ discard block |
||
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 |
||
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 |
||
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'); |
@@ -61,14 +61,14 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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> Edit</a>"; |
@@ -19,28 +19,28 @@ |
||
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="' |
@@ -58,7 +58,8 @@ |
||
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); |
@@ -44,7 +44,7 @@ discard block |
||
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 |
||
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>"; |
@@ -120,10 +120,10 @@ |
||
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; |
@@ -183,7 +183,8 @@ discard block |
||
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 |
||
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(); |
@@ -114,18 +114,18 @@ discard block |
||
114 | 114 | |
115 | 115 | return\ DataTables::of($new_product) |
116 | 116 | |
117 | - ->addColumn('checkbox', function ($model) { |
|
117 | + ->addColumn('checkbox', function($model) { |
|
118 | 118 | return "<input type='checkbox' class='product_checkbox' |
119 | 119 | value=".$model->id.' name=select[] id=check>'; |
120 | 120 | }) |
121 | - ->addColumn('name', function ($model) { |
|
121 | + ->addColumn('name', function($model) { |
|
122 | 122 | return ucfirst($model->name); |
123 | 123 | }) |
124 | - ->addColumn('image', function ($model) { |
|
124 | + ->addColumn('image', function($model) { |
|
125 | 125 | // return $model->image; |
126 | 126 | return "<img src= '$model->image' + height=\"80\"/>"; |
127 | 127 | }) |
128 | - ->addColumn('type', function ($model) { |
|
128 | + ->addColumn('type', function($model) { |
|
129 | 129 | if ($this->type->where('id', $model->type)->first()) { |
130 | 130 | return $this->type->where('id', $model->type)->first()->name; |
131 | 131 | } else { |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | }) |
135 | 135 | |
136 | - ->addColumn('group', function ($model) { |
|
136 | + ->addColumn('group', function($model) { |
|
137 | 137 | if ($this->group->where('id', $model->group)->first()) { |
138 | 138 | return $this->group->where('id', $model->group)->first()->name; |
139 | 139 | } else { |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | } |
142 | 142 | }) |
143 | 143 | |
144 | - ->addColumn('Action', function ($model) { |
|
144 | + ->addColumn('Action', function($model) { |
|
145 | 145 | $permissions = LicensePermissionsController::getPermissionsForProduct($model->id); |
146 | 146 | $url = ''; |
147 | 147 | if ($permissions['downloadPermission'] == 1) { |