Completed
Push — development ( a546b2...2b11c6 )
by Ashutosh
09:55
created
app/Model/Payment/PlanPrice.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,10 +7,10 @@  discard block
 block discarded – undo
7 7
 
8 8
 class PlanPrice extends Model
9 9
 {
10
-	use LogsActivity;
10
+    use LogsActivity;
11 11
     protected $table = 'plan_prices';
12 12
     protected $fillable = ['plan_id', 'currency', 'add_price', 'renew_price'];
13
-     protected static $logName = 'Plan Price';
13
+        protected static $logName = 'Plan Price';
14 14
     protected static $logAttributes = ['plan_id', 'currency', 'add_price', 'renew_price'];
15 15
     protected static $logOnlyDirty = true;
16 16
 
@@ -31,6 +31,6 @@  discard block
 block discarded – undo
31 31
         return '';
32 32
 
33 33
         // return "Product  has been {$eventName}";
34
-         // \Auth::user()->activity;
34
+            // \Auth::user()->activity;
35 35
     }
36 36
 }
Please login to merge, or discard this patch.
app/Model/Payment/TaxOption.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,15 +7,15 @@
 block discarded – undo
7 7
 
8 8
 class TaxOption extends BaseModel
9 9
 {
10
-	use LogsActivity;
10
+    use LogsActivity;
11 11
     protected $table = 'tax_rules';
12 12
     protected static $logName = 'Tax Class';
13 13
     protected static $logAttributes = ['tax_enable', 'inclusive', 'shop_inclusive', 'cart_inclusive', 'rounding', 'Gst_no'];
14
-     protected static $logOnlyDirty = true;
14
+        protected static $logOnlyDirty = true;
15 15
     protected $fillable = ['tax_enable', 'inclusive', 'shop_inclusive', 'cart_inclusive', 'rounding', 'Gst_no'];
16 16
 
17 17
   
18
-   public function getDescriptionForEvent(string $eventName): string
18
+    public function getDescriptionForEvent(string $eventName): string
19 19
     {
20 20
         if ($eventName == 'created') {
21 21
             return 'Tax Rule  <strong> '.$this->name.' </strong> was created';
Please login to merge, or discard this patch.
app/Http/Controllers/DashboardController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
         $monthlySalesUSD = $this->getMonthlySalesInUsd();
27 27
         $users = $this->getAllUsers();
28 28
         $count_users = User::get()->count();
29
-        $productNameList =array();
29
+        $productNameList = array();
30 30
         $productSoldlists = $this->recentProductSold();
31 31
         if (!empty($productSoldlists)) {
32 32
             foreach ($productSoldlists as $productSoldlist) {
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         return view('themes.default1.common.dashboard', compact('totalSalesINR', 'totalSalesUSD',
50 50
                 'yearlySalesINR', 'yearlySalesUSD', 'monthlySalesINR', 'monthlySalesUSD', 'users',
51 51
 
52
-                 'count_users', 'arraylists', 'productSoldlists','orders','subscriptions','invoices',
52
+                 'count_users', 'arraylists', 'productSoldlists', 'orders', 'subscriptions', 'invoices',
53 53
                  'products', 'arrayCountList'));
54 54
     }
55 55
 
Please login to merge, or discard this patch.
app/Http/Controllers/Common/SettingsController.php 2 patches
Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
     public function settingsMail()
185 185
     {
186 186
         try {
187
-           return view('themes.default1.common.email-log');
187
+            return view('themes.default1.common.email-log');
188 188
         } catch (\Exception $ex) {
189 189
             return redirect()->back()->with('fails', $ex->getMessage());
190 190
         }
@@ -196,36 +196,36 @@  discard block
 block discarded – undo
196 196
             $activity_log = Activity::select('id', 'log_name', 'description', 'subject_id', 'subject_type', 'causer_id', 'properties', 'created_at')->get();
197 197
 
198 198
             return\ DataTables::of($activity_log)
199
-             ->addColumn('checkbox', function ($model) {
200
-                 return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
201
-             })
202
-                           ->addColumn('name', function ($model) {
203
-                               return ucfirst($model->log_name);
204
-                           })
205
-                             ->addColumn('description', function ($model) {
206
-                                 return ucfirst($model->description);
207
-                             })
208
-                          ->addColumn('username', function ($model) {
209
-                              $causer_id = $model->causer_id;
210
-                              $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
211
-                              foreach ($names as $key => $value) {
212
-                                  $fullName = $key.' '.$value;
213
-
214
-                                  return $fullName;
215
-                              }
216
-                          })
217
-                              ->addColumn('role', function ($model) {
218
-                                  $causer_id = $model->causer_id;
219
-                                  $role = User::where('id', $causer_id)->pluck('role');
220
-
221
-                                  return json_decode($role);
222
-                              })
223
-                               ->addColumn('new', function ($model) {
224
-                                   $properties = ($model->properties);
225
-                                   $newEntry = $this->getNewEntry($properties, $model);
226
-
227
-                                   return $newEntry;
228
-                               })
199
+                ->addColumn('checkbox', function ($model) {
200
+                    return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
201
+                })
202
+                            ->addColumn('name', function ($model) {
203
+                                return ucfirst($model->log_name);
204
+                            })
205
+                                ->addColumn('description', function ($model) {
206
+                                    return ucfirst($model->description);
207
+                                })
208
+                            ->addColumn('username', function ($model) {
209
+                                $causer_id = $model->causer_id;
210
+                                $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
211
+                                foreach ($names as $key => $value) {
212
+                                    $fullName = $key.' '.$value;
213
+
214
+                                    return $fullName;
215
+                                }
216
+                            })
217
+                                ->addColumn('role', function ($model) {
218
+                                    $causer_id = $model->causer_id;
219
+                                    $role = User::where('id', $causer_id)->pluck('role');
220
+
221
+                                    return json_decode($role);
222
+                                })
223
+                                ->addColumn('new', function ($model) {
224
+                                    $properties = ($model->properties);
225
+                                    $newEntry = $this->getNewEntry($properties, $model);
226
+
227
+                                    return $newEntry;
228
+                                })
229 229
                                 ->addColumn('old', function ($model) {
230 230
                                     $data = ($model->properties);
231 231
                                     $oldEntry = $this->getOldEntry($data, $model);
@@ -254,40 +254,40 @@  discard block
 block discarded – undo
254 254
             $email_log = \DB::table('email_log')->get();
255 255
 
256 256
             return\ DataTables::of($email_log)
257
-             ->addColumn('checkbox', function ($model) {
258
-                 return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
259
-             })
260
-                           ->addColumn('date', function ($model) {
261
-                               return ucfirst($model->date);
262
-                           })
263
-                             ->addColumn('from', function ($model) {
257
+                ->addColumn('checkbox', function ($model) {
258
+                    return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
259
+                })
260
+                            ->addColumn('date', function ($model) {
261
+                                return ucfirst($model->date);
262
+                            })
263
+                                ->addColumn('from', function ($model) {
264 264
                                 $from =  Markdown::convertToHtml(ucfirst($model->from));
265
-                                 return $from;
266
-                             })
267
-                              ->addColumn('to', function ($model) {
268
-                                  $to = Markdown::convertToHtml(ucfirst($model->to));
269
-                                   return $to;
270
-                             })
271
-                             ->addColumn('cc', function ($model) {
272
-                                 $cc ='--';
273
-                                 return $cc;
265
+                                    return $from;
266
+                                })
267
+                                ->addColumn('to', function ($model) {
268
+                                    $to = Markdown::convertToHtml(ucfirst($model->to));
269
+                                    return $to;
270
+                                })
271
+                                ->addColumn('cc', function ($model) {
272
+                                    $cc ='--';
273
+                                    return $cc;
274 274
                                 
275
-                             })
275
+                                })
276 276
                          
277
-                               ->addColumn('subject', function ($model) {
278
-                                  return ucfirst($model->subject);
277
+                                ->addColumn('subject', function ($model) {
278
+                                    return ucfirst($model->subject);
279 279
                                
280
-                              })
280
+                                })
281 281
                                
282
-                              ->addColumn('headers', function ($model) {
283
-                                  $headers= Markdown::convertToHtml(ucfirst($model->headers));
284
-                                  return $headers;
282
+                                ->addColumn('headers', function ($model) {
283
+                                    $headers= Markdown::convertToHtml(ucfirst($model->headers));
284
+                                    return $headers;
285 285
                                
286
-                              })
287
-                              ->addColumn('status', function ($model) {
288
-                                   return ucfirst($model->status);
286
+                                })
287
+                                ->addColumn('status', function ($model) {
288
+                                    return ucfirst($model->status);
289 289
                                
290
-                              })
290
+                                })
291 291
                             
292 292
 
293 293
                             ->rawColumns(['checkbox', 'date', 'from', 'to', 'cc', 'bcc', 'subject', 'headers','status'])
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -196,16 +196,16 @@  discard block
 block discarded – undo
196 196
             $activity_log = Activity::select('id', 'log_name', 'description', 'subject_id', 'subject_type', 'causer_id', 'properties', 'created_at')->get();
197 197
 
198 198
             return\ DataTables::of($activity_log)
199
-             ->addColumn('checkbox', function ($model) {
199
+             ->addColumn('checkbox', function($model) {
200 200
                  return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
201 201
              })
202
-                           ->addColumn('name', function ($model) {
202
+                           ->addColumn('name', function($model) {
203 203
                                return ucfirst($model->log_name);
204 204
                            })
205
-                             ->addColumn('description', function ($model) {
205
+                             ->addColumn('description', function($model) {
206 206
                                  return ucfirst($model->description);
207 207
                              })
208
-                          ->addColumn('username', function ($model) {
208
+                          ->addColumn('username', function($model) {
209 209
                               $causer_id = $model->causer_id;
210 210
                               $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
211 211
                               foreach ($names as $key => $value) {
@@ -214,31 +214,31 @@  discard block
 block discarded – undo
214 214
                                   return $fullName;
215 215
                               }
216 216
                           })
217
-                              ->addColumn('role', function ($model) {
217
+                              ->addColumn('role', function($model) {
218 218
                                   $causer_id = $model->causer_id;
219 219
                                   $role = User::where('id', $causer_id)->pluck('role');
220 220
 
221 221
                                   return json_decode($role);
222 222
                               })
223
-                               ->addColumn('new', function ($model) {
223
+                               ->addColumn('new', function($model) {
224 224
                                    $properties = ($model->properties);
225 225
                                    $newEntry = $this->getNewEntry($properties, $model);
226 226
 
227 227
                                    return $newEntry;
228 228
                                })
229
-                                ->addColumn('old', function ($model) {
229
+                                ->addColumn('old', function($model) {
230 230
                                     $data = ($model->properties);
231 231
                                     $oldEntry = $this->getOldEntry($data, $model);
232 232
 
233 233
                                     return $oldEntry;
234 234
                                 })
235
-                                ->addColumn('created_at', function ($model) {
235
+                                ->addColumn('created_at', function($model) {
236 236
                                     $newDate = $this->getDate($model->created_at);
237 237
 
238 238
                                     return $newDate;
239 239
                                 })
240 240
 
241
-                            ->rawColumns(['checkbox', 'name', 'description',   'username', 'role', 'new', 'old', 'created_at'])
241
+                            ->rawColumns(['checkbox', 'name', 'description', 'username', 'role', 'new', 'old', 'created_at'])
242 242
                             ->make(true);
243 243
         } catch (\Exception $e) {
244 244
             Bugsnag::notifyException($e);
@@ -254,43 +254,43 @@  discard block
 block discarded – undo
254 254
             $email_log = \DB::table('email_log')->get();
255 255
 
256 256
             return\ DataTables::of($email_log)
257
-             ->addColumn('checkbox', function ($model) {
257
+             ->addColumn('checkbox', function($model) {
258 258
                  return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
259 259
              })
260
-                           ->addColumn('date', function ($model) {
260
+                           ->addColumn('date', function($model) {
261 261
                                return ucfirst($model->date);
262 262
                            })
263
-                             ->addColumn('from', function ($model) {
264
-                                $from =  Markdown::convertToHtml(ucfirst($model->from));
263
+                             ->addColumn('from', function($model) {
264
+                                $from = Markdown::convertToHtml(ucfirst($model->from));
265 265
                                  return $from;
266 266
                              })
267
-                              ->addColumn('to', function ($model) {
267
+                              ->addColumn('to', function($model) {
268 268
                                   $to = Markdown::convertToHtml(ucfirst($model->to));
269 269
                                    return $to;
270 270
                              })
271
-                             ->addColumn('cc', function ($model) {
272
-                                 $cc ='--';
271
+                             ->addColumn('cc', function($model) {
272
+                                 $cc = '--';
273 273
                                  return $cc;
274 274
                                 
275 275
                              })
276 276
                          
277
-                               ->addColumn('subject', function ($model) {
277
+                               ->addColumn('subject', function($model) {
278 278
                                   return ucfirst($model->subject);
279 279
                                
280 280
                               })
281 281
                                
282
-                              ->addColumn('headers', function ($model) {
283
-                                  $headers= Markdown::convertToHtml(ucfirst($model->headers));
282
+                              ->addColumn('headers', function($model) {
283
+                                  $headers = Markdown::convertToHtml(ucfirst($model->headers));
284 284
                                   return $headers;
285 285
                                
286 286
                               })
287
-                              ->addColumn('status', function ($model) {
287
+                              ->addColumn('status', function($model) {
288 288
                                    return ucfirst($model->status);
289 289
                                
290 290
                               })
291 291
                             
292 292
 
293
-                            ->rawColumns(['checkbox', 'date', 'from', 'to', 'cc', 'bcc', 'subject', 'headers','status'])
293
+                            ->rawColumns(['checkbox', 'date', 'from', 'to', 'cc', 'bcc', 'subject', 'headers', 'status'])
294 294
                             ->make(true);
295 295
         } catch (\Exception $e) {
296 296
             Bugsnag::notifyException($e);
Please login to merge, or discard this patch.
app/Http/Controllers/Payment/TaxController.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -106,27 +106,27 @@  discard block
 block discarded – undo
106 106
     public function getTaxTable()
107 107
     {
108 108
         return \DataTables::of(TaxByState::select('id', 'state', 'c_gst', 's_gst', 'i_gst', 'ut_gst')->get())
109
-                         ->addColumn('id', function ($model) {
110
-                             return $model->id;
111
-                         })
112
-
113
-                         ->addColumn('state', function ($model) {
114
-                             return ucfirst($model->state);
115
-                         })
116
-                         ->addColumn('c_gst', function ($model) {
117
-                             return ucfirst($model->c_gst);
118
-                         })
119
-                         ->addColumn('s_gst', function ($model) {
120
-                             return ucfirst($model->s_gst);
121
-                         })
122
-                         ->addColumn('i_gst', function ($model) {
123
-                             return ucfirst($model->i_gst);
124
-                         })
125
-                         ->addColumn('ut_gst', function ($model) {
126
-                             return ucfirst($model->ut_gst);
127
-                         })
128
-                          ->rawColumns(['id', 'state',  'c_gst', 's_gst', 'i_gst', 'ut_gst'])
129
-                          ->make(true);
109
+                            ->addColumn('id', function ($model) {
110
+                                return $model->id;
111
+                            })
112
+
113
+                            ->addColumn('state', function ($model) {
114
+                                return ucfirst($model->state);
115
+                            })
116
+                            ->addColumn('c_gst', function ($model) {
117
+                                return ucfirst($model->c_gst);
118
+                            })
119
+                            ->addColumn('s_gst', function ($model) {
120
+                                return ucfirst($model->s_gst);
121
+                            })
122
+                            ->addColumn('i_gst', function ($model) {
123
+                                return ucfirst($model->i_gst);
124
+                            })
125
+                            ->addColumn('ut_gst', function ($model) {
126
+                                return ucfirst($model->ut_gst);
127
+                            })
128
+                            ->rawColumns(['id', 'state',  'c_gst', 's_gst', 'i_gst', 'ut_gst'])
129
+                            ->make(true);
130 130
     }
131 131
 
132 132
 
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
             }
154 154
             $defaultValue = ['Others', 'Intra State GST', 'Inter State GST', 'Union Territory GST'];
155 155
 
156
-             $state = \App\Http\Controllers\Front\CartController::getStateByCode($tax->state);
156
+                $state = \App\Http\Controllers\Front\CartController::getStateByCode($tax->state);
157 157
             $states = \App\Http\Controllers\Front\CartController::findStateByRegionId($tax->country);
158 158
             if (count($classes) == 0) {
159 159
                 $classes = $this->tax_class->get();
Please login to merge, or discard this patch.
app/User.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
         $lastActivity = Activity::all()->last(); //returns the last logged activity
58 58
         if ($lastActivity->description == 'Logged In')
59 59
         {
60
-             $this->disableLogging();
60
+                $this->disableLogging();
61 61
         }
62 62
         if ($eventName == 'updated') {
63 63
             $this->enableLogging();
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
         return '';
73 73
 
74 74
         // return "Product  has been {$eventName}";
75
-         // \Auth::user()->activity;
75
+            // \Auth::user()->activity;
76 76
     }
77 77
 
78 78
     /**
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,8 +55,7 @@
 block discarded – undo
55 55
     public function getDescriptionForEvent(string $eventName): string
56 56
     {
57 57
         $lastActivity = Activity::all()->last(); //returns the last logged activity
58
-        if ($lastActivity->description == 'Logged In')
59
-        {
58
+        if ($lastActivity->description == 'Logged In') {
60 59
              $this->disableLogging();
61 60
         }
62 61
         if ($eventName == 'updated') {
Please login to merge, or discard this patch.