Completed
Push — development ( 034e49...2b1a43 )
by Bhanu
21:29 queued 11:19
created
app/Http/Controllers/Front/ClientController.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -79,18 +79,18 @@  discard block
 block discarded – undo
79 79
                     ->select('number', 'created_at', 'grand_total', 'id', 'status');
80 80
 
81 81
             return \DataTables::of($invoices->get())
82
-                            ->addColumn('number', function ($model) {
82
+                            ->addColumn('number', function($model) {
83 83
                                 return $model->number;
84 84
                             })
85
-                            ->addColumn('date', function ($model) {
85
+                            ->addColumn('date', function($model) {
86 86
                                 $date = $model->created_at;
87 87
 
88 88
                                 return $date;
89 89
                             })
90
-                            ->addColumn('total', function ($model) {
90
+                            ->addColumn('total', function($model) {
91 91
                                 return $model->grand_total;
92 92
                             })
93
-                            ->addColumn('Action', function ($model) {
93
+                            ->addColumn('Action', function($model) {
94 94
                                 $status = $model->status;
95 95
                                 $payment = '';
96 96
                                 if ($status == 'Pending' && $model->grand_total > 0) {
@@ -155,19 +155,19 @@  discard block
 block discarded – undo
155 155
             }
156 156
 
157 157
             return \DataTables::of($versions)
158
-                            ->addColumn('id', function ($versions) {
158
+                            ->addColumn('id', function($versions) {
159 159
                                 return ucfirst($versions->id);
160 160
                             })
161
-                            ->addColumn('version', function ($versions) {
161
+                            ->addColumn('version', function($versions) {
162 162
                                 return ucfirst($versions->version);
163 163
                             })
164
-                            ->addColumn('title', function ($versions) {
164
+                            ->addColumn('title', function($versions) {
165 165
                                 return ucfirst($versions->title);
166 166
                             })
167
-                            ->addColumn('description', function ($versions) {
167
+                            ->addColumn('description', function($versions) {
168 168
                                 return ucfirst($versions->description);
169 169
                             })
170
-                            ->addColumn('file', function ($versions) use ($countExpiry, $countVersions, $clientid, $invoiceid, $productid) {
170
+                            ->addColumn('file', function($versions) use ($countExpiry, $countVersions, $clientid, $invoiceid, $productid) {
171 171
                                 $invoice_id = Invoice::where('number', $invoiceid)->pluck('id')->first();
172 172
                                 $order = Order::where('invoice_id', '=', $invoice_id)->first();
173 173
                                 $order_id = $order->id;
@@ -264,18 +264,18 @@  discard block
 block discarded – undo
264 264
             }
265 265
 
266 266
             return \DataTables::of($link)
267
-                            ->addColumn('version', function ($link) {
267
+                            ->addColumn('version', function($link) {
268 268
                                 return ucfirst($link['tag_name']);
269 269
                             })
270
-                            ->addColumn('name', function ($link) {
270
+                            ->addColumn('name', function($link) {
271 271
                                 return ucfirst($link['name']);
272 272
                             })
273
-                            ->addColumn('description', function ($link) {
273
+                            ->addColumn('description', function($link) {
274 274
                                 $markdown = Markdown::convertToHtml(ucfirst($link['body']));
275 275
 
276 276
                                 return $markdown;
277 277
                             })
278
-                            ->addColumn('file', function ($link) use ($countExpiry, $countVersions, $invoiceid, $productid) {
278
+                            ->addColumn('file', function($link) use ($countExpiry, $countVersions, $invoiceid, $productid) {
279 279
                                 $order = Order::where('invoice_id', '=', $invoiceid)->first();
280 280
                                 $order_id = $order->id;
281 281
                                 $orderEndDate = Subscription::select('update_ends_at')
@@ -322,20 +322,20 @@  discard block
 block discarded – undo
322 322
             $orders = Order::where('client', \Auth::user()->id);
323 323
 
324 324
             return \DataTables::of($orders->get())
325
-                            ->addColumn('id', function ($model) {
325
+                            ->addColumn('id', function($model) {
326 326
                                 return $model->id;
327 327
                             })
328
-                            ->addColumn('product_name', function ($model) {
328
+                            ->addColumn('product_name', function($model) {
329 329
                                 return $model->product()->first()->name;
330 330
                             })
331
-                            ->addColumn('expiry', function ($model) {
331
+                            ->addColumn('expiry', function($model) {
332 332
                                 $tz = \Auth::user()->timezone()->first()->name;
333 333
                                 $end = $this->getExpiryDate($model);
334 334
 
335 335
                                 return $end;
336 336
                             })
337 337
 
338
-                            ->addColumn('Action', function ($model) {
338
+                            ->addColumn('Action', function($model) {
339 339
                                 $sub = $model->subscription()->first();
340 340
                                 $order = Order::where('id', $model->id)->select('product')->first();
341 341
                                 $productid = $order->product;
@@ -467,17 +467,17 @@  discard block
 block discarded – undo
467 467
                     ->select('id', 'invoice_id', 'user_id', 'amount', 'payment_method', 'payment_status', 'created_at');
468 468
 
469 469
             return \DataTables::of($payments->get())
470
-                            ->addColumn('checkbox', function ($model) {
470
+                            ->addColumn('checkbox', function($model) {
471 471
                                 if (\Input::get('client') != 'true') {
472 472
                                     return "<input type='checkbox' class='payment_checkbox' 
473 473
                                     value=".$model->id.' name=select[] id=check>';
474 474
                                 }
475 475
                             })
476
-                            ->addColumn('number', function ($model) {
476
+                            ->addColumn('number', function($model) {
477 477
                                 return $model->invoice()->first()->number;
478 478
                             })
479 479
                             ->addColumn('amount', 'payment_method', 'payment_status', 'created_at')
480
-                            ->addColumn('total', function ($model) {
480
+                            ->addColumn('total', function($model) {
481 481
                                 return $model->grand_total;
482 482
                             })
483 483
                             ->rawColumns(['checkbox', 'number', 'total',
@@ -504,13 +504,13 @@  discard block
 block discarded – undo
504 504
                     ->select('id', 'invoice_id', 'user_id', 'payment_method', 'payment_status', 'created_at', 'amount');
505 505
             //dd(\Input::all());
506 506
             return \DataTables::of($payments->get())
507
-                            ->addColumn('number', function ($model) {
507
+                            ->addColumn('number', function($model) {
508 508
                                 return $model->invoice()->first()->number;
509 509
                             })
510
-                              ->addColumn('total', function ($model) {
510
+                              ->addColumn('total', function($model) {
511 511
                                   return $model->amount;
512 512
                               })
513
-                               ->addColumn('created_at', function ($model) {
513
+                               ->addColumn('created_at', function($model) {
514 514
                                    $date1 = new DateTime($model->created_at);
515 515
                                    $tz = \Auth::user()->timezone()->first()->name;
516 516
                                    $date1->setTimezone(new DateTimeZone($tz));
Please login to merge, or discard this patch.
app/Traits/PaymentsAndInvoices.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
                 $paymentRenewal = $this->updateInvoicePayment(
158 158
                 $invoiceid,
159 159
                 $payment_method,
160
-             $payment_status,
160
+                $payment_status,
161 161
                 $payment_date,
162 162
                 $amount
163 163
             );
@@ -215,15 +215,15 @@  discard block
 block discarded – undo
215 215
 
216 216
                     return view(
217 217
                     'themes.default1.invoice.payment',
218
-                 compact(
219
-                     'invoice_status',
220
-                     'payment_status',
221
-                  'payment_method',
222
-                     'invoice_id',
223
-                     'domain',
224
-                     'invoice',
225
-                     'userid'
226
-                 )
218
+                    compact(
219
+                        'invoice_status',
220
+                        'payment_status',
221
+                    'payment_method',
222
+                        'invoice_id',
223
+                        'domain',
224
+                        'invoice',
225
+                        'userid'
226
+                    )
227 227
                 );
228 228
                 }
229 229
 
Please login to merge, or discard this patch.
app/Http/Controllers/Common/BaseMailChimpController.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -50,18 +50,18 @@  discard block
 block discarded – undo
50 50
             }
51 51
             if ($interestGroupIdForNo && $productGroupId) {
52 52
                 $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [
53
-                 'interests'         => [$interestGroupIdForNo => true, $interestGroupIdForYes=>false, $productGroupId =>true],
54
-                  ]);
53
+                    'interests'         => [$interestGroupIdForNo => true, $interestGroupIdForYes=>false, $productGroupId =>true],
54
+                    ]);
55 55
             //refer to https://us7.api.mailchimp.com/playground
56 56
             } elseif ($interestGroupIdForNo && $productGroupId == null) {
57 57
                 $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [
58
-                 'interests'         => [$interestGroupIdForNo => true, $interestGroupIdForYes=>false],
59
-                  ]);
58
+                    'interests'         => [$interestGroupIdForNo => true, $interestGroupIdForYes=>false],
59
+                    ]);
60 60
             //refer to https://us7.api.mailchimp.com/playground
61 61
             } elseif ($productGroupId && $interestGroupIdForNo == null || $interestGroupIdForYes == null) {
62 62
                 $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [
63
-                 'interests'         => [$productGroupId =>true],
64
-                  ]);
63
+                    'interests'         => [$productGroupId =>true],
64
+                    ]);
65 65
             }
66 66
         } catch (Exception $ex) {
67 67
             $exe = json_decode($ex->getMessage(), true);
@@ -85,18 +85,18 @@  discard block
 block discarded – undo
85 85
             }
86 86
             if ($interestGroupIdForNo && $productGroupId) {
87 87
                 $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [
88
-                 'interests'         => [$interestGroupIdForNo => false, $interestGroupIdForYes=>true, $productGroupId =>true],
89
-                 //refer to https://us7.api.mailchimp.com/playground
90
-                 ]);
88
+                    'interests'         => [$interestGroupIdForNo => false, $interestGroupIdForYes=>true, $productGroupId =>true],
89
+                    //refer to https://us7.api.mailchimp.com/playground
90
+                    ]);
91 91
             } elseif ($interestGroupIdForNo && $productGroupId == null) {
92 92
                 $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [
93
-                 'interests'         => [$interestGroupIdForNo => false, $interestGroupIdForYes=>true],
94
-                  ]);
93
+                    'interests'         => [$interestGroupIdForNo => false, $interestGroupIdForYes=>true],
94
+                    ]);
95 95
             //refer to https://us7.api.mailchimp.com/playground
96 96
             } elseif ($productGroupId && $interestGroupIdForNo == null || $interestGroupIdForYes == null) {
97 97
                 $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [
98
-                 'interests'         => [$productGroupId =>true],
99
-                  ]);
98
+                    'interests'         => [$productGroupId =>true],
99
+                    ]);
100 100
             }
101 101
             //refer to https://us7.api.mailchimp.com/playground
102 102
         } catch (Exception $ex) {
Please login to merge, or discard this patch.