@@ -106,27 +106,27 @@ |
||
| 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 | /** |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | return ''; |
| 75 | 75 | |
| 76 | 76 | // return "Product has been {$eventName}"; |
| 77 | - // \Auth::user()->activity; |
|
| 77 | + // \Auth::user()->activity; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | return view('themes.default1.common.dashboard', compact('totalSalesINR', 'totalSalesUSD', |
| 47 | 47 | 'yearlySalesINR', 'yearlySalesUSD', 'monthlySalesINR', 'monthlySalesUSD', 'users', |
| 48 | 48 | |
| 49 | - 'count_users', 'arraylists', 'productSoldlists','orders','subscriptions','invoices', |
|
| 49 | + 'count_users', 'arraylists', 'productSoldlists', 'orders', 'subscriptions', 'invoices', |
|
| 50 | 50 | 'products', 'arrayCountList')); |
| 51 | 51 | } |
| 52 | 52 | |
@@ -33,6 +33,6 @@ |
||
| 33 | 33 | return ''; |
| 34 | 34 | |
| 35 | 35 | // return "Product has been {$eventName}"; |
| 36 | - // \Auth::user()->activity; |
|
| 36 | + // \Auth::user()->activity; |
|
| 37 | 37 | } |
| 38 | 38 | } |
@@ -195,36 +195,36 @@ discard block |
||
| 195 | 195 | $activity_log = Activity::select('id', 'log_name', 'description', 'subject_id', 'subject_type', 'causer_id', 'properties', 'created_at')->get(); |
| 196 | 196 | |
| 197 | 197 | return\ DataTables::of($activity_log) |
| 198 | - ->addColumn('checkbox', function ($model) { |
|
| 199 | - return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>'; |
|
| 200 | - }) |
|
| 201 | - ->addColumn('name', function ($model) { |
|
| 202 | - return ucfirst($model->log_name); |
|
| 203 | - }) |
|
| 204 | - ->addColumn('description', function ($model) { |
|
| 205 | - return ucfirst($model->description); |
|
| 206 | - }) |
|
| 207 | - ->addColumn('username', function ($model) { |
|
| 208 | - $causer_id = $model->causer_id; |
|
| 209 | - $names = User::where('id', $causer_id)->pluck('last_name', 'first_name'); |
|
| 210 | - foreach ($names as $key => $value) { |
|
| 211 | - $fullName = $key.' '.$value; |
|
| 212 | - |
|
| 213 | - return $fullName; |
|
| 214 | - } |
|
| 215 | - }) |
|
| 216 | - ->addColumn('role', function ($model) { |
|
| 217 | - $causer_id = $model->causer_id; |
|
| 218 | - $role = User::where('id', $causer_id)->pluck('role'); |
|
| 219 | - |
|
| 220 | - return json_decode($role); |
|
| 221 | - }) |
|
| 222 | - ->addColumn('new', function ($model) { |
|
| 223 | - $properties = ($model->properties); |
|
| 224 | - $newEntry = $this->getNewEntry($properties, $model); |
|
| 225 | - |
|
| 226 | - return $newEntry; |
|
| 227 | - }) |
|
| 198 | + ->addColumn('checkbox', function ($model) { |
|
| 199 | + return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>'; |
|
| 200 | + }) |
|
| 201 | + ->addColumn('name', function ($model) { |
|
| 202 | + return ucfirst($model->log_name); |
|
| 203 | + }) |
|
| 204 | + ->addColumn('description', function ($model) { |
|
| 205 | + return ucfirst($model->description); |
|
| 206 | + }) |
|
| 207 | + ->addColumn('username', function ($model) { |
|
| 208 | + $causer_id = $model->causer_id; |
|
| 209 | + $names = User::where('id', $causer_id)->pluck('last_name', 'first_name'); |
|
| 210 | + foreach ($names as $key => $value) { |
|
| 211 | + $fullName = $key.' '.$value; |
|
| 212 | + |
|
| 213 | + return $fullName; |
|
| 214 | + } |
|
| 215 | + }) |
|
| 216 | + ->addColumn('role', function ($model) { |
|
| 217 | + $causer_id = $model->causer_id; |
|
| 218 | + $role = User::where('id', $causer_id)->pluck('role'); |
|
| 219 | + |
|
| 220 | + return json_decode($role); |
|
| 221 | + }) |
|
| 222 | + ->addColumn('new', function ($model) { |
|
| 223 | + $properties = ($model->properties); |
|
| 224 | + $newEntry = $this->getNewEntry($properties, $model); |
|
| 225 | + |
|
| 226 | + return $newEntry; |
|
| 227 | + }) |
|
| 228 | 228 | ->addColumn('old', function ($model) { |
| 229 | 229 | $data = ($model->properties); |
| 230 | 230 | $oldEntry = $this->getOldEntry($data, $model); |
@@ -252,40 +252,40 @@ discard block |
||
| 252 | 252 | $email_log = \DB::table('email_log')->get(); |
| 253 | 253 | |
| 254 | 254 | return\ DataTables::of($email_log) |
| 255 | - ->addColumn('checkbox', function ($model) { |
|
| 256 | - return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>'; |
|
| 257 | - }) |
|
| 258 | - ->addColumn('date', function ($model) { |
|
| 259 | - return ucfirst($model->date); |
|
| 260 | - }) |
|
| 261 | - ->addColumn('from', function ($model) { |
|
| 262 | - $from = Markdown::convertToHtml(ucfirst($model->from)); |
|
| 263 | - |
|
| 264 | - return $from; |
|
| 265 | - }) |
|
| 266 | - ->addColumn('to', function ($model) { |
|
| 267 | - $to = Markdown::convertToHtml(ucfirst($model->to)); |
|
| 268 | - |
|
| 269 | - return $to; |
|
| 270 | - }) |
|
| 271 | - ->addColumn('cc', function ($model) { |
|
| 272 | - $cc = '--'; |
|
| 273 | - |
|
| 274 | - return $cc; |
|
| 275 | - }) |
|
| 276 | - |
|
| 277 | - ->addColumn('subject', function ($model) { |
|
| 278 | - return ucfirst($model->subject); |
|
| 279 | - }) |
|
| 280 | - |
|
| 281 | - ->addColumn('headers', function ($model) { |
|
| 282 | - $headers = Markdown::convertToHtml(ucfirst($model->headers)); |
|
| 283 | - |
|
| 284 | - return $headers; |
|
| 285 | - }) |
|
| 286 | - ->addColumn('status', function ($model) { |
|
| 287 | - return ucfirst($model->status); |
|
| 288 | - }) |
|
| 255 | + ->addColumn('checkbox', function ($model) { |
|
| 256 | + return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>'; |
|
| 257 | + }) |
|
| 258 | + ->addColumn('date', function ($model) { |
|
| 259 | + return ucfirst($model->date); |
|
| 260 | + }) |
|
| 261 | + ->addColumn('from', function ($model) { |
|
| 262 | + $from = Markdown::convertToHtml(ucfirst($model->from)); |
|
| 263 | + |
|
| 264 | + return $from; |
|
| 265 | + }) |
|
| 266 | + ->addColumn('to', function ($model) { |
|
| 267 | + $to = Markdown::convertToHtml(ucfirst($model->to)); |
|
| 268 | + |
|
| 269 | + return $to; |
|
| 270 | + }) |
|
| 271 | + ->addColumn('cc', function ($model) { |
|
| 272 | + $cc = '--'; |
|
| 273 | + |
|
| 274 | + return $cc; |
|
| 275 | + }) |
|
| 276 | + |
|
| 277 | + ->addColumn('subject', function ($model) { |
|
| 278 | + return ucfirst($model->subject); |
|
| 279 | + }) |
|
| 280 | + |
|
| 281 | + ->addColumn('headers', function ($model) { |
|
| 282 | + $headers = Markdown::convertToHtml(ucfirst($model->headers)); |
|
| 283 | + |
|
| 284 | + return $headers; |
|
| 285 | + }) |
|
| 286 | + ->addColumn('status', function ($model) { |
|
| 287 | + return ucfirst($model->status); |
|
| 288 | + }) |
|
| 289 | 289 | |
| 290 | 290 | ->rawColumns(['checkbox', 'date', 'from', 'to', 'cc', 'bcc', 'subject', 'headers', 'status']) |
| 291 | 291 | ->make(true); |
@@ -195,16 +195,16 @@ discard block |
||
| 195 | 195 | $activity_log = Activity::select('id', 'log_name', 'description', 'subject_id', 'subject_type', 'causer_id', 'properties', 'created_at')->get(); |
| 196 | 196 | |
| 197 | 197 | return\ DataTables::of($activity_log) |
| 198 | - ->addColumn('checkbox', function ($model) { |
|
| 198 | + ->addColumn('checkbox', function($model) { |
|
| 199 | 199 | return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>'; |
| 200 | 200 | }) |
| 201 | - ->addColumn('name', function ($model) { |
|
| 201 | + ->addColumn('name', function($model) { |
|
| 202 | 202 | return ucfirst($model->log_name); |
| 203 | 203 | }) |
| 204 | - ->addColumn('description', function ($model) { |
|
| 204 | + ->addColumn('description', function($model) { |
|
| 205 | 205 | return ucfirst($model->description); |
| 206 | 206 | }) |
| 207 | - ->addColumn('username', function ($model) { |
|
| 207 | + ->addColumn('username', function($model) { |
|
| 208 | 208 | $causer_id = $model->causer_id; |
| 209 | 209 | $names = User::where('id', $causer_id)->pluck('last_name', 'first_name'); |
| 210 | 210 | foreach ($names as $key => $value) { |
@@ -213,31 +213,31 @@ discard block |
||
| 213 | 213 | return $fullName; |
| 214 | 214 | } |
| 215 | 215 | }) |
| 216 | - ->addColumn('role', function ($model) { |
|
| 216 | + ->addColumn('role', function($model) { |
|
| 217 | 217 | $causer_id = $model->causer_id; |
| 218 | 218 | $role = User::where('id', $causer_id)->pluck('role'); |
| 219 | 219 | |
| 220 | 220 | return json_decode($role); |
| 221 | 221 | }) |
| 222 | - ->addColumn('new', function ($model) { |
|
| 222 | + ->addColumn('new', function($model) { |
|
| 223 | 223 | $properties = ($model->properties); |
| 224 | 224 | $newEntry = $this->getNewEntry($properties, $model); |
| 225 | 225 | |
| 226 | 226 | return $newEntry; |
| 227 | 227 | }) |
| 228 | - ->addColumn('old', function ($model) { |
|
| 228 | + ->addColumn('old', function($model) { |
|
| 229 | 229 | $data = ($model->properties); |
| 230 | 230 | $oldEntry = $this->getOldEntry($data, $model); |
| 231 | 231 | |
| 232 | 232 | return $oldEntry; |
| 233 | 233 | }) |
| 234 | - ->addColumn('created_at', function ($model) { |
|
| 234 | + ->addColumn('created_at', function($model) { |
|
| 235 | 235 | $newDate = $this->getDate($model->created_at); |
| 236 | 236 | |
| 237 | 237 | return $newDate; |
| 238 | 238 | }) |
| 239 | 239 | |
| 240 | - ->rawColumns(['checkbox', 'name', 'description', 'username', 'role', 'new', 'old', 'created_at']) |
|
| 240 | + ->rawColumns(['checkbox', 'name', 'description', 'username', 'role', 'new', 'old', 'created_at']) |
|
| 241 | 241 | ->make(true); |
| 242 | 242 | } catch (\Exception $e) { |
| 243 | 243 | Bugsnag::notifyException($e); |
@@ -252,38 +252,38 @@ discard block |
||
| 252 | 252 | $email_log = \DB::table('email_log')->get(); |
| 253 | 253 | |
| 254 | 254 | return\ DataTables::of($email_log) |
| 255 | - ->addColumn('checkbox', function ($model) { |
|
| 255 | + ->addColumn('checkbox', function($model) { |
|
| 256 | 256 | return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>'; |
| 257 | 257 | }) |
| 258 | - ->addColumn('date', function ($model) { |
|
| 258 | + ->addColumn('date', function($model) { |
|
| 259 | 259 | return ucfirst($model->date); |
| 260 | 260 | }) |
| 261 | - ->addColumn('from', function ($model) { |
|
| 261 | + ->addColumn('from', function($model) { |
|
| 262 | 262 | $from = Markdown::convertToHtml(ucfirst($model->from)); |
| 263 | 263 | |
| 264 | 264 | return $from; |
| 265 | 265 | }) |
| 266 | - ->addColumn('to', function ($model) { |
|
| 266 | + ->addColumn('to', function($model) { |
|
| 267 | 267 | $to = Markdown::convertToHtml(ucfirst($model->to)); |
| 268 | 268 | |
| 269 | 269 | return $to; |
| 270 | 270 | }) |
| 271 | - ->addColumn('cc', function ($model) { |
|
| 271 | + ->addColumn('cc', function($model) { |
|
| 272 | 272 | $cc = '--'; |
| 273 | 273 | |
| 274 | 274 | return $cc; |
| 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 | - ->addColumn('headers', function ($model) { |
|
| 281 | + ->addColumn('headers', function($model) { |
|
| 282 | 282 | $headers = Markdown::convertToHtml(ucfirst($model->headers)); |
| 283 | 283 | |
| 284 | 284 | return $headers; |
| 285 | 285 | }) |
| 286 | - ->addColumn('status', function ($model) { |
|
| 286 | + ->addColumn('status', function($model) { |
|
| 287 | 287 | return ucfirst($model->status); |
| 288 | 288 | }) |
| 289 | 289 | |