Completed
Push — development ( 2fd849...7f23a5 )
by Ashutosh
24:05 queued 14:01
created
app/Http/Controllers/Order/BaseRenewController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
             ]);
126 126
             $this->createOrderInvoiceRelation($orderid, $invoice->id);
127 127
             $items = $controller->createInvoiceItemsByAdmin($invoice->id, $product->id,
128
-             $code, $cost, $currency, $qty = 1, $agents);
128
+                $code, $cost, $currency, $qty = 1, $agents);
129 129
 
130 130
             return $items;
131 131
         } catch (Exception $ex) {
Please login to merge, or discard this patch.
app/Http/Controllers/Front/CartController.php 2 patches
Braces   +14 added lines, -7 removed lines patch added patch discarded remove patch
@@ -96,7 +96,8 @@  discard block
 block discarded – undo
96 96
     {
97 97
         try {
98 98
             $plan = '';
99
-            if ($request->has('subscription')) {//put he Plan id sent into session variable
99
+            if ($request->has('subscription')) {
100
+//put he Plan id sent into session variable
100 101
                 $plan = $request->get('subscription');
101 102
                 Session::put('plan', $plan);
102 103
             }
@@ -127,7 +128,8 @@  discard block
 block discarded – undo
127 128
             foreach ($cartCollection as $item) {
128 129
                 $attributes[] = $item->attributes;
129 130
                 $cart_currency = $attributes[0]['currency']['currency'];
130
-                if (\Auth::user()) {//If User is Loggen in and his currency changes after logginng in then remove his previous order from cart
131
+                if (\Auth::user()) {
132
+//If User is Loggen in and his currency changes after logginng in then remove his previous order from cart
131 133
                     $currency = \Auth::user()->currency;
132 134
                     if ($cart_currency != $currency) {
133 135
                         $id = $item->id;
@@ -175,8 +177,10 @@  discard block
 block discarded – undo
175 177
                 $origin_state = $this->setting->first()->state; //Get the State of origin
176 178
                 $tax_class_id = TaxProductRelation::where('product_id', $productid)->pluck('tax_class_id')->toArray();
177 179
 
178
-                if (count($tax_class_id) > 0) {//If the product is allowed for tax (Check in tax_product relation table)
179
-                    if ($tax_enable == 1) {//If GST is Enabled
180
+                if (count($tax_class_id) > 0) {
181
+//If the product is allowed for tax (Check in tax_product relation table)
182
+                    if ($tax_enable == 1) {
183
+//If GST is Enabled
180 184
 
181 185
                          $details = $this->getDetailsWhenUserStateIsIndian(
182 186
                              $user_state,
@@ -220,7 +224,8 @@  discard block
 block discarded – undo
220 224
                                          ]);
221 225
                             }
222 226
                         }
223
-                    } elseif ($tax_enable == 0) {//If Tax enable is 0 and other tax is available
227
+                    } elseif ($tax_enable == 0) {
228
+//If Tax enable is 0 and other tax is available
224 229
 
225 230
                         $details = $this->whenOtherTaxAvailableAndTaxNotEnable($tax_class_id, $productid, $geoip_state, $geoip_country);
226 231
 
@@ -472,7 +477,8 @@  discard block
 block discarded – undo
472 477
         try {
473 478
             $currency = Setting::find(1)->default_currency;
474 479
             $currency_symbol = Setting::find(1)->default_symbol;
475
-            if (!\Auth::user()) {//When user is not logged in
480
+            if (!\Auth::user()) {
481
+//When user is not logged in
476 482
                 $cont = new \App\Http\Controllers\Front\PageController();
477 483
                 $location = $cont->getLocation();
478 484
                 $country = self::findCountryByGeoip($location['iso_code']);
@@ -487,7 +493,8 @@  discard block
 block discarded – undo
487 493
                 $currency = \Auth::user()->currency;
488 494
                 $currency_symbol = \Auth::user()->currency_symbol;
489 495
             }
490
-            if ($userid != '') {//For Admin Panel Clients
496
+            if ($userid != '') {
497
+//For Admin Panel Clients
491 498
                 $currencyAndSymbol = self::getCurrency($userid);
492 499
                 $currency = $currencyAndSymbol['currency'];
493 500
                 $currency_symbol = $currencyAndSymbol['symbol'];
Please login to merge, or discard this patch.
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -178,13 +178,13 @@  discard block
 block discarded – undo
178 178
                 if (count($tax_class_id) > 0) {//If the product is allowed for tax (Check in tax_product relation table)
179 179
                     if ($tax_enable == 1) {//If GST is Enabled
180 180
 
181
-                         $details = $this->getDetailsWhenUserStateIsIndian(
182
-                             $user_state,
183
-                             $origin_state,
184
-                             $productid,
185
-                             $geoip_state,
186
-                             $geoip_country
187
-                         );
181
+                            $details = $this->getDetailsWhenUserStateIsIndian(
182
+                                $user_state,
183
+                                $origin_state,
184
+                                $productid,
185
+                                $geoip_state,
186
+                                $geoip_country
187
+                            );
188 188
                         $c_gst = $details['cgst'];
189 189
                         $s_gst = $details['sgst'];
190 190
                         $i_gst = $details['igst'];
@@ -202,21 +202,21 @@  discard block
 block discarded – undo
202 202
                             if ($taxes[0]) {
203 203
                                 $tax_attribute[$key] = ['name' => $tax->name, 'c_gst'=>$c_gst,
204 204
 
205
-                               's_gst'         => $s_gst, 'i_gst'=>$i_gst, 'ut_gst'=>$ut_gst,
205
+                                's_gst'         => $s_gst, 'i_gst'=>$i_gst, 'ut_gst'=>$ut_gst,
206 206
                                 'state'        => $state_code, 'origin_state'=>$origin_state,
207
-                                 'tax_enable'  => $tax_enable, 'rate'=>$value, 'status'=>$status, ];
207
+                                    'tax_enable'  => $tax_enable, 'rate'=>$value, 'status'=>$status, ];
208 208
 
209 209
                                 $taxCondition[0] = new \Darryldecode\Cart\CartCondition([
210 210
                                             'name'   => 'no compound', 'type'   => 'tax',
211 211
                                             'target' => 'item', 'value'  => $value,
212
-                                          ]);
212
+                                            ]);
213 213
                             } else {
214 214
                                 $tax_attribute[0] = ['name' => 'null', 'rate' => 0, 'tax_enable' =>0];
215 215
                                 $taxCondition[0] = new \Darryldecode\Cart\CartCondition([
216
-                                           'name'   => 'null', 'type'   => 'tax',
217
-                                           'target' => 'item', 'value'  => '0%',
218
-                                           'rate'   => 0, 'tax_enable' =>0,
219
-                                         ]);
216
+                                            'name'   => 'null', 'type'   => 'tax',
217
+                                            'target' => 'item', 'value'  => '0%',
218
+                                            'rate'   => 0, 'tax_enable' =>0,
219
+                                            ]);
220 220
                             }
221 221
                         }
222 222
                     } elseif ($tax_enable == 0) {//If Tax enable is 0 and other tax is available
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
             $subregion = \App\Model\Common\State::where('state_subdivision_code', $code)->first();
353 353
             if ($subregion) {
354 354
                 $result = ['id' => $subregion->state_subdivision_code,
355
-                 'name'         => $subregion->state_subdivision_name, ];
355
+                    'name'         => $subregion->state_subdivision_name, ];
356 356
             }
357 357
 
358 358
             return $result;
Please login to merge, or discard this patch.
app/Traits/PaymentsAndInvoices.php 2 patches
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.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -90,10 +90,12 @@  discard block
 block discarded – undo
90 90
 
91 91
         public function getAgents($agents, $productid, $plan)
92 92
         {
93
-            if (!$agents) {//If agents is not received in the request in the case when
93
+            if (!$agents) {
94
+//If agents is not received in the request in the case when
94 95
                 // 'modify agent' is not allowed for the Product,get the no of Agents from the Plan Table.
95 96
                 $planForAgent = Product::find($productid)->planRelation->find($plan);
96
-                if ($planForAgent) {//If Plan Exists For the Product ie not a Product without Plan
97
+                if ($planForAgent) {
98
+//If Plan Exists For the Product ie not a Product without Plan
97 99
                     $noOfAgents = $planForAgent->planPrice->first()->no_of_agents;
98 100
                     $agents = $noOfAgents ? $noOfAgents : 0; //If no. of Agents is specified then that,else 0(Unlimited Agents)
99 101
                 } else {
@@ -106,7 +108,8 @@  discard block
 block discarded – undo
106 108
 
107 109
         public function getQuantity($qty, $productid, $plan)
108 110
         {
109
-            if (!$qty) {//If quantity is not received in the request in the case when 'modify quantity' is not allowed for the Product,get the Product qUANTITY from the Plan Table.
111
+            if (!$qty) {
112
+//If quantity is not received in the request in the case when 'modify quantity' is not allowed for the Product,get the Product qUANTITY from the Plan Table.
110 113
                 $planForQty = Product::find($productid)->planRelation->find($plan);
111 114
                 if ($planForQty) {
112 115
                     $quantity = Product::find($productid)->planRelation->find($plan)->planPrice->first()->product_quantity;
Please login to merge, or discard this patch.
app/Traits/Order/UpdateDates.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
     public function editUpdateExpiry(Request $request)
23 23
     {
24 24
         $this->validate($request, [
25
-         'date' => 'required',
25
+            'date' => 'required',
26 26
         ]);
27 27
 
28 28
         try {
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
     public function editLicenseExpiry(Request $request)
68 68
     {
69 69
         $this->validate($request, [
70
-         'date' => 'required',
70
+            'date' => 'required',
71 71
         ]);
72 72
 
73 73
         try {
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
     public function editSupportExpiry(Request $request)
113 113
     {
114 114
         $this->validate($request, [
115
-         'date' => 'required',
115
+            'date' => 'required',
116 116
         ]);
117 117
 
118 118
         try {
Please login to merge, or discard this patch.
app/Http/Controllers/DashboardController.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
         $status = $request->input('status');
61 61
 
62 62
         return view('themes.default1.common.dashboard', compact('allowedCurrencies1','allowedCurrencies2','currency1Symbol','currency2Symbol','totalSalesCurrency2', 'totalSalesCurrency1', 'yearlySalesCurrency2', 'yearlySalesCurrency1', 'monthlySalesCurrency2', 'monthlySalesCurrency1', 'users','count_users', 'arraylists', 'productSoldlists','orders','subscriptions','invoices', 'products', 'arrayCountList', 'pendingPaymentCurrency2', 'pendingPaymentCurrency1', 'status','startSubscriptionDate',
63
-                 'endSubscriptionDate'));
63
+                    'endSubscriptionDate'));
64 64
     }
65 65
 
66 66
     /**
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
         // dd($currentYear,$currentMonth );
158 158
         $total = Invoice::whereYear('created_at', '=', $currentYear)->whereMonth('created_at', '=', $currentMonth)
159 159
                 ->where('currency', $allowedCurrencies1)
160
-                 ->where('status', '=', 'success')
160
+                    ->where('status', '=', 'success')
161 161
                 ->pluck('grand_total')->all();
162 162
         $grandTotal = array_sum($total);
163 163
 
@@ -204,9 +204,9 @@  discard block
 block discarded – undo
204 204
     public function getAllUsers()
205 205
     {
206 206
         $allUsers = User::orderBy('created_at', 'desc')->where('active', 1)->where('mobile_verified', 1)
207
-              ->take(20)
208
-              ->get()
209
-              ->toArray();
207
+                ->take(20)
208
+                ->get()
209
+                ->toArray();
210 210
 
211 211
         return $allUsers;
212 212
     }
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
         $dayUtc = new Carbon('-30 days');
242 242
         $minus30Day = $dayUtc->toDateTimeString();
243 243
         $recentOrders = Order::where('created_at', '>', $minus30Day)->orderBy('created_at', 'desc')
244
-                 ->where('price_override', '>', 0)->get();
244
+                    ->where('price_override', '>', 0)->get();
245 245
 
246 246
         return $recentOrders;
247 247
     }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
         $endSubscriptionDate = date('Y-m-d', strtotime('+3 months'));
60 60
         $status = $request->input('status');
61 61
 
62
-        return view('themes.default1.common.dashboard', compact('allowedCurrencies1','allowedCurrencies2','currency1Symbol','currency2Symbol','totalSalesCurrency2', 'totalSalesCurrency1', 'yearlySalesCurrency2', 'yearlySalesCurrency1', 'monthlySalesCurrency2', 'monthlySalesCurrency1', 'users','count_users', 'arraylists', 'productSoldlists','orders','subscriptions','invoices', 'products', 'arrayCountList', 'pendingPaymentCurrency2', 'pendingPaymentCurrency1', 'status','startSubscriptionDate',
62
+        return view('themes.default1.common.dashboard', compact('allowedCurrencies1', 'allowedCurrencies2', 'currency1Symbol', 'currency2Symbol', 'totalSalesCurrency2', 'totalSalesCurrency1', 'yearlySalesCurrency2', 'yearlySalesCurrency1', 'monthlySalesCurrency2', 'monthlySalesCurrency1', 'users', 'count_users', 'arraylists', 'productSoldlists', 'orders', 'subscriptions', 'invoices', 'products', 'arrayCountList', 'pendingPaymentCurrency2', 'pendingPaymentCurrency1', 'status', 'startSubscriptionDate',
63 63
                  'endSubscriptionDate'));
64 64
     }
65 65
 
Please login to merge, or discard this patch.
app/Http/Controllers/Order/BaseOrderController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -275,7 +275,7 @@
 block discarded – undo
275 275
         $data = $template->data;
276 276
         $replace = [
277 277
             'name'          => $user->first_name.' '.$user->last_name,
278
-             'serialkeyurl' => $myaccounturl,
278
+                'serialkeyurl' => $myaccounturl,
279 279
             'downloadurl'   => $downloadurl,
280 280
             'invoiceurl'    => $invoiceurl,
281 281
             'product'       => $product,
Please login to merge, or discard this patch.
app/Http/Controllers/Payment/CurrencyController.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -45,24 +45,24 @@  discard block
 block discarded – undo
45 45
                             return $model->name;
46 46
                         })
47 47
 
48
-                          ->addColumn('code', function ($model) {
49
-                              return $model->code;
50
-                          })
48
+                            ->addColumn('code', function ($model) {
49
+                                return $model->code;
50
+                            })
51 51
 
52
-                          ->addColumn('symbol', function ($model) {
53
-                              return $model->symbol;
54
-                          })
52
+                            ->addColumn('symbol', function ($model) {
53
+                                return $model->symbol;
54
+                            })
55 55
 
56
-                          ->addColumn('dashboard', function ($model) {
57
-                              if ($model->status == 1) {
58
-                                  $showButton = $this->getButtonColor($model->id);
56
+                            ->addColumn('dashboard', function ($model) {
57
+                                if ($model->status == 1) {
58
+                                    $showButton = $this->getButtonColor($model->id);
59 59
 
60
-                                  return $showButton;
61
-                              } else {
62
-                                  return  '<a class="btn btn-sm btn-primary btn-xs disabled"><i class="fa fa-eye"
60
+                                    return $showButton;
61
+                                } else {
62
+                                    return  '<a class="btn btn-sm btn-primary btn-xs disabled"><i class="fa fa-eye"
63 63
                                 style="color:white;"> </i>&nbsp;&nbsp;Show on Dashboard</a>';
64
-                              }
65
-                          })
64
+                                }
65
+                            })
66 66
 
67 67
                         ->addColumn('status', function ($model) {
68 68
                             if ($model->status == 1) {
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
     {
288 288
         $countryDetails = Country::where('country_id', $request->id)->select('currency_code', 'currency_symbol', 'currency_name')->first();
289 289
         $data = (['code'=> $countryDetails->currency_code,
290
-          'symbol'      => $countryDetails->currency_symbol, 'currency'=>$countryDetails->currency_name, ]);
290
+            'symbol'      => $countryDetails->currency_symbol, 'currency'=>$countryDetails->currency_name, ]);
291 291
 
292 292
         return $data;
293 293
     }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,19 +41,19 @@  discard block
 block discarded – undo
41 41
 
42 42
         return \DataTables::of($model)
43 43
 
44
-                        ->addColumn('name', function ($model) {
44
+                        ->addColumn('name', function($model) {
45 45
                             return $model->name;
46 46
                         })
47 47
 
48
-                          ->addColumn('code', function ($model) {
48
+                          ->addColumn('code', function($model) {
49 49
                               return $model->code;
50 50
                           })
51 51
 
52
-                          ->addColumn('symbol', function ($model) {
52
+                          ->addColumn('symbol', function($model) {
53 53
                               return $model->symbol;
54 54
                           })
55 55
 
56
-                          ->addColumn('dashboard', function ($model) {
56
+                          ->addColumn('dashboard', function($model) {
57 57
                               if ($model->status == 1) {
58 58
                                   $showButton = $this->getButtonColor($model->id);
59 59
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
                               }
65 65
                           })
66 66
 
67
-                        ->addColumn('status', function ($model) {
67
+                        ->addColumn('status', function($model) {
68 68
                             if ($model->status == 1) {
69 69
                                 return'<label class="switch toggle_event_editing">
70 70
                             <input type="hidden" name="module_id" class="module_id" value="'.$model->id.'" >
Please login to merge, or discard this patch.
app/Http/Controllers/Github/GithubController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -279,7 +279,7 @@
 block discarded – undo
279 279
             StatusSetting::find(1)->update(['github_status'=>$status]);
280 280
             Github::find(1)->update(['username'=> $request->input('git_username'),
281 281
                 'password'                     => $request->input('git_password'), 'client_id'=>$request->input('git_client'),
282
-                 'client_secret'               => $request->input('git_secret'), ]);
282
+                    'client_secret'               => $request->input('git_secret'), ]);
283 283
 
284 284
             return ['message' => 'success', 'update'=>'Github Settings Updated'];
285 285
         } catch (Exception $ex) {
Please login to merge, or discard this patch.
app/Http/Controllers/User/ClientController.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -115,18 +115,18 @@  discard block
 block discarded – undo
115 115
         );
116 116
 
117 117
         return\ DataTables::of($user->get())
118
-                         ->addColumn('checkbox', function ($model) {
118
+                         ->addColumn('checkbox', function($model) {
119 119
                              return "<input type='checkbox' class='user_checkbox' 
120 120
                             value=".$model->id.' name=select[] id=check>';
121 121
                          })
122
-                        ->addColumn('first_name', function ($model) {
122
+                        ->addColumn('first_name', function($model) {
123 123
                             return '<a href='.url('clients/'.$model->id).'>'
124 124
                             .ucfirst($model->first_name).' '.ucfirst($model->last_name).'</a>';
125 125
                         })
126
-                         ->addColumn('email', function ($model) {
126
+                         ->addColumn('email', function($model) {
127 127
                              return $model->email;
128 128
                          })
129
-                          ->addColumn('created_at', function ($model) {
129
+                          ->addColumn('created_at', function($model) {
130 130
                               $ends = $model->created_at;
131 131
                               if ($ends) {
132 132
                                   $date1 = new DateTime($ends);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
                               return $end;
139 139
                           })
140 140
                         // ->showColumns('email', 'created_at')
141
-                        ->addColumn('active', function ($model) {
141
+                        ->addColumn('active', function($model) {
142 142
                             if ($model->active == 1) {
143 143
                                 $email = "<span class='glyphicon glyphicon-envelope'
144 144
                                  style='color:green' title='verified email'></span>";
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 
157 157
                             return $email.'&nbsp;&nbsp;'.$mobile;
158 158
                         })
159
-                        ->addColumn('action', function ($model) {
159
+                        ->addColumn('action', function($model) {
160 160
                             return '<a href='.url('clients/'.$model->id.'/edit')
161 161
                             ." class='btn btn-sm btn-primary btn-xs'>
162 162
                             <i class='fa fa-edit' style='color:white;'> </i>&nbsp;&nbsp;Edit</a>"
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
                                     <i class='fa fa-eye' style='color:white;'> </i>&nbsp;&nbsp;View</a>";
166 166
                             // return 'hhhh';
167 167
                         })
168
-                        ->rawColumns(['checkbox', 'first_name', 'email',  'created_at', 'active', 'action'])
168
+                        ->rawColumns(['checkbox', 'first_name', 'email', 'created_at', 'active', 'action'])
169 169
                         ->make(true);
170 170
 
171 171
         // ->searchColumns('email', 'first_name')
Please login to merge, or discard this patch.
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -116,28 +116,28 @@
 block discarded – undo
116 116
         );
117 117
 
118 118
         return\ DataTables::of($user->get())
119
-                         ->addColumn('checkbox', function ($model) {
120
-                             return "<input type='checkbox' class='user_checkbox' 
119
+                            ->addColumn('checkbox', function ($model) {
120
+                                return "<input type='checkbox' class='user_checkbox' 
121 121
                             value=".$model->id.' name=select[] id=check>';
122
-                         })
122
+                            })
123 123
                         ->addColumn('first_name', function ($model) {
124 124
                             return '<a href='.url('clients/'.$model->id).'>'
125 125
                             .ucfirst($model->first_name).' '.ucfirst($model->last_name).'</a>';
126 126
                         })
127
-                         ->addColumn('email', function ($model) {
128
-                             return $model->email;
129
-                         })
130
-                          ->addColumn('created_at', function ($model) {
131
-                              $ends = $model->created_at;
132
-                              if ($ends) {
133
-                                  $date1 = new DateTime($ends);
134
-                                  $tz = \Auth::user()->timezone()->first()->name;
135
-                                  $date1->setTimezone(new DateTimeZone($tz));
136
-                                  $end = $date1->format('M j, Y, g:i a ');
137
-                              }
138
-
139
-                              return $end;
140
-                          })
127
+                            ->addColumn('email', function ($model) {
128
+                                return $model->email;
129
+                            })
130
+                            ->addColumn('created_at', function ($model) {
131
+                                $ends = $model->created_at;
132
+                                if ($ends) {
133
+                                    $date1 = new DateTime($ends);
134
+                                    $tz = \Auth::user()->timezone()->first()->name;
135
+                                    $date1->setTimezone(new DateTimeZone($tz));
136
+                                    $end = $date1->format('M j, Y, g:i a ');
137
+                                }
138
+
139
+                                return $end;
140
+                            })
141 141
                         // ->showColumns('email', 'created_at')
142 142
                         ->addColumn('active', function ($model) {
143 143
                             if ($model->active == 1) {
Please login to merge, or discard this patch.