@@ -23,7 +23,7 @@ |
||
23 | 23 | $paymentTotal = PaymentDetail::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; |
@@ -9,7 +9,7 @@ |
||
9 | 9 | { |
10 | 10 | //Eloquence Search mapping |
11 | 11 | use Eloquence; |
12 | - use createdByUser,updatedByUser; |
|
12 | + use createdByUser, updatedByUser; |
|
13 | 13 | |
14 | 14 | protected $table = 'trn_payment_details'; |
15 | 15 |
@@ -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 | //SmsController |
85 | -Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function () { |
|
85 | +Route::group(['prefix' => 'sms', 'middleware' => ['auth']], function() { |
|
86 | 86 | Route::get('triggers', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggersIndex']); |
87 | 87 | Route::post('triggers/update', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@triggerUpdate']); |
88 | 88 | Route::get('events', ['middleware' => ['permission:manage-gymie|manage-sms'], 'uses' => 'SmsController@eventsIndex']); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | }); |
99 | 99 | |
100 | 100 | //enquiries |
101 | -Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function () { |
|
101 | +Route::group(['prefix' => 'enquiries', 'middleware' => ['auth']], function() { |
|
102 | 102 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']); |
103 | 103 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-enquiries|view-enquiry'], 'uses' => 'EnquiriesController@index']); |
104 | 104 | Route::get('create', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry'], 'uses' => 'EnquiriesController@create']); |
@@ -111,13 +111,13 @@ discard block |
||
111 | 111 | }); |
112 | 112 | |
113 | 113 | //followups |
114 | -Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function () { |
|
114 | +Route::group(['prefix' => 'enquiry', 'middleware' => ['auth']], function() { |
|
115 | 115 | Route::post('followups', ['middleware' => ['permission:manage-gymie|manage-enquiries|add-enquiry-followup'], 'uses' => 'FollowupsController@store']); |
116 | 116 | Route::post('followups/{id}/update', ['middleware' => ['permission:manage-gymie|manage-enquiries|edit-enquiry-followup'], 'uses' => 'FollowupsController@update']); |
117 | 117 | }); |
118 | 118 | |
119 | 119 | //plans |
120 | -Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function () { |
|
120 | +Route::group(['prefix' => 'plans', 'middleware' => ['auth']], function() { |
|
121 | 121 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']); |
122 | 122 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@index']); |
123 | 123 | Route::get('show', ['middleware' => ['permission:manage-gymie|manage-plans|view-plan'], 'uses' => 'PlansController@show']); |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | }); |
137 | 137 | |
138 | 138 | //subsciptions |
139 | -Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function () { |
|
139 | +Route::group(['prefix' => 'subscriptions', 'middleware' => ['auth']], function() { |
|
140 | 140 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']); |
141 | 141 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@index']); |
142 | 142 | Route::get('expiring', ['middleware' => ['permission:manage-gymie|manage-subscriptions|view-subscription'], 'uses' => 'SubscriptionsController@expiring']); |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | }); |
155 | 155 | |
156 | 156 | //invoices |
157 | -Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function () { |
|
157 | +Route::group(['prefix' => 'invoices', 'middleware' => ['auth']], function() { |
|
158 | 158 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']); |
159 | 159 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@index']); |
160 | 160 | Route::get('paid', ['middleware' => ['permission:manage-gymie|manage-invoices|view-invoice'], 'uses' => 'InvoicesController@paid']); |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | }); |
170 | 170 | |
171 | 171 | //payments |
172 | -Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function () { |
|
172 | +Route::group(['prefix' => 'payments', 'middleware' => ['auth']], function() { |
|
173 | 173 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']); |
174 | 174 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@index']); |
175 | 175 | Route::get('show', ['middleware' => ['permission:manage-gymie|manage-payments|view-payment'], 'uses' => 'PaymentsController@show']); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | }); |
186 | 186 | |
187 | 187 | //expenses |
188 | -Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function () { |
|
188 | +Route::group(['prefix' => 'expenses', 'middleware' => ['auth']], function() { |
|
189 | 189 | Route::get('/', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']); |
190 | 190 | Route::get('all', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@index']); |
191 | 191 | Route::get('show', ['middleware' => ['permission:manage-gymie|manage-expenses|view-expense'], 'uses' => 'ExpensesController@show']); |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | }); |
206 | 206 | |
207 | 207 | //settings |
208 | -Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function () { |
|
208 | +Route::group(['prefix' => 'settings', 'middleware' => ['permission:manage-gymie|manage-settings', 'auth']], function() { |
|
209 | 209 | Route::get('/', 'SettingsController@show'); |
210 | 210 | Route::get('edit', 'SettingsController@edit'); |
211 | 211 | Route::post('save', 'SettingsController@save'); |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | |
214 | 214 | //User Module with roles & permissions |
215 | 215 | //User |
216 | -Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () { |
|
216 | +Route::group(['prefix' => 'user', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() { |
|
217 | 217 | Route::get('/', 'AclController@userIndex'); |
218 | 218 | Route::get('create', 'AclController@createUser'); |
219 | 219 | Route::post('/', 'AclController@storeUser'); |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | }); |
224 | 224 | |
225 | 225 | //Roles |
226 | -Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function () { |
|
226 | +Route::group(['prefix' => 'user/role', 'middleware' => ['permission:manage-gymie|manage-users', 'auth']], function() { |
|
227 | 227 | Route::get('/', 'AclController@roleIndex'); |
228 | 228 | Route::get('create', 'AclController@createRole'); |
229 | 229 | Route::post('/', 'AclController@storeRole'); |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | }); |
234 | 234 | |
235 | 235 | //Permissions |
236 | -Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function () { |
|
236 | +Route::group(['prefix' => 'user/permission', 'middleware' => ['auth', 'role:Gymie']], function() { |
|
237 | 237 | Route::get('/', 'AclController@permissionIndex'); |
238 | 238 | Route::get('create', 'AclController@createPermission'); |
239 | 239 | Route::post('/', 'AclController@storePermission'); |
@@ -22,7 +22,7 @@ |
||
22 | 22 | $enquiries = Enquiry::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10); |
23 | 23 | $count = $enquiries->total(); |
24 | 24 | |
25 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
25 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
26 | 26 | $drp_placeholder = 'Select daterange filter'; |
27 | 27 | } else { |
28 | 28 | $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; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $expirings = Subscription::expiring($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10); |
46 | 46 | $count = $expirings->total(); |
47 | 47 | |
48 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
48 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
49 | 49 | $drp_placeholder = 'Select daterange filter'; |
50 | 50 | } else { |
51 | 51 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $allExpired = Subscription::expired($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10); |
62 | 62 | $count = $allExpired->total(); |
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; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | $invoices = Invoice::indexQuery($request->sort_field, $request->sort_direction, $request->drp_start, $request->drp_end)->search('"'.$request->input('search').'"')->paginate(10); |
27 | 27 | $count = $invoices->total(); |
28 | 28 | |
29 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
29 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
30 | 30 | $drp_placeholder = 'Select daterange filter'; |
31 | 31 | } else { |
32 | 32 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $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(); |
44 | 44 | $count = $invoicesTotal->count(); |
45 | 45 | |
46 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
46 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
47 | 47 | $drp_placeholder = 'Select daterange filter'; |
48 | 48 | } else { |
49 | 49 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $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(); |
61 | 61 | $count = $invoicesTotal->count(); |
62 | 62 | |
63 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
63 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
64 | 64 | $drp_placeholder = 'Select daterange filter'; |
65 | 65 | } else { |
66 | 66 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $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(); |
78 | 78 | $count = $invoicesTotal->count(); |
79 | 79 | |
80 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
80 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
81 | 81 | $drp_placeholder = 'Select daterange filter'; |
82 | 82 | } else { |
83 | 83 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $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(); |
95 | 95 | $count = $invoicesTotal->count(); |
96 | 96 | |
97 | - if (! $request->has('drp_start') or ! $request->has('drp_end')) { |
|
97 | + if (!$request->has('drp_start') or !$request->has('drp_end')) { |
|
98 | 98 | $drp_placeholder = 'Select daterange filter'; |
99 | 99 | } else { |
100 | 100 | $drp_placeholder = $request->drp_start.' - '.$request->drp_end; |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | public function scopeDashboardExpiring($query) |
41 | 41 | { |
42 | 42 | return $query |
43 | - ->with(['members' => function ($query) { |
|
43 | + ->with(['members' => function($query) { |
|
44 | 44 | $query->where('status', '=', \constStatus::Active); |
45 | 45 | }]) |
46 | 46 | ->where('end_date', '<', Carbon::today()->addDays(7)) |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | public function scopeDashboardExpired($query) |
51 | 51 | { |
52 | 52 | return $query |
53 | - ->with(['members' => function ($query) { |
|
53 | + ->with(['members' => function($query) { |
|
54 | 54 | $query->where('status', '=', \constStatus::Active); |
55 | 55 | }]) |
56 | 56 | ->where('status', '=', \constSubscription::Expired); |