Completed
Pull Request — development (#707)
by Ashutosh
20:52 queued 11:34
created
app/Http/Controllers/Product/ProductController.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -120,10 +120,10 @@
 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;
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -114,18 +114,18 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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) {
Please login to merge, or discard this patch.
app/Http/Controllers/Common/SettingsController.php 1 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.
app/Http/Controllers/Common/MailChimpController.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         try {
59 59
             $merge_fields = $this->field($email);
60 60
             $interestGroupIdForNo = $this->relation->is_paid_no; //Interest GroupId for IsPaid Is No
61
-              $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes
61
+                $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes
62 62
             $result = $this->mailchimp->post("lists/$this->list_id/members", [
63 63
                 'status'        => $this->mailchimp_set->subscribe_status,
64 64
                 'email_address' => $email,
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
             $country = Country::where('country_code_char2', $user->country)->pluck('nicename')->first();
115 115
             if ($user) {
116 116
                 $fields = ['first_name', 'last_name', 'company', 'mobile',
117
-                 'address', 'town', 'country', 'state', 'zip', 'active', 'role', 'source', ];
117
+                    'address', 'town', 'country', 'state', 'zip', 'active', 'role', 'source', ];
118 118
                 $relation = $this->relation;
119 119
                 $merge_fields = [];
120 120
                 foreach ($fields as $field) {
@@ -241,11 +241,11 @@  discard block
 block discarded – undo
241 241
 
242 242
             $this->addProductInterestFieldsToAgora(); //add all the fields in Product Section of Groups to the db
243 243
             $group_fields = $this->groups->where('list_id', $this->list_id)
244
-          ->select('category_name', 'category_option_id', 'category_id')->get()->toArray();
244
+            ->select('category_name', 'category_option_id', 'category_id')->get()->toArray();
245 245
             // dd($group_fields[0]);
246 246
             $relations = MailchimpGroupAgoraRelation::where('id', '!=', 0)
247
-          ->select('agora_product_id', 'mailchimp_group_cat_id')
248
-          ->orderBy('id', 'asc')->get()->toArray();
247
+            ->select('agora_product_id', 'mailchimp_group_cat_id')
248
+            ->orderBy('id', 'asc')->get()->toArray();
249 249
             $productList = [];
250 250
             $categoryList = [];
251 251
             if (count($relations) != 0) {
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
             MailchimpGroupAgoraRelation::where('id', '!=', 0)->delete();
325 325
             foreach ($request->row as $key => $value) {
326 326
                 MailchimpGroupAgoraRelation::create(['agora_product_id'=> $value[0],
327
-             'mailchimp_group_cat_id'                                  => $value[1], ]);
327
+                'mailchimp_group_cat_id'                                  => $value[1], ]);
328 328
             }
329 329
 
330 330
             return redirect()->back()->with('success', \Lang::get('message.updated-successfully'));
Please login to merge, or discard this patch.