@@ -10,7 +10,7 @@ |
||
| 10 | 10 | |
| 11 | 11 | class Member extends Model implements HasMediaConversions |
| 12 | 12 | { |
| 13 | - use HasMediaTrait , Eloquence; |
|
| 13 | + use HasMediaTrait, Eloquence; |
|
| 14 | 14 | |
| 15 | 15 | protected $table = 'mst_members'; |
| 16 | 16 | |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | |
| 53 | 53 | $schedule->command('expense:alert') |
| 54 | 54 | ->dailyAt('10:30') |
| 55 | - ->when(function () { |
|
| 55 | + ->when(function() { |
|
| 56 | 56 | return \Utilities::getSetting('primary_contact') != null; |
| 57 | 57 | }); |
| 58 | 58 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | //API routes |
| 26 | 26 | Route::post('api/token', 'Api\AuthenticateController@authenticate'); |
| 27 | 27 | |
| 28 | -Route::group(['prefix' => 'api', 'middleware' => ['jwt.auth']], function () { |
|
| 28 | +Route::group(['prefix' => 'api', 'middleware' => ['jwt.auth']], function() { |
|
| 29 | 29 | Route::get('dashboard', 'Api\DashboardController@index'); |
| 30 | 30 | Route::get('members', 'Api\MembersController@index'); |
| 31 | 31 | Route::get('subscriptions', 'Api\SubscriptionsController@index'); |
@@ -53,21 +53,21 @@ discard block |
||
| 53 | 53 | }); |
| 54 | 54 | |
| 55 | 55 | //Auth routes |
| 56 | -Route::group(['prefix' => 'auth'], function () { |
|
| 56 | +Route::group(['prefix' => 'auth'], function() { |
|
| 57 | 57 | Route::get('login', 'Auth\AuthController@getLogin'); |
| 58 | 58 | Route::post('login', 'Auth\AuthController@postLogin'); |
| 59 | 59 | Route::get('logout', 'Auth\AuthController@getLogout'); |
| 60 | 60 | }); |
| 61 | 61 | |
| 62 | 62 | //dashboard |
| 63 | -Route::group(['middleware' => ['auth']], function () { |
|
| 63 | +Route::group(['middleware' => ['auth']], function() { |
|
| 64 | 64 | Route::get('/', 'DashboardController@index'); |
| 65 | 65 | Route::get('/dashboard', 'DashboardController@index'); |
| 66 | 66 | Route::post('/dashboard/smsRequest', 'DashboardController@smsRequest'); |
| 67 | 67 | }); |
| 68 | 68 | |
| 69 | 69 | //MembersController |
| 70 | -Route::group(['prefix' => 'members', 'middleware' => ['auth']], function () { |
|
| 70 | +Route::group(['prefix' => 'members', 'middleware' => ['auth']], function() { |
|
| 71 | 71 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@index']); |
| 72 | 72 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@index']); |
| 73 | 73 | Route::get('active', ['middleware' => ['permission:manage-gymie|manage-members|view-member'], 'uses' => 'MembersController@active']); |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | }); |
| 83 | 83 | |
| 84 | 84 | //ReportsController |
| 85 | -Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function () { |
|
| 85 | +Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function() { |
|
| 86 | 86 | Route::get('members/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@gymMemberCharts']); |
| 87 | 87 | Route::get('members/data', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@gymMemberData']); |
| 88 | 88 | Route::get('enquiries/charts', ['middleware' => ['permission:manage-gymie|manage-reports|view-report'], 'uses' => 'ReportsController@enquiryCharts']); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | }); |
| 99 | 99 | |
| 100 | 100 | //SmsController |
| 101 | -Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function () { |
|
| 101 | +Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function() { |
|
| 102 | 102 | Route::get('triggers', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggersIndex']); |
| 103 | 103 | Route::post('triggers/update', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggerUpdate']); |
| 104 | 104 | Route::get('events', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@eventsIndex']); |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | }); |
| 115 | 115 | |
| 116 | 116 | //enquiries |
| 117 | -Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function () { |
|
| 117 | +Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function() { |
|
| 118 | 118 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']); |
| 119 | 119 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']); |
| 120 | 120 | Route::get('create', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'], 'uses' => 'EnquiriesController@create']); |
@@ -127,13 +127,13 @@ discard block |
||
| 127 | 127 | }); |
| 128 | 128 | |
| 129 | 129 | //followups |
| 130 | -Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function () { |
|
| 130 | +Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function() { |
|
| 131 | 131 | Route::post('followups', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry-followup'], 'uses' => 'FollowupsController@store']); |
| 132 | 132 | Route::post('followups/{id}/update', ['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry-followup'], 'uses' => 'FollowupsController@update']); |
| 133 | 133 | }); |
| 134 | 134 | |
| 135 | 135 | //plans |
| 136 | -Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function () { |
|
| 136 | +Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function() { |
|
| 137 | 137 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']); |
| 138 | 138 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']); |
| 139 | 139 | Route::get('show', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@show']); |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | // }); |
| 163 | 163 | |
| 164 | 164 | //subsciptions |
| 165 | -Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function () { |
|
| 165 | +Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function() { |
|
| 166 | 166 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']); |
| 167 | 167 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']); |
| 168 | 168 | Route::get('expiring', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@expiring']); |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | }); |
| 181 | 181 | |
| 182 | 182 | //invoices |
| 183 | -Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function () { |
|
| 183 | +Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function() { |
|
| 184 | 184 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']); |
| 185 | 185 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']); |
| 186 | 186 | Route::get('paid', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@paid']); |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | // Route::get('access_logs/create','Access_logsController@create'); |
| 201 | 201 | |
| 202 | 202 | //payments |
| 203 | -Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function () { |
|
| 203 | +Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function() { |
|
| 204 | 204 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']); |
| 205 | 205 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']); |
| 206 | 206 | Route::get('show', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@show']); |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | // }); |
| 228 | 228 | |
| 229 | 229 | //expenses |
| 230 | -Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function () { |
|
| 230 | +Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function() { |
|
| 231 | 231 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']); |
| 232 | 232 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']); |
| 233 | 233 | Route::get('show', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@show']); |
@@ -247,14 +247,14 @@ discard block |
||
| 247 | 247 | }); |
| 248 | 248 | |
| 249 | 249 | //settings |
| 250 | -Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function () { |
|
| 250 | +Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function() { |
|
| 251 | 251 | Route::get('/', 'SettingsController@show'); |
| 252 | 252 | Route::get('edit', 'SettingsController@edit'); |
| 253 | 253 | Route::post('save', 'SettingsController@save'); |
| 254 | 254 | }); |
| 255 | 255 | |
| 256 | 256 | //User Module with roles & permissions |
| 257 | -Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () { |
|
| 257 | +Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() { |
|
| 258 | 258 | //User |
| 259 | 259 | Route::get('/', 'AclController@userIndex'); |
| 260 | 260 | Route::get('create', 'AclController@createUser'); |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | Route::post('{id}/delete', 'AclController@deleteUser'); |
| 265 | 265 | }); |
| 266 | 266 | |
| 267 | -Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () { |
|
| 267 | +Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() { |
|
| 268 | 268 | //Roles |
| 269 | 269 | Route::get('/', 'AclController@roleIndex'); |
| 270 | 270 | Route::get('create', 'AclController@createRole'); |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | Route::post('{id}/delete', 'AclController@deleteRole'); |
| 275 | 275 | }); |
| 276 | 276 | |
| 277 | -Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function () { |
|
| 277 | +Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function() { |
|
| 278 | 278 | //Permissions |
| 279 | 279 | Route::get('/', 'AclController@permissionIndex'); |
| 280 | 280 | Route::get('create', 'AclController@createPermission'); |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | $paymentTotal = Payment_detail::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get(); |
| 24 | 24 | $count = $paymentTotal->sum('payment_amount'); |
| 25 | 25 | |
| 26 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 26 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 27 | 27 | $drp_placeholder = 'Select daterange filter'; |
| 28 | 28 | } else { |
| 29 | 29 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get(); |
| 28 | 28 | $count = $invoicesTotal->count(); |
| 29 | 29 | |
| 30 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 30 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 31 | 31 | $drp_placeholder = 'Select daterange filter'; |
| 32 | 32 | } else { |
| 33 | 33 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 0)->get(); |
| 45 | 45 | $count = $invoicesTotal->count(); |
| 46 | 46 | |
| 47 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 47 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 48 | 48 | $drp_placeholder = 'Select daterange filter'; |
| 49 | 49 | } else { |
| 50 | 50 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 1)->get(); |
| 62 | 62 | $count = $invoicesTotal->count(); |
| 63 | 63 | |
| 64 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 64 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 65 | 65 | $drp_placeholder = 'Select daterange filter'; |
| 66 | 66 | } else { |
| 67 | 67 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 2)->get(); |
| 79 | 79 | $count = $invoicesTotal->count(); |
| 80 | 80 | |
| 81 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 81 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 82 | 82 | $drp_placeholder = 'Select daterange filter'; |
| 83 | 83 | } else { |
| 84 | 84 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $invoicesTotal = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->where('trn_invoice.status', 3)->get(); |
| 96 | 96 | $count = $invoicesTotal->count(); |
| 97 | 97 | |
| 98 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 98 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 99 | 99 | $drp_placeholder = 'Select daterange filter'; |
| 100 | 100 | } else { |
| 101 | 101 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -144,11 +144,11 @@ |
||
| 144 | 144 | $paymentStatus = \constPaymentStatus::Overpaid; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - if (empty($line->discount_percent) && ! empty($line->discount_amount)) { |
|
| 147 | + if (empty($line->discount_percent) && !empty($line->discount_amount)) { |
|
| 148 | 148 | $discountPercent = 'custom'; |
| 149 | 149 | } elseif (empty($line->discount_percent) && empty($line->discount_amount)) { |
| 150 | 150 | $discountPercent = '0'; |
| 151 | - } elseif (! empty($line->discount_percent)) { |
|
| 151 | + } elseif (!empty($line->discount_percent)) { |
|
| 152 | 152 | $discountPercent = str_replace('%', '', $line->discount_percent); |
| 153 | 153 | } |
| 154 | 154 | |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | $enquiriesTotal = Enquiry::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get(); |
| 24 | 24 | $count = $enquiriesTotal->count(); |
| 25 | 25 | |
| 26 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 26 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 27 | 27 | $drp_placeholder = 'Select daterange filter'; |
| 28 | 28 | } else { |
| 29 | 29 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | $subscriptionTotal = Subscription::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end, $request->plan_name)->search('"'.$request->input('search').'"')->get(); |
| 30 | 30 | $count = $subscriptionTotal->count(); |
| 31 | 31 | |
| 32 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 32 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 33 | 33 | $drp_placeholder = 'Select daterange filter'; |
| 34 | 34 | } else { |
| 35 | 35 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | $expiringTotal = Subscription::expiring($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get(); |
| 47 | 47 | $count = $expiringTotal->count(); |
| 48 | 48 | |
| 49 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 49 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 50 | 50 | $drp_placeholder = 'Select daterange filter'; |
| 51 | 51 | } else { |
| 52 | 52 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $allExpiredTotal = Subscription::expired($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get(); |
| 64 | 64 | $count = $allExpiredTotal->count(); |
| 65 | 65 | |
| 66 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 66 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 67 | 67 | $drp_placeholder = 'Select daterange filter'; |
| 68 | 68 | } else { |
| 69 | 69 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | $memberTotal = Member::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get(); |
| 37 | 37 | $count = $memberTotal->count(); |
| 38 | 38 | |
| 39 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 39 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 40 | 40 | $drp_placeholder = 'Select daterange filter'; |
| 41 | 41 | } else { |
| 42 | 42 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | $Totalmembers = Member::active($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get(); |
| 54 | 54 | $count = $Totalmembers->count(); |
| 55 | 55 | |
| 56 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 56 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 57 | 57 | $drp_placeholder = 'Select daterange filter'; |
| 58 | 58 | } else { |
| 59 | 59 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $Totalmembers = Member::inactive($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->get(); |
| 71 | 71 | $count = $Totalmembers->count(); |
| 72 | 72 | |
| 73 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
| 73 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
| 74 | 74 | $drp_placeholder = 'Select daterange filter'; |
| 75 | 75 | } else { |
| 76 | 76 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |