Completed
Branch feature-dynamic-fields (3b03cc)
by Ashutosh
09:05
created
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/Order/BaseOrderController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
     public function getIfItemPresent($item, $invoiceid, $user_id, $order_status)
82 82
     {
83 83
 
84
-        try{
84
+        try {
85 85
 
86 86
         $product = $this->product->where('name', $item->product_name)->first()->id;
87 87
         $version = $this->product->where('name', $item->product_name)->first()->version;
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
             //Get Version from Product Upload Table
90 90
             $version = $this->product_upload->where('product_id', $product)->pluck('version')->first();
91 91
         }
92
-        $serial_key = $this->generateSerialKey($product,$item->agents);//Send Product Id and Agents to generate Serial Key
92
+        $serial_key = $this->generateSerialKey($product, $item->agents); //Send Product Id and Agents to generate Serial Key
93 93
         $domain = $item->domain;
94 94
         $plan_id = $this->plan($item->id);
95 95
         $order = $this->order->create([
Please login to merge, or discard this patch.
app/Http/Controllers/Order/InvoiceController.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
             $from = $request->input('from');
107 107
             $till = $request->input('till');
108 108
 
109
-            return view('themes.default1.invoice.index', compact('name','invoice_no','status','currencies','currency_id','from',
109
+            return view('themes.default1.invoice.index', compact('name', 'invoice_no', 'status', 'currencies', 'currency_id', 'from',
110 110
 
111 111
                 'till'));
112 112
         } catch (\Exception $ex) {
@@ -129,35 +129,35 @@  discard block
 block discarded – undo
129 129
         return \DataTables::of($query->take(100))
130 130
          ->setTotalRecords($query->count())
131 131
 
132
-         ->addColumn('checkbox', function ($model) {
132
+         ->addColumn('checkbox', function($model) {
133 133
              return "<input type='checkbox' class='invoice_checkbox' 
134 134
                             value=".$model->id.' name=select[] id=check>';
135 135
          })
136
-                        ->addColumn('user_id', function ($model) {
136
+                        ->addColumn('user_id', function($model) {
137 137
                             $first = $this->user->where('id', $model->user_id)->first()->first_name;
138 138
                             $last = $this->user->where('id', $model->user_id)->first()->last_name;
139 139
                             $id = $this->user->where('id', $model->user_id)->first()->id;
140 140
 
141 141
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
142 142
                         })
143
-                         ->addColumn('number', function ($model) {
143
+                         ->addColumn('number', function($model) {
144 144
                              return ucfirst($model->number);
145 145
                          })
146 146
 
147
-                        ->addColumn('date', function ($model) {
147
+                        ->addColumn('date', function($model) {
148 148
                             $date = ($model->created_at);
149 149
 
150 150
                             return $date;
151 151
                             // return "<span style='display:none'>$model->id</span>".$date->format('l, F j, Y H:m');
152 152
                         })
153
-                         ->addColumn('grand_total', function ($model) {
153
+                         ->addColumn('grand_total', function($model) {
154 154
                              return ucfirst($model->number);
155 155
                          })
156
-                          ->addColumn('status', function ($model) {
156
+                          ->addColumn('status', function($model) {
157 157
                               return ucfirst($model->status);
158 158
                           })
159 159
 
160
-                        ->addColumn('action', function ($model) {
160
+                        ->addColumn('action', function($model) {
161 161
                             $action = '';
162 162
 
163 163
                             $check = $this->checkExecution($model->id);
@@ -173,25 +173,25 @@  discard block
 block discarded – undo
173 173
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>"
174 174
                                     ."   $action";
175 175
                         })
176
-                         ->filterColumn('user_id', function ($query, $keyword) {
176
+                         ->filterColumn('user_id', function($query, $keyword) {
177 177
                              $sql = 'first_name like ?';
178 178
                              $query->whereRaw($sql, ["%{$keyword}%"]);
179 179
                          })
180 180
 
181
-                          ->filterColumn('status', function ($query, $keyword) {
181
+                          ->filterColumn('status', function($query, $keyword) {
182 182
                               $sql = 'status like ?';
183 183
                               $query->whereRaw($sql, ["%{$keyword}%"]);
184 184
                           })
185 185
 
186
-                        ->filterColumn('number', function ($query, $keyword) {
186
+                        ->filterColumn('number', function($query, $keyword) {
187 187
                             $sql = 'number like ?';
188 188
                             $query->whereRaw($sql, ["%{$keyword}%"]);
189 189
                         })
190
-                         ->filterColumn('grand_total', function ($query, $keyword) {
190
+                         ->filterColumn('grand_total', function($query, $keyword) {
191 191
                              $sql = 'grand_total like ?';
192 192
                              $query->whereRaw($sql, ["%{$keyword}%"]);
193 193
                          })
194
-                          ->filterColumn('date', function ($query, $keyword) {
194
+                          ->filterColumn('date', function($query, $keyword) {
195 195
                               $sql = 'date like ?';
196 196
                               $query->whereRaw($sql, ["%{$keyword}%"]);
197 197
                           })
Please login to merge, or discard this patch.