From 506c1b617230fe51475dadffcf1c442436937d39 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Thu, 6 Jul 2023 23:32:19 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/ChequeDetail.php | 16 +- app/Console/Commands/BirthdaySms.php | 2 +- app/Console/Commands/ExpenseAlert.php | 2 +- app/Console/Commands/FollowupSms.php | 2 +- app/Console/Commands/PendingInvoice.php | 2 +- app/Console/Commands/RepeatExpense.php | 64 +- app/Console/Commands/SetExpired.php | 2 +- app/Console/Commands/SmsEvent.php | 4 +- app/Console/Commands/SmsExpired.php | 2 +- app/Console/Commands/SmsExpiring.php | 2 +- app/Enquiry.php | 2 +- app/Exceptions/Handler.php | 2 +- app/Expense.php | 2 +- app/ExpenseCategory.php | 11 +- app/Http/Controllers/AclController.php | 47 +- app/Http/Controllers/Auth/AuthController.php | 4 +- app/Http/Controllers/Controller.php | 2 +- app/Http/Controllers/DashboardController.php | 12 +- .../Controllers/DataMigrationController.php | 5 +- app/Http/Controllers/EnquiriesController.php | 39 +- .../ExpenseCategoriesController.php | 2 +- app/Http/Controllers/ExpensesController.php | 12 +- app/Http/Controllers/FollowupsController.php | 2 +- app/Http/Controllers/InvoicesController.php | 31 +- app/Http/Controllers/MembersController.php | 100 +-- app/Http/Controllers/PaymentsController.php | 18 +- app/Http/Controllers/PlansController.php | 4 +- app/Http/Controllers/ServicesController.php | 2 +- app/Http/Controllers/SmsController.php | 55 +- .../Controllers/SubscriptionsController.php | 131 ++-- app/Http/Controllers/UsersController.php | 9 +- app/Invoice.php | 30 +- app/Lubus/ImageFilters/Image100x100.php | 2 +- app/Lubus/ImageFilters/Image400x400.php | 2 +- app/Lubus/ImageFilters/Image50x50.php | 2 +- app/Lubus/ImageFilters/Image64x64.php | 2 +- app/Lubus/ImageFilters/Image70x70.php | 2 +- app/Lubus/ImageFilters/Invoice.php | 2 +- app/Lubus/Utilities.php | 512 +++++++-------- app/Lubus/helpers.php | 1 - app/Luser.php | 10 +- app/Member.php | 2 +- app/PaymentDetail.php | 8 +- app/Permission.php | 8 +- app/PermissionRole.php | 4 +- app/Plan.php | 3 +- app/Providers/RouteServiceProvider.php | 2 +- app/Role.php | 6 +- app/RoleUser.php | 4 +- app/Service.php | 2 +- app/Setting.php | 6 +- app/SmsEvent.php | 18 +- app/SmsLog.php | 14 +- app/SmsTrigger.php | 2 +- app/Subscription.php | 2 +- app/User.php | 9 +- .../2018_03_07_055231_create_media_table.php | 2 +- ...3_07_055231_create_mst_enquiries_table.php | 2 +- ...1_create_mst_expenses_categories_table.php | 2 +- ..._03_07_055231_create_mst_members_table.php | 2 +- ...18_03_07_055231_create_mst_plans_table.php | 2 +- ...03_07_055231_create_mst_services_table.php | 2 +- ..._07_055231_create_mst_sms_events_table.php | 2 +- ...7_055231_create_mst_sms_triggers_table.php | 2 +- ...18_03_07_055231_create_mst_users_table.php | 2 +- ...07_055231_create_password_resets_table.php | 2 +- ...07_055231_create_permission_role_table.php | 2 +- ..._03_07_055231_create_permissions_table.php | 2 +- ...18_03_07_055231_create_role_user_table.php | 2 +- .../2018_03_07_055231_create_roles_table.php | 2 +- ..._07_055231_create_trn_access_log_table.php | 2 +- ...055231_create_trn_cheque_details_table.php | 2 +- ...231_create_trn_enquiry_followups_table.php | 2 +- ...03_07_055231_create_trn_expenses_table.php | 2 +- ...55231_create_trn_invoice_details_table.php | 2 +- ..._03_07_055231_create_trn_invoice_table.php | 2 +- ...55231_create_trn_payment_details_table.php | 2 +- ...03_07_055231_create_trn_settings_table.php | 2 +- ..._03_07_055231_create_trn_sms_log_table.php | 2 +- ..._055231_create_trn_subscriptions_table.php | 2 +- ...dd_foreign_keys_to_mst_enquiries_table.php | 2 +- ..._keys_to_mst_expenses_categories_table.php | 2 +- ..._add_foreign_keys_to_mst_members_table.php | 2 +- ...32_add_foreign_keys_to_mst_plans_table.php | 2 +- ...add_foreign_keys_to_mst_services_table.php | 2 +- ...d_foreign_keys_to_mst_sms_events_table.php | 2 +- ..._foreign_keys_to_permission_role_table.php | 2 +- ...32_add_foreign_keys_to_role_user_table.php | 2 +- ...d_foreign_keys_to_trn_access_log_table.php | 2 +- ...reign_keys_to_trn_cheque_details_table.php | 2 +- ...gn_keys_to_trn_enquiry_followups_table.php | 2 +- ...add_foreign_keys_to_trn_expenses_table.php | 2 +- ...eign_keys_to_trn_invoice_details_table.php | 2 +- ..._add_foreign_keys_to_trn_invoice_table.php | 2 +- ...eign_keys_to_trn_payment_details_table.php | 2 +- ...oreign_keys_to_trn_subscriptions_table.php | 2 +- database/seeds/DatabaseSeeder.php | 2 +- database/seeds/PermissionsRoleTableSeeder.php | 136 ++-- database/seeds/PermissionsTableSeeder.php | 600 +++++++++--------- tests/ExampleTest.php | 1 - 100 files changed, 1026 insertions(+), 1038 deletions(-) diff --git a/app/ChequeDetail.php b/app/ChequeDetail.php index 75f38e83..27fd6b4b 100644 --- a/app/ChequeDetail.php +++ b/app/ChequeDetail.php @@ -2,8 +2,8 @@ namespace App; -use Sofa\Eloquence\Eloquence; use Illuminate\Database\Eloquent\Model; +use Sofa\Eloquence\Eloquence; class ChequeDetail extends Model { @@ -14,13 +14,13 @@ class ChequeDetail extends Model protected $table = 'trn_cheque_details'; protected $fillable = [ - 'payment_id', - 'number', - 'date', - 'status', - 'created_by', - 'updated_by', - ]; + 'payment_id', + 'number', + 'date', + 'status', + 'created_by', + 'updated_by', + ]; protected $searchableColumns = [ 'number' => 20, diff --git a/app/Console/Commands/BirthdaySms.php b/app/Console/Commands/BirthdaySms.php index d3d3df1d..5a824f7c 100755 --- a/app/Console/Commands/BirthdaySms.php +++ b/app/Console/Commands/BirthdaySms.php @@ -3,8 +3,8 @@ namespace App\Console\Commands; use App\Member; -use Carbon\Carbon; use App\SmsTrigger; +use Carbon\Carbon; use Illuminate\Console\Command; class BirthdaySms extends Command diff --git a/app/Console/Commands/ExpenseAlert.php b/app/Console/Commands/ExpenseAlert.php index 15eba3be..8b00e795 100755 --- a/app/Console/Commands/ExpenseAlert.php +++ b/app/Console/Commands/ExpenseAlert.php @@ -3,8 +3,8 @@ namespace App\Console\Commands; use App\Expense; -use Carbon\Carbon; use App\SmsTrigger; +use Carbon\Carbon; use Illuminate\Console\Command; class ExpenseAlert extends Command diff --git a/app/Console/Commands/FollowupSms.php b/app/Console/Commands/FollowupSms.php index feb453e2..d28dea66 100755 --- a/app/Console/Commands/FollowupSms.php +++ b/app/Console/Commands/FollowupSms.php @@ -3,8 +3,8 @@ namespace App\Console\Commands; use App\Followup; -use Carbon\Carbon; use App\SmsTrigger; +use Carbon\Carbon; use Illuminate\Console\Command; class FollowupSms extends Command diff --git a/app/Console/Commands/PendingInvoice.php b/app/Console/Commands/PendingInvoice.php index a7d88747..60ffba94 100755 --- a/app/Console/Commands/PendingInvoice.php +++ b/app/Console/Commands/PendingInvoice.php @@ -2,9 +2,9 @@ namespace App\Console\Commands; -use DB; use App\Invoice; use App\SmsTrigger; +use DB; use Illuminate\Console\Command; class PendingInvoice extends Command diff --git a/app/Console/Commands/RepeatExpense.php b/app/Console/Commands/RepeatExpense.php index e9bc2642..0676a8a3 100755 --- a/app/Console/Commands/RepeatExpense.php +++ b/app/Console/Commands/RepeatExpense.php @@ -44,53 +44,53 @@ public function handle() foreach ($expenses as $expense) { if ($expense->repeat == 1) { $expenseData = ['name' => $expense->name, - 'category_id' => $expense->category_id, - 'due_date' => $expense->due_date->addDays(1), - 'repeat' => $expense->repeat, - 'note' => $expense->note, - 'amount' => $expense->amount, - 'paid' => 0, - 'created_by' => 1, - 'updated_by' => 1, ]; + 'category_id' => $expense->category_id, + 'due_date' => $expense->due_date->addDays(1), + 'repeat' => $expense->repeat, + 'note' => $expense->note, + 'amount' => $expense->amount, + 'paid' => 0, + 'created_by' => 1, + 'updated_by' => 1, ]; $newExpense = new Expense($expenseData); $newExpense->save(); } elseif ($expense->repeat == 2) { $expenseData = ['name' => $expense->name, - 'category_id' => $expense->category_id, - 'due_date' => $expense->due_date->addWeek(), - 'repeat' => $expense->repeat, - 'note' => $expense->note, - 'amount' => $expense->amount, - 'paid' => 0, - 'created_by' => 1, - 'updated_by' => 1, ]; + 'category_id' => $expense->category_id, + 'due_date' => $expense->due_date->addWeek(), + 'repeat' => $expense->repeat, + 'note' => $expense->note, + 'amount' => $expense->amount, + 'paid' => 0, + 'created_by' => 1, + 'updated_by' => 1, ]; $newExpense = new Expense($expenseData); $newExpense->save(); } elseif ($expense->repeat == 3) { $expenseData = ['name' => $expense->name, - 'category_id' => $expense->category_id, - 'due_date' => $expense->due_date->addMonth(), - 'repeat' => $expense->repeat, - 'note' => $expense->note, - 'amount' => $expense->amount, - 'paid' => 0, - 'created_by' => 1, - 'updated_by' => 1, ]; + 'category_id' => $expense->category_id, + 'due_date' => $expense->due_date->addMonth(), + 'repeat' => $expense->repeat, + 'note' => $expense->note, + 'amount' => $expense->amount, + 'paid' => 0, + 'created_by' => 1, + 'updated_by' => 1, ]; $newExpense = new Expense($expenseData); $newExpense->save(); } elseif ($expense->repeat == 4) { $expenseData = ['name' => $expense->name, - 'category_id' => $expense->category_id, - 'due_date' => $expense->due_date->addYear(), - 'repeat' => $expense->repeat, - 'note' => $expense->note, - 'amount' => $expense->amount, - 'paid' => 0, - 'created_by' => 1, - 'updated_by' => 1, ]; + 'category_id' => $expense->category_id, + 'due_date' => $expense->due_date->addYear(), + 'repeat' => $expense->repeat, + 'note' => $expense->note, + 'amount' => $expense->amount, + 'paid' => 0, + 'created_by' => 1, + 'updated_by' => 1, ]; $newExpense = new Expense($expenseData); $newExpense->save(); diff --git a/app/Console/Commands/SetExpired.php b/app/Console/Commands/SetExpired.php index 6fa8c6ca..9c38f47f 100755 --- a/app/Console/Commands/SetExpired.php +++ b/app/Console/Commands/SetExpired.php @@ -2,8 +2,8 @@ namespace App\Console\Commands; -use Carbon\Carbon; use App\Subscription; +use Carbon\Carbon; use Illuminate\Console\Command; class SetExpired extends Command diff --git a/app/Console/Commands/SmsEvent.php b/app/Console/Commands/SmsEvent.php index 4e3b64f8..fd38c23e 100644 --- a/app/Console/Commands/SmsEvent.php +++ b/app/Console/Commands/SmsEvent.php @@ -2,11 +2,11 @@ namespace App\Console\Commands; -use App\Member; use App\Enquiry; +use App\Member; +use App\SmsEvent as SmsEventModel; use Carbon\Carbon; use Illuminate\Console\Command; -use App\SmsEvent as SmsEventModel; class SmsEvent extends Command { diff --git a/app/Console/Commands/SmsExpired.php b/app/Console/Commands/SmsExpired.php index ec3a5670..1f566bf2 100755 --- a/app/Console/Commands/SmsExpired.php +++ b/app/Console/Commands/SmsExpired.php @@ -2,9 +2,9 @@ namespace App\Console\Commands; -use Carbon\Carbon; use App\SmsTrigger; use App\Subscription; +use Carbon\Carbon; use Illuminate\Console\Command; class SmsExpired extends Command diff --git a/app/Console/Commands/SmsExpiring.php b/app/Console/Commands/SmsExpiring.php index 59e70d32..9d1db467 100755 --- a/app/Console/Commands/SmsExpiring.php +++ b/app/Console/Commands/SmsExpiring.php @@ -2,9 +2,9 @@ namespace App\Console\Commands; -use Carbon\Carbon; use App\SmsTrigger; use App\Subscription; +use Carbon\Carbon; use Illuminate\Console\Command; class SmsExpiring extends Command diff --git a/app/Enquiry.php b/app/Enquiry.php index 4f9f921f..beee2adc 100755 --- a/app/Enquiry.php +++ b/app/Enquiry.php @@ -2,8 +2,8 @@ namespace App; -use Sofa\Eloquence\Eloquence; use Illuminate\Database\Eloquent\Model; +use Sofa\Eloquence\Eloquence; class Enquiry extends Model { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 68295fed..86f84237 100755 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -3,8 +3,8 @@ namespace App\Exceptions; use Exception; -use Symfony\Component\HttpKernel\Exception\HttpException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Symfony\Component\HttpKernel\Exception\HttpException; class Handler extends ExceptionHandler { diff --git a/app/Expense.php b/app/Expense.php index bac3a61a..1a59d933 100755 --- a/app/Expense.php +++ b/app/Expense.php @@ -3,8 +3,8 @@ namespace App; use Carbon\Carbon; -use Sofa\Eloquence\Eloquence; use Illuminate\Database\Eloquent\Model; +use Sofa\Eloquence\Eloquence; class Expense extends Model { diff --git a/app/ExpenseCategory.php b/app/ExpenseCategory.php index e6f3c916..ce8f9271 100755 --- a/app/ExpenseCategory.php +++ b/app/ExpenseCategory.php @@ -2,7 +2,6 @@ namespace App; -use Lubus\Constants\Status; use Illuminate\Database\Eloquent\Model; class ExpenseCategory extends Model @@ -12,11 +11,11 @@ class ExpenseCategory extends Model protected $table = 'mst_expenses_categories'; protected $fillable = [ - 'name', - 'total_expense', - 'status', - 'created_by', - 'updated_by', + 'name', + 'total_expense', + 'status', + 'created_by', + 'updated_by', ]; public function scopeExcludeArchive($query) diff --git a/app/Http/Controllers/AclController.php b/app/Http/Controllers/AclController.php index 7692cd80..a14f4a38 100755 --- a/app/Http/Controllers/AclController.php +++ b/app/Http/Controllers/AclController.php @@ -2,13 +2,12 @@ namespace App\Http\Controllers; -use DB; -use Auth; -use App\Role; -use App\User; -use App\RoleUser; use App\Permission; use App\PermissionRole; +use App\Role; +use App\RoleUser; +use App\User; +use DB; use Illuminate\Http\Request; class AclController extends Controller @@ -36,13 +35,13 @@ public function createUser() public function storeUser(Request $request) { $this->validate($request, ['name' => 'required|max:255', - 'email' => 'required|email|max:255|unique:mst_users', - 'password' => 'required|confirmed|min:6', ]); + 'email' => 'required|email|max:255|unique:mst_users', + 'password' => 'required|confirmed|min:6', ]); $user = User::create(['name' => $request['name'], - 'email' => $request['email'], - 'password' => bcrypt($request['password']), - 'status'=> $request->status, ]); + 'email' => $request['email'], + 'password' => bcrypt($request['password']), + 'status'=> $request->status, ]); $user->save(); @@ -142,9 +141,9 @@ public function storeRole(Request $request) DB::beginTransaction(); try { $role = Role::create(['name' => $request->name, - 'display_name' => $request->display_name, - 'description' => $request->description, - ]); + 'display_name' => $request->display_name, + 'description' => $request->description, + ]); if ($request->has('permissions')) { $role->attachPermissions($request->permissions); @@ -179,9 +178,9 @@ public function updateRole($id, Request $request) $role = Role::findOrFail($id); $role->update(['name' => $request->name, - 'display_name' => $request->display_name, - 'description' => $request->description, - ]); + 'display_name' => $request->display_name, + 'description' => $request->description, + ]); //Updating permissions for the role $DBpermissions = PermissionRole::where('role_id', $id)->select('permission_id')->lists('permission_id'); @@ -249,10 +248,10 @@ public function createPermission() public function storePermission(Request $request) { Permission::create(['name' => $request->name, - 'display_name' => $request->display_name, - 'description' => $request->description, - 'group_key' => $request->group_key, - ]); + 'display_name' => $request->display_name, + 'description' => $request->description, + 'group_key' => $request->group_key, + ]); flash()->success('Permission was successfully created'); @@ -271,10 +270,10 @@ public function updatePermission($id, Request $request) $permission = Permission::findOrFail($id); $permission->update(['name' => $request->name, - 'display_name' => $request->display_name, - 'description' => $request->description, - 'group_key' => $request->group_key, - ]); + 'display_name' => $request->display_name, + 'description' => $request->description, + 'group_key' => $request->group_key, + ]); flash()->success('Permission was successfully updated'); diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 0cc25a17..2297586f 100755 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -2,15 +2,15 @@ namespace App\Http\Controllers\Auth; -use Auth; -use App\User; use App\Http\Controllers\Controller; +use App\User; use Illuminate\Contracts\Auth\Guard; class AuthController extends Controller { /** * the model instance. + * * @var User */ protected $user; diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 9be752a1..a1f3d0bc 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -3,8 +3,8 @@ namespace App\Http\Controllers; use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Routing\Controller as BaseController; use Illuminate\Foundation\Validation\ValidatesRequests; +use Illuminate\Routing\Controller as BaseController; abstract class Controller extends BaseController { diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 3d83d059..3ff94a94 100755 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -2,17 +2,17 @@ namespace App\Http\Controllers; -use Auth; -use App\Member; -use App\SmsLog; -use JavaScript; +use App\ChequeDetail; use App\Enquiry; use App\Expense; -use App\Setting; use App\Followup; -use App\ChequeDetail; +use App\Member; +use App\Setting; +use App\SmsLog; use App\Subscription; +use Auth; use Illuminate\Http\Request; +use JavaScript; class DashboardController extends Controller { diff --git a/app/Http/Controllers/DataMigrationController.php b/app/Http/Controllers/DataMigrationController.php index 39d54280..1a5fbf72 100755 --- a/app/Http/Controllers/DataMigrationController.php +++ b/app/Http/Controllers/DataMigrationController.php @@ -2,11 +2,10 @@ namespace App\Http\Controllers; -use DB; -use Auth; -use App\Member; use App\Invoice; use App\InvoiceDetail; +use App\Member; +use DB; class DataMigrationController extends Controller { diff --git a/app/Http/Controllers/EnquiriesController.php b/app/Http/Controllers/EnquiriesController.php index 2ba221e2..6352d402 100755 --- a/app/Http/Controllers/EnquiriesController.php +++ b/app/Http/Controllers/EnquiriesController.php @@ -2,12 +2,11 @@ namespace App\Http\Controllers; -use DB; -use Auth; -use App\Member; use App\Enquiry; use App\Followup; use App\SmsTrigger; +use Auth; +use DB; use Illuminate\Http\Request; class EnquiriesController extends Controller @@ -51,7 +50,7 @@ public function store(Request $request) { // unique values check $this->validate($request, ['email' => 'unique:mst_enquiries,email', - 'contact' => 'unique:mst_enquiries,contact', ]); + 'contact' => 'unique:mst_enquiries,contact', ]); // Start Transaction DB::beginTransaction(); @@ -59,18 +58,18 @@ public function store(Request $request) try { // store enquiries details $enquiryData = ['name'=>$request->name, - 'DOB'=> $request->DOB, - 'gender'=> $request->gender, - 'contact'=> $request->contact, - 'email'=> $request->email, - 'address'=> $request->address, - 'status'=> \constEnquiryStatus::Lead, - 'pin_code'=> $request->pin_code, - 'occupation'=> $request->occupation, - 'start_by'=> $request->start_by, - 'interested_in'=> implode(',', $request->interested_in), - 'aim'=> $request->aim, - 'source'=> $request->source, ]; + 'DOB'=> $request->DOB, + 'gender'=> $request->gender, + 'contact'=> $request->contact, + 'email'=> $request->email, + 'address'=> $request->address, + 'status'=> \constEnquiryStatus::Lead, + 'pin_code'=> $request->pin_code, + 'occupation'=> $request->occupation, + 'start_by'=> $request->start_by, + 'interested_in'=> implode(',', $request->interested_in), + 'aim'=> $request->aim, + 'source'=> $request->source, ]; $enquiry = new Enquiry($enquiryData); $enquiry->createdBy()->associate(Auth::user()); @@ -79,10 +78,10 @@ public function store(Request $request) //Store the followup details $followupData = ['enquiry_id'=>$enquiry->id, - 'followup_by'=>$request->followup_by, - 'due_date'=>$request->due_date, - 'status'=> \constFollowUpStatus::Pending, - 'outcome'=>'', ]; + 'followup_by'=>$request->followup_by, + 'due_date'=>$request->due_date, + 'status'=> \constFollowUpStatus::Pending, + 'outcome'=>'', ]; $followup = new Followup($followupData); $followup->createdBy()->associate(Auth::user()); diff --git a/app/Http/Controllers/ExpenseCategoriesController.php b/app/Http/Controllers/ExpenseCategoriesController.php index bc83a6b1..b1f0f083 100755 --- a/app/Http/Controllers/ExpenseCategoriesController.php +++ b/app/Http/Controllers/ExpenseCategoriesController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Auth; use App\ExpenseCategory; +use Auth; use Illuminate\Http\Request; class ExpenseCategoriesController extends Controller diff --git a/app/Http/Controllers/ExpensesController.php b/app/Http/Controllers/ExpensesController.php index 916cdb2e..d4c310fd 100755 --- a/app/Http/Controllers/ExpensesController.php +++ b/app/Http/Controllers/ExpensesController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Auth; use App\Expense; +use Auth; use Carbon\Carbon; use Illuminate\Http\Request; @@ -66,11 +66,11 @@ public function create() public function store(Request $request) { $expenseData = ['name' => $request->name, - 'category_id' => $request->category_id, - 'due_date' => $request->due_date, - 'repeat' => $request->repeat, - 'note' => $request->note, - 'amount' => $request->amount, ]; + 'category_id' => $request->category_id, + 'due_date' => $request->due_date, + 'repeat' => $request->repeat, + 'note' => $request->note, + 'amount' => $request->amount, ]; $expense = new Expense($expenseData); $expense->createdBy()->associate(Auth::user()); diff --git a/app/Http/Controllers/FollowupsController.php b/app/Http/Controllers/FollowupsController.php index 35300987..b7faa8f0 100755 --- a/app/Http/Controllers/FollowupsController.php +++ b/app/Http/Controllers/FollowupsController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Auth; use App\Followup; +use Auth; use Illuminate\Http\Request; class FollowupsController extends Controller diff --git a/app/Http/Controllers/InvoicesController.php b/app/Http/Controllers/InvoicesController.php index 1d5955e4..fd7967e0 100755 --- a/app/Http/Controllers/InvoicesController.php +++ b/app/Http/Controllers/InvoicesController.php @@ -2,17 +2,16 @@ namespace App\Http\Controllers; -use DB; -use Auth; -use JavaScript; -use App\Invoice; -use App\Service; -use Carbon\Carbon; use App\ChequeDetail; -use App\Subscription; +use App\Invoice; use App\InvoiceDetail; use App\PaymentDetail; +use App\Service; +use App\Subscription; +use Carbon\Carbon; +use DB; use Illuminate\Http\Request; +use JavaScript; class InvoicesController extends Controller { @@ -174,15 +173,15 @@ public function applyDiscount($id, Request $request) $status = \Utilities::setInvoiceStatus($pending, $invoice_total); Invoice::where('id', $id)->update(['invoice_number'=> $request->invoice_number, - 'total'=> $invoice_total, - 'status'=> $status, - 'pending_amount'=> $pending, - 'discount_amount'=> $request->discount_amount, - 'discount_percent'=> $request->discount_percent, - 'discount_note'=> $request->discount_note, - 'tax'=> $request->taxes_amount, - 'additional_fees'=> $request->additional_fees, - 'note'=>' ', ]); + 'total'=> $invoice_total, + 'status'=> $status, + 'pending_amount'=> $pending, + 'discount_amount'=> $request->discount_amount, + 'discount_percent'=> $request->discount_percent, + 'discount_note'=> $request->discount_note, + 'tax'=> $request->taxes_amount, + 'additional_fees'=> $request->additional_fees, + 'note'=>' ', ]); DB::commit(); flash()->success('Discount was successfully updated'); diff --git a/app/Http/Controllers/MembersController.php b/app/Http/Controllers/MembersController.php index 5718de3e..10401623 100755 --- a/app/Http/Controllers/MembersController.php +++ b/app/Http/Controllers/MembersController.php @@ -2,21 +2,21 @@ namespace App\Http\Controllers; -use DB; -use Auth; -use App\Member; -use JavaScript; +use App\ChequeDetail; use App\Enquiry; use App\Invoice; +use App\InvoiceDetail; +use App\Member; +use App\PaymentDetail; use App\Service; use App\Setting; -use Carbon\Carbon; use App\SmsTrigger; -use App\ChequeDetail; use App\Subscription; -use App\InvoiceDetail; -use App\PaymentDetail; +use Auth; +use Carbon\Carbon; +use DB; use Illuminate\Http\Request; +use JavaScript; class MembersController extends Controller { @@ -129,8 +129,8 @@ public function store(Request $request) { // Member Model Validation $this->validate($request, ['email' => 'unique:mst_members,email', - 'contact' => 'unique:mst_members,contact', - 'member_code' => 'unique:mst_members,member_code', ]); + 'contact' => 'unique:mst_members,contact', + 'member_code' => 'unique:mst_members,member_code', ]); // Start Transaction DB::beginTransaction(); @@ -138,21 +138,21 @@ public function store(Request $request) try { // Store member's personal details $memberData = ['name'=>$request->name, - 'DOB'=> $request->DOB, - 'gender'=> $request->gender, - 'contact'=> $request->contact, - 'emergency_contact'=> $request->emergency_contact, - 'health_issues'=> $request->health_issues, - 'email'=> $request->email, - 'address'=> $request->address, - 'member_id'=> $request->member_id, - 'proof_name'=> $request->proof_name, - 'member_code'=> $request->member_code, - 'status'=> $request->status, - 'pin_code'=> $request->pin_code, - 'occupation'=> $request->occupation, - 'aim'=> $request->aim, - 'source'=> $request->source, ]; + 'DOB'=> $request->DOB, + 'gender'=> $request->gender, + 'contact'=> $request->contact, + 'emergency_contact'=> $request->emergency_contact, + 'health_issues'=> $request->health_issues, + 'email'=> $request->email, + 'address'=> $request->address, + 'member_id'=> $request->member_id, + 'proof_name'=> $request->proof_name, + 'member_code'=> $request->member_code, + 'status'=> $request->status, + 'pin_code'=> $request->pin_code, + 'occupation'=> $request->occupation, + 'aim'=> $request->aim, + 'source'=> $request->source, ]; $member = new Member($memberData); $member->createdBy()->associate(Auth::user()); @@ -187,16 +187,16 @@ public function store(Request $request) // Storing Invoice $invoiceData = ['invoice_number'=> $request->invoice_number, - 'member_id'=> $member->id, - 'total'=> $invoice_total, - 'status'=> $paymentStatus, - 'pending_amount'=> $pending, - 'discount_amount'=> $request->discount_amount, - 'discount_percent'=> $request->discount_percent, - 'discount_note'=> $request->discount_note, - 'tax'=> $request->taxes_amount, - 'additional_fees'=> $request->additional_fees, - 'note'=>' ', ]; + 'member_id'=> $member->id, + 'total'=> $invoice_total, + 'status'=> $paymentStatus, + 'pending_amount'=> $pending, + 'discount_amount'=> $request->discount_amount, + 'discount_percent'=> $request->discount_percent, + 'discount_note'=> $request->discount_note, + 'tax'=> $request->taxes_amount, + 'additional_fees'=> $request->additional_fees, + 'note'=>' ', ]; $invoice = new Invoice($invoiceData); $invoice->createdBy()->associate(Auth::user()); @@ -206,12 +206,12 @@ public function store(Request $request) // Storing subscription foreach ($request->plan as $plan) { $subscriptionData = ['member_id'=> $member->id, - 'invoice_id'=> $invoice->id, - 'plan_id'=> $plan['id'], - 'start_date'=> $plan['start_date'], - 'end_date'=> $plan['end_date'], - 'status'=> \constSubscription::onGoing, - 'is_renewal'=>'0', ]; + 'invoice_id'=> $invoice->id, + 'plan_id'=> $plan['id'], + 'start_date'=> $plan['start_date'], + 'end_date'=> $plan['end_date'], + 'status'=> \constSubscription::onGoing, + 'is_renewal'=>'0', ]; $subscription = new Subscription($subscriptionData); $subscription->createdBy()->associate(Auth::user()); @@ -220,8 +220,8 @@ public function store(Request $request) //Adding subscription to invoice(Invoice Details) $detailsData = ['invoice_id'=> $invoice->id, - 'plan_id'=> $plan['id'], - 'item_amount'=> $plan['price'], ]; + 'plan_id'=> $plan['id'], + 'item_amount'=> $plan['price'], ]; $invoiceDetails = new InvoiceDetail($detailsData); $invoiceDetails->createdBy()->associate(Auth::user()); @@ -231,9 +231,9 @@ public function store(Request $request) // Store Payment Details $paymentData = ['invoice_id'=> $invoice->id, - 'payment_amount'=> $request->payment_amount, - 'mode'=> $request->mode, - 'note'=> ' ', ]; + 'payment_amount'=> $request->payment_amount, + 'mode'=> $request->mode, + 'note'=> ' ', ]; $paymentDetails = new PaymentDetail($paymentData); $paymentDetails->createdBy()->associate(Auth::user()); @@ -243,9 +243,9 @@ public function store(Request $request) if ($request->mode == 0) { // Store Cheque Details $chequeData = ['payment_id'=> $paymentDetails->id, - 'number'=> $request->number, - 'date'=> $request->date, - 'status'=> \constChequeStatus::Recieved, ]; + 'number'=> $request->number, + 'date'=> $request->date, + 'status'=> \constChequeStatus::Recieved, ]; $cheque_details = new ChequeDetail($chequeData); $cheque_details->createdBy()->associate(Auth::user()); @@ -453,7 +453,7 @@ public function transfer($id, Request $request) } /** - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return string */ private function drpPlaceholder(Request $request) diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php index 352a6e6e..ba2553eb 100755 --- a/app/Http/Controllers/PaymentsController.php +++ b/app/Http/Controllers/PaymentsController.php @@ -2,12 +2,12 @@ namespace App\Http\Controllers; -use DB; -use Auth; -use App\Invoice; -use App\SmsTrigger; use App\ChequeDetail; +use App\Invoice; use App\PaymentDetail; +use App\SmsTrigger; +use Auth; +use DB; use Illuminate\Http\Request; class PaymentsController extends Controller @@ -52,9 +52,9 @@ public function store(Request $request) if ($request->mode == \constPaymentMode::Cheque) { // Store Cheque Details $chequeData = ['payment_id'=> $payment_detail->id, - 'number'=> $request->number, - 'date'=> $request->date, - 'status'=> \constChequeStatus::Recieved, ]; + 'number'=> $request->number, + 'date'=> $request->date, + 'status'=> \constChequeStatus::Recieved, ]; $cheque_details = new ChequeDetail($chequeData); $cheque_details->createdBy()->associate(Auth::user()); @@ -134,8 +134,8 @@ public function update($id, Request $request) // Store Cheque Details $cheque_detail = ChequeDetail::where('payment_id', $id)->first(); $cheque_detail->update(['number' => $request->number, - 'date' => $request->date, - ]); + 'date' => $request->date, + ]); $cheque_detail->updatedBy()->associate(Auth::user()); $cheque_detail->save(); } elseif ($request->mode == \constPaymentMode::Cash) { diff --git a/app/Http/Controllers/PlansController.php b/app/Http/Controllers/PlansController.php index cc70f471..7a33bcf2 100755 --- a/app/Http/Controllers/PlansController.php +++ b/app/Http/Controllers/PlansController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Auth; use App\Plan; +use Auth; use Illuminate\Http\Request; class PlansController extends Controller @@ -58,7 +58,7 @@ public function store(Request $request) { //Model Validation $this->validate($request, ['plan_code' => 'unique:mst_plans,plan_code', - 'plan_name' => 'unique:mst_plans,plan_name', ]); + 'plan_name' => 'unique:mst_plans,plan_name', ]); $plan = new Plan($request->all()); diff --git a/app/Http/Controllers/ServicesController.php b/app/Http/Controllers/ServicesController.php index de8664b7..6512d9f9 100755 --- a/app/Http/Controllers/ServicesController.php +++ b/app/Http/Controllers/ServicesController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use Auth; use App\Service; +use Auth; use Illuminate\Http\Request; class ServicesController extends Controller diff --git a/app/Http/Controllers/SmsController.php b/app/Http/Controllers/SmsController.php index 6ee3eb86..2cec6e1a 100755 --- a/app/Http/Controllers/SmsController.php +++ b/app/Http/Controllers/SmsController.php @@ -2,13 +2,12 @@ namespace App\Http\Controllers; -use Auth; -use App\Member; -use App\SmsLog; use App\Enquiry; +use App\Member; use App\SmsEvent; +use App\SmsLog; use App\SmsTrigger; -use Lubus\Constants\Status; +use Auth; use Illuminate\Http\Request; class SmsController extends Controller @@ -110,38 +109,38 @@ public function shoot(Request $request) foreach ($request->send as $sendnow) { switch ($sendnow) { case 0: - $recievers = Member::where('status', 1)->get(); - foreach ($recievers as $reciever) { - \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true); - } - break; + $recievers = Member::where('status', 1)->get(); + foreach ($recievers as $reciever) { + \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true); + } + break; - case 1: - $recievers = Member::where('status', 0)->get(); - foreach ($recievers as $reciever) { - \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true); - } - break; + case 1: + $recievers = Member::where('status', 0)->get(); + foreach ($recievers as $reciever) { + \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true); + } + break; - case 2: - $recievers = Enquiry::where('status', 1)->get(); - foreach ($recievers as $reciever) { - \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true); - } + case 2: + $recievers = Enquiry::where('status', 1)->get(); + foreach ($recievers as $reciever) { + \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true); + } - break; + break; - case 3: - $recievers = Enquiry::where('status', 0)->get(); - foreach ($recievers as $reciever) { - \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true); - } + case 3: + $recievers = Enquiry::where('status', 0)->get(); + foreach ($recievers as $reciever) { + \Utilities::Sms($sender_id, $reciever->contact, $sms_text, true); + } - break; + break; case 4: if ($request->customcontacts != '') { - $custom = explode(',', str_replace(' ', '', ($request->customcontacts))); + $custom = explode(',', str_replace(' ', '', $request->customcontacts)); foreach ($custom as $number) { if (starts_with($number, '0')) { $number = substr($number, 1); diff --git a/app/Http/Controllers/SubscriptionsController.php b/app/Http/Controllers/SubscriptionsController.php index dd225070..dd86b13b 100755 --- a/app/Http/Controllers/SubscriptionsController.php +++ b/app/Http/Controllers/SubscriptionsController.php @@ -2,19 +2,19 @@ namespace App\Http\Controllers; -use DB; -use Auth; -use JavaScript; +use App\ChequeDetail; use App\Invoice; +use App\InvoiceDetail; +use App\PaymentDetail; use App\Service; use App\Setting; -use Carbon\Carbon; use App\SmsTrigger; -use App\ChequeDetail; use App\Subscription; -use App\InvoiceDetail; -use App\PaymentDetail; +use Auth; +use Carbon\Carbon; +use DB; use Illuminate\Http\Request; +use JavaScript; class SubscriptionsController extends Controller { @@ -76,11 +76,11 @@ public function create() { // For Tax calculation JavaScript::put([ - 'taxes' => \Utilities::getSetting('taxes'), - 'gymieToday' => Carbon::today()->format('Y-m-d'), - 'servicesCount' => Service::count(), - ]); - list($invoice_number_mode, $invoiceCounter, $invoice_number) = $this->generateInvoiceNumber(); + 'taxes' => \Utilities::getSetting('taxes'), + 'gymieToday' => Carbon::today()->format('Y-m-d'), + 'servicesCount' => Service::count(), + ]); + [$invoice_number_mode, $invoiceCounter, $invoice_number] = $this->generateInvoiceNumber(); return view('subscriptions.create', compact('invoice_number', 'invoiceCounter', 'invoice_number_mode')); } @@ -109,16 +109,16 @@ public function store(Request $request) // Storing Invoice $invoiceData = ['invoice_number'=> $request->invoice_number, - 'member_id'=> $request->member_id, - 'total'=> $invoice_total, - 'status'=> $paymentStatus, - 'pending_amount'=> $pending, - 'discount_amount'=> $request->discount_amount, - 'discount_percent'=> $request->discount_percent, - 'discount_note'=> $request->discount_note, - 'tax'=> $request->taxes_amount, - 'additional_fees'=> $request->additional_fees, - 'note'=>' ', ]; + 'member_id'=> $request->member_id, + 'total'=> $invoice_total, + 'status'=> $paymentStatus, + 'pending_amount'=> $pending, + 'discount_amount'=> $request->discount_amount, + 'discount_percent'=> $request->discount_percent, + 'discount_note'=> $request->discount_note, + 'tax'=> $request->taxes_amount, + 'additional_fees'=> $request->additional_fees, + 'note'=>' ', ]; $invoice = new Invoice($invoiceData); $invoice->createdBy()->associate(Auth::user()); @@ -128,12 +128,12 @@ public function store(Request $request) // Storing subscription foreach ($request->plan as $plan) { $subscriptionData = ['member_id'=> $request->member_id, - 'invoice_id'=> $invoice->id, - 'plan_id'=> $plan['id'], - 'start_date'=> $plan['start_date'], - 'end_date'=> $plan['end_date'], - 'status'=> \constSubscription::onGoing, - 'is_renewal'=>'0', ]; + 'invoice_id'=> $invoice->id, + 'plan_id'=> $plan['id'], + 'start_date'=> $plan['start_date'], + 'end_date'=> $plan['end_date'], + 'status'=> \constSubscription::onGoing, + 'is_renewal'=>'0', ]; $subscription = new Subscription($subscriptionData); $subscription->createdBy()->associate(Auth::user()); @@ -142,8 +142,8 @@ public function store(Request $request) //Adding subscription to invoice(Invoice Details) $detailsData = ['invoice_id'=> $invoice->id, - 'plan_id'=> $plan['id'], - 'item_amount'=> $plan['price'], ]; + 'plan_id'=> $plan['id'], + 'item_amount'=> $plan['price'], ]; $invoice_details = new InvoiceDetail($detailsData); $invoice_details->createdBy()->associate(Auth::user()); @@ -153,9 +153,9 @@ public function store(Request $request) //Payment Details $paymentData = ['invoice_id'=> $invoice->id, - 'payment_amount'=> $request->payment_amount, - 'mode'=> $request->mode, - 'note'=> ' ', ]; + 'payment_amount'=> $request->payment_amount, + 'mode'=> $request->mode, + 'note'=> ' ', ]; $payment_details = new PaymentDetail($paymentData); $payment_details->createdBy()->associate(Auth::user()); @@ -165,9 +165,9 @@ public function store(Request $request) if ($request->mode == 0) { // Store Cheque Details $chequeData = ['payment_id'=> $payment_details->id, - 'number'=> $request->number, - 'date'=> $request->date, - 'status'=> \constChequeStatus::Recieved, ]; + 'number'=> $request->number, + 'date'=> $request->date, + 'status'=> \constChequeStatus::Recieved, ]; $cheque_details = new ChequeDetail($chequeData); $cheque_details->createdBy()->associate(Auth::user()); @@ -267,10 +267,10 @@ public function edit($id) $gymieDiff = $subscription->end_date->addDays($diff); JavaScript::put([ - 'gymieToday' => Carbon::today()->format('Y-m-d'), - 'gymieEndDate' => $subscription->end_date->format('Y-m-d'), - 'gymieDiff' => $gymieDiff->format('Y-m-d'), - ]); + 'gymieToday' => Carbon::today()->format('Y-m-d'), + 'gymieEndDate' => $subscription->end_date->format('Y-m-d'), + 'gymieDiff' => $gymieDiff->format('Y-m-d'), + ]); return view('subscriptions.edit', compact('subscription')); } @@ -289,9 +289,8 @@ public function update($id, Request $request) public function renew($id, Request $request) { - //Get Numbering mode - list($invoice_number_mode, $invoiceCounter, $invoice_number) = $this->generateInvoiceNumber(); + [$invoice_number_mode, $invoiceCounter, $invoice_number] = $this->generateInvoiceNumber(); $subscriptions = Subscription::where('invoice_id', $id)->get(); $member_id = $subscriptions->pluck('member_id')->first(); @@ -370,10 +369,10 @@ public function change($id) ->sum('trn_payment_details.payment_amount'); JavaScript::put([ - 'taxes' => \Utilities::getSetting('taxes'), - 'gymieToday' => Carbon::today()->format('Y-m-d'), - 'servicesCount' => Service::count(), - ]); + 'taxes' => \Utilities::getSetting('taxes'), + 'gymieToday' => Carbon::today()->format('Y-m-d'), + 'servicesCount' => Service::count(), + ]); return view('subscriptions.change', compact('subscription', 'already_paid')); } @@ -403,34 +402,34 @@ public function modify($id, Request $request) } Invoice::where('id', $subscription->invoice_id)->update(['invoice_number'=> $request->invoice_number, - 'total'=> $invoice_total, - 'status'=> $paymentStatus, - 'pending_amount'=> $pending, - 'discount_amount'=> $request->discount_amount, - 'discount_percent'=> $request->discount_percent, - 'discount_note'=> $request->discount_note, - 'tax'=> $request->taxes_amount, - 'additional_fees'=> $request->additional_fees, - 'note'=>' ', ]); + 'total'=> $invoice_total, + 'status'=> $paymentStatus, + 'pending_amount'=> $pending, + 'discount_amount'=> $request->discount_amount, + 'discount_percent'=> $request->discount_percent, + 'discount_note'=> $request->discount_note, + 'tax'=> $request->taxes_amount, + 'additional_fees'=> $request->additional_fees, + 'note'=>' ', ]); foreach ($request->plan as $plan) { $subscription->update(['plan_id'=> $plan['id'], - 'start_date'=> $plan['start_date'], - 'end_date'=> $plan['end_date'], - 'status'=> \constSubscription::onGoing, - 'is_renewal'=>'0', ]); + 'start_date'=> $plan['start_date'], + 'end_date'=> $plan['end_date'], + 'status'=> \constSubscription::onGoing, + 'is_renewal'=>'0', ]); //Adding subscription to invoice(Invoice Details) InvoiceDetail::where('invoice_id', $subscription->invoice_id)->update(['plan_id'=> $plan['id'], - 'item_amount'=> $plan['price'], ]); + 'item_amount'=> $plan['price'], ]); } //Payment Details $paymentData = ['invoice_id'=> $subscription->invoice_id, - 'payment_amount'=> $request->payment_amount, - 'mode'=> $request->mode, - 'note'=> ' ', ]; + 'payment_amount'=> $request->payment_amount, + 'mode'=> $request->mode, + 'note'=> ' ', ]; $payment_details = new PaymentDetail($paymentData); $payment_details->createdBy()->associate(Auth::user()); @@ -440,9 +439,9 @@ public function modify($id, Request $request) if ($request->mode == 0) { // Store Cheque Details $chequeData = ['payment_id'=> $payment_details->id, - 'number'=> $request->number, - 'date'=> $request->date, - 'status'=> \constChequeStatus::Recieved, ]; + 'number'=> $request->number, + 'date'=> $request->date, + 'status'=> \constChequeStatus::Recieved, ]; $cheque_details = new ChequeDetail($chequeData); $cheque_details->createdBy()->associate(Auth::user()); diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 64c88676..c09411de 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use App\User; -use Lubus\Constants\Status; use Illuminate\Http\Request; class UsersController extends Controller @@ -53,10 +52,10 @@ public function store(Request $request) $this->validate($request, ['email' => 'unique:mst_users,email']); $user = ['name'=>$request->name, - 'email'=> $request->email, - 'photo'=> '', - 'password' => bcrypt($request->password), - 'status'=> $request->status, ]; + 'email'=> $request->email, + 'photo'=> '', + 'password' => bcrypt($request->password), + 'status'=> $request->status, ]; $user = new User($user); $user->save(); diff --git a/app/Invoice.php b/app/Invoice.php index 675e7b05..7c357a66 100755 --- a/app/Invoice.php +++ b/app/Invoice.php @@ -2,28 +2,28 @@ namespace App; -use Sofa\Eloquence\Eloquence; use Illuminate\Database\Eloquent\Model; +use Sofa\Eloquence\Eloquence; class Invoice extends Model { protected $table = 'trn_invoice'; protected $fillable = [ - 'total', - 'pending_amount', - 'member_id', - 'note', - 'status', - 'tax', - 'additional_fees', - 'invoice_number', - 'discount_percent', - 'discount_amount', - 'discount_note', - 'created_by', - 'updated_by', - ]; + 'total', + 'pending_amount', + 'member_id', + 'note', + 'status', + 'tax', + 'additional_fees', + 'invoice_number', + 'discount_percent', + 'discount_amount', + 'discount_note', + 'created_by', + 'updated_by', + ]; protected $dates = ['created_at', 'updated_at']; diff --git a/app/Lubus/ImageFilters/Image100x100.php b/app/Lubus/ImageFilters/Image100x100.php index b2caa57a..a0ccdbb5 100755 --- a/app/Lubus/ImageFilters/Image100x100.php +++ b/app/Lubus/ImageFilters/Image100x100.php @@ -2,8 +2,8 @@ namespace App\Lubus\ImageFilters; -use Intervention\Image\Image; use Intervention\Image\Filters\FilterInterface; +use Intervention\Image\Image; class Image100x100 implements FilterInterface { diff --git a/app/Lubus/ImageFilters/Image400x400.php b/app/Lubus/ImageFilters/Image400x400.php index 8c8b41b1..eeccc243 100755 --- a/app/Lubus/ImageFilters/Image400x400.php +++ b/app/Lubus/ImageFilters/Image400x400.php @@ -2,8 +2,8 @@ namespace App\Lubus\ImageFilters; -use Intervention\Image\Image; use Intervention\Image\Filters\FilterInterface; +use Intervention\Image\Image; class Image400x400 implements FilterInterface { diff --git a/app/Lubus/ImageFilters/Image50x50.php b/app/Lubus/ImageFilters/Image50x50.php index 87cf9619..49553b05 100755 --- a/app/Lubus/ImageFilters/Image50x50.php +++ b/app/Lubus/ImageFilters/Image50x50.php @@ -2,8 +2,8 @@ namespace App\Lubus\ImageFilters; -use Intervention\Image\Image; use Intervention\Image\Filters\FilterInterface; +use Intervention\Image\Image; class Image50x50 implements FilterInterface { diff --git a/app/Lubus/ImageFilters/Image64x64.php b/app/Lubus/ImageFilters/Image64x64.php index 3419932b..ac881c1e 100755 --- a/app/Lubus/ImageFilters/Image64x64.php +++ b/app/Lubus/ImageFilters/Image64x64.php @@ -2,8 +2,8 @@ namespace App\Lubus\ImageFilters; -use Intervention\Image\Image; use Intervention\Image\Filters\FilterInterface; +use Intervention\Image\Image; class Image64x64 implements FilterInterface { diff --git a/app/Lubus/ImageFilters/Image70x70.php b/app/Lubus/ImageFilters/Image70x70.php index 1746ccbd..e40d4199 100755 --- a/app/Lubus/ImageFilters/Image70x70.php +++ b/app/Lubus/ImageFilters/Image70x70.php @@ -2,8 +2,8 @@ namespace App\Lubus\ImageFilters; -use Intervention\Image\Image; use Intervention\Image\Filters\FilterInterface; +use Intervention\Image\Image; class Image70x70 implements FilterInterface { diff --git a/app/Lubus/ImageFilters/Invoice.php b/app/Lubus/ImageFilters/Invoice.php index 1aaa6483..c1e30ab6 100755 --- a/app/Lubus/ImageFilters/Invoice.php +++ b/app/Lubus/ImageFilters/Invoice.php @@ -2,8 +2,8 @@ namespace App\Lubus\ImageFilters; -use Intervention\Image\Image; use Intervention\Image\Filters\FilterInterface; +use Intervention\Image\Image; class Invoice implements FilterInterface { diff --git a/app/Lubus/Utilities.php b/app/Lubus/Utilities.php index 944e12c4..4de557fb 100755 --- a/app/Lubus/Utilities.php +++ b/app/Lubus/Utilities.php @@ -1,11 +1,11 @@ = '12' && $time < '17') { + ($time >= '12' && $time < '17') { echo 'Good afternoon'; } elseif /* Should the time be between or equal to 1700 and 1900 hours, show good evening */ - ($time >= '17' && $time < '22') { + ($time >= '17' && $time < '22') { echo 'Good evening'; } elseif /* Finally, show good night if the time is greater than or equal to 2200 hours */ - ($time >= '22') { + ($time >= '22') { echo 'Good night'; } } @@ -606,11 +606,11 @@ public static function Sms($sender_id, $member_contact, $sms_text, $sms_status) if (str_contains($response, 'SMS-SHOOT-ID')) { //Log entry for SMS_log table $SmsLogData = ['shoot_id' => substr($response, strpos($response, 'SMS-SHOOT-ID/') + 13), - 'number' => $member_contact, - 'message' => $sms_text, - 'sender_id' => $sender_id, - 'send_time' => Carbon::now(), - 'status' => 'NA', ]; + 'number' => $member_contact, + 'message' => $sms_text, + 'sender_id' => $sender_id, + 'send_time' => Carbon::now(), + 'status' => 'NA', ]; $SmsLog = new SmsLog($SmsLogData); $SmsLog->save(); @@ -619,11 +619,11 @@ public static function Sms($sender_id, $member_contact, $sms_text, $sms_status) self::smsBalance(); } else { $SmsLogData = ['shoot_id' => '', - 'number' => $member_contact, - 'message' => $sms_text, - 'sender_id' => $sender_id, - 'send_time' => Carbon::now(), - 'status' => 'offline', ]; + 'number' => $member_contact, + 'message' => $sms_text, + 'sender_id' => $sender_id, + 'send_time' => Carbon::now(), + 'status' => 'offline', ]; $SmsLog = new SmsLog($SmsLogData); $SmsLog->save(); @@ -650,11 +650,11 @@ public static function retrySms($sender_id, $member_contact, $sms_text, $log) if (str_contains($response, 'SMS-SHOOT-ID')) { //Log entry for SMS_log table $log->update(['shoot_id' => substr($response, strpos($response, 'SMS-SHOOT-ID/') + 13), - 'number' => $member_contact, - 'message' => $sms_text, - 'sender_id' => $sender_id, - 'send_time' => Carbon::now(), - 'status' => 'NA', ]); + 'number' => $member_contact, + 'message' => $sms_text, + 'sender_id' => $sender_id, + 'send_time' => Carbon::now(), + 'status' => 'NA', ]); $log->save(); } //Update SMS balance diff --git a/app/Lubus/helpers.php b/app/Lubus/helpers.php index dd46140f..04b7a5f5 100755 --- a/app/Lubus/helpers.php +++ b/app/Lubus/helpers.php @@ -1,6 +1,5 @@ leftJoin('trn_invoice', 'trn_payment_details.invoice_id', '=', 'trn_invoice.id')->leftJoin('mst_members', 'trn_invoice.member_id', '=', 'mst_members.id')->select('trn_payment_details.id', 'trn_payment_details.created_at', 'trn_payment_details.payment_amount', 'trn_payment_details.mode', 'trn_invoice.invoice_number', 'mst_members.name as member_name', 'mst_members.member_code')->whereBetween('trn_payment_details.created_at', [ - $drp_start, - $drp_end, - ])->orderBy($sorting_field, $sorting_direction); + $drp_start, + $drp_end, + ])->orderBy($sorting_field, $sorting_direction); } public function invoice() diff --git a/app/Permission.php b/app/Permission.php index 610c70e3..b5905988 100755 --- a/app/Permission.php +++ b/app/Permission.php @@ -9,10 +9,10 @@ class Permission extends EntrustPermission protected $table = 'permissions'; protected $fillable = [ - 'name', - 'display_name', - 'description', - 'group_key', + 'name', + 'display_name', + 'description', + 'group_key', ]; public function roles() diff --git a/app/PermissionRole.php b/app/PermissionRole.php index 9bfce171..5eb0ceba 100755 --- a/app/PermissionRole.php +++ b/app/PermissionRole.php @@ -11,7 +11,7 @@ class PermissionRole extends Model public $timestamps = false; protected $fillable = [ - 'permission_id', - 'role_id', + 'permission_id', + 'role_id', ]; } diff --git a/app/Plan.php b/app/Plan.php index b4145df2..311fb6b4 100755 --- a/app/Plan.php +++ b/app/Plan.php @@ -2,9 +2,8 @@ namespace App; -use Lubus\Constants\Status; -use Sofa\Eloquence\Eloquence; use Illuminate\Database\Eloquent\Model; +use Sofa\Eloquence\Eloquence; class Plan extends Model { diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index d50b1c0f..747966ce 100755 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Routing\Router; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; +use Illuminate\Routing\Router; class RouteServiceProvider extends ServiceProvider { diff --git a/app/Role.php b/app/Role.php index cd0b89a4..bd87b5e2 100755 --- a/app/Role.php +++ b/app/Role.php @@ -10,9 +10,9 @@ class Role extends EntrustRole protected $table = 'roles'; protected $fillable = [ - 'name', - 'display_name', - 'description', + 'name', + 'display_name', + 'description', ]; public function users() diff --git a/app/RoleUser.php b/app/RoleUser.php index 76f0513c..75d21ff2 100644 --- a/app/RoleUser.php +++ b/app/RoleUser.php @@ -11,8 +11,8 @@ class RoleUser extends Model public $timestamps = false; protected $fillable = [ - 'user_id', - 'role_id', + 'user_id', + 'role_id', ]; public function user() diff --git a/app/Service.php b/app/Service.php index 20d0812d..2456aa17 100755 --- a/app/Service.php +++ b/app/Service.php @@ -2,8 +2,8 @@ namespace App; -use Sofa\Eloquence\Eloquence; use Illuminate\Database\Eloquent\Model; +use Sofa\Eloquence\Eloquence; class Service extends Model { diff --git a/app/Setting.php b/app/Setting.php index 70c5d71f..8644cfad 100755 --- a/app/Setting.php +++ b/app/Setting.php @@ -9,9 +9,9 @@ class Setting extends Model protected $table = 'trn_settings'; protected $fillable = [ - 'key', - 'value', - ]; + 'key', + 'value', + ]; const CREATED_AT = null; diff --git a/app/SmsEvent.php b/app/SmsEvent.php index 0e909820..3d0d6cb8 100644 --- a/app/SmsEvent.php +++ b/app/SmsEvent.php @@ -2,22 +2,22 @@ namespace App; -use Sofa\Eloquence\Eloquence; use Illuminate\Database\Eloquent\Model; +use Sofa\Eloquence\Eloquence; class SmsEvent extends Model { protected $table = 'mst_sms_events'; protected $fillable = [ - 'name', - 'date', - 'message', - 'description', - 'status', - 'send_to', - 'created_by', - 'updated_by', + 'name', + 'date', + 'message', + 'description', + 'status', + 'send_to', + 'created_by', + 'updated_by', ]; protected $dates = ['created_at', 'updated_at', 'date']; diff --git a/app/SmsLog.php b/app/SmsLog.php index 12e31dd8..4e900d75 100644 --- a/app/SmsLog.php +++ b/app/SmsLog.php @@ -3,20 +3,20 @@ namespace App; use Carbon\Carbon; -use Sofa\Eloquence\Eloquence; use Illuminate\Database\Eloquent\Model; +use Sofa\Eloquence\Eloquence; class SmsLog extends Model { protected $table = 'trn_sms_log'; protected $fillable = [ - 'shoot_id', - 'number', - 'message', - 'status', - 'sender_id', - 'send_time', + 'shoot_id', + 'number', + 'message', + 'status', + 'sender_id', + 'send_time', ]; public $timestamps = false; diff --git a/app/SmsTrigger.php b/app/SmsTrigger.php index 91e238be..b30910b9 100644 --- a/app/SmsTrigger.php +++ b/app/SmsTrigger.php @@ -2,8 +2,8 @@ namespace App; -use Sofa\Eloquence\Eloquence; use Illuminate\Database\Eloquent\Model; +use Sofa\Eloquence\Eloquence; class SmsTrigger extends Model { diff --git a/app/Subscription.php b/app/Subscription.php index 035b0334..f9cc24a9 100755 --- a/app/Subscription.php +++ b/app/Subscription.php @@ -3,8 +3,8 @@ namespace App; use Carbon\Carbon; -use Sofa\Eloquence\Eloquence; use Illuminate\Database\Eloquent\Model; +use Sofa\Eloquence\Eloquence; class Subscription extends Model { diff --git a/app/User.php b/app/User.php index 53f00c72..a5755764 100755 --- a/app/User.php +++ b/app/User.php @@ -3,15 +3,14 @@ namespace App; use Auth; -use Lubus\Constants\Status; use Illuminate\Auth\Authenticatable; -use Illuminate\Database\Eloquent\Model; -use Zizaco\Entrust\Traits\EntrustUserTrait; use Illuminate\Auth\Passwords\CanResetPassword; -use Spatie\MediaLibrary\HasMedia\HasMediaTrait; -use Spatie\MediaLibrary\HasMedia\Interfaces\HasMediaConversions; use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; +use Illuminate\Database\Eloquent\Model; +use Spatie\MediaLibrary\HasMedia\HasMediaTrait; +use Spatie\MediaLibrary\HasMedia\Interfaces\HasMediaConversions; +use Zizaco\Entrust\Traits\EntrustUserTrait; class User extends Model implements AuthenticatableContract, CanResetPasswordContract, HasMediaConversions { diff --git a/database/migrations/2018_03_07_055231_create_media_table.php b/database/migrations/2018_03_07_055231_create_media_table.php index c6521f5b..b074a0c5 100644 --- a/database/migrations/2018_03_07_055231_create_media_table.php +++ b/database/migrations/2018_03_07_055231_create_media_table.php @@ -1,7 +1,7 @@ '1', - 'role_id' => '1', - ], - [ - 'permission_id' => '1', - 'role_id' => '2', - ], - [ - 'permission_id' => '2', - 'role_id' => '3', - ], - [ - 'permission_id' => '3', - 'role_id' => '3', - ], - [ - 'permission_id' => '4', - 'role_id' => '3', - ], - [ - 'permission_id' => '5', - 'role_id' => '3', - ], - [ - 'permission_id' => '24', - 'role_id' => '3', - ], - [ - 'permission_id' => '25', - 'role_id' => '3', - ], - [ - 'permission_id' => '26', - 'role_id' => '3', - ], - [ - 'permission_id' => '27', - 'role_id' => '3', - ], - [ - 'permission_id' => '28', - 'role_id' => '3', - ], - [ - 'permission_id' => '36', - 'role_id' => '3', - ], - [ - 'permission_id' => '40', - 'role_id' => '3', - ], - [ - 'permission_id' => '45', - 'role_id' => '3', - ], - [ - 'permission_id' => '54', - 'role_id' => '3', - ], - [ - 'permission_id' => '55', - 'role_id' => '3', - ], - [ - 'permission_id' => '56', - 'role_id' => '3', - ], + [ + 'permission_id' => '1', + 'role_id' => '1', + ], + [ + 'permission_id' => '1', + 'role_id' => '2', + ], + [ + 'permission_id' => '2', + 'role_id' => '3', + ], + [ + 'permission_id' => '3', + 'role_id' => '3', + ], + [ + 'permission_id' => '4', + 'role_id' => '3', + ], + [ + 'permission_id' => '5', + 'role_id' => '3', + ], + [ + 'permission_id' => '24', + 'role_id' => '3', + ], + [ + 'permission_id' => '25', + 'role_id' => '3', + ], + [ + 'permission_id' => '26', + 'role_id' => '3', + ], + [ + 'permission_id' => '27', + 'role_id' => '3', + ], + [ + 'permission_id' => '28', + 'role_id' => '3', + ], + [ + 'permission_id' => '36', + 'role_id' => '3', + ], + [ + 'permission_id' => '40', + 'role_id' => '3', + ], + [ + 'permission_id' => '45', + 'role_id' => '3', + ], + [ + 'permission_id' => '54', + 'role_id' => '3', + ], + [ + 'permission_id' => '55', + 'role_id' => '3', + ], + [ + 'permission_id' => '56', + 'role_id' => '3', + ], ]; foreach ($permissions_role as $permission_role) { diff --git a/database/seeds/PermissionsTableSeeder.php b/database/seeds/PermissionsTableSeeder.php index 2db327c4..8c3f00ed 100644 --- a/database/seeds/PermissionsTableSeeder.php +++ b/database/seeds/PermissionsTableSeeder.php @@ -14,306 +14,306 @@ public function run() { // Create permissions $permissions = [ - [ - 'name' => 'manage-gymie', - 'display_name' => 'Manage Gymie', - 'group_key' => 'Global', - ], - [ - 'name' => 'view-dashboard-quick-stats', - 'display_name' => 'View quick stats on dashboard', - 'group_key' => 'Dashboard', - ], - [ - 'name' => 'view-dashboard-charts', - 'display_name' => 'View charts on dashboard', - 'group_key' => 'Dashboard', - ], - [ - 'name' => 'view-dashboard-members-tab', - 'display_name' => 'View members tab on dashboard', - 'group_key' => 'Dashboard', - ], - [ - 'name' => 'view-dashboard-enquiries-tab', - 'display_name' => 'View enquiries tab on dashboard', - 'group_key' => 'Dashboard', - ], - [ - 'name' => 'add-member', - 'display_name' => 'Add member', - 'group_key' => 'Members', - ], - [ - 'name' => 'view-member', - 'display_name' => 'View member details', - 'group_key' => 'Members', - ], - [ - 'name' => 'edit-member', - 'display_name' => 'Edit member details', - 'group_key' => 'Members', - ], - [ - 'name' => 'delete-member', - 'display_name' => 'Delete member', - 'group_key' => 'Members', - ], - [ - 'name' => 'add-plan', - 'display_name' => 'Add plans', - 'group_key' => 'Plans', - ], - [ - 'name' => 'view-plan', - 'display_name' => 'View plan details', - 'group_key' => 'Plans', - ], - [ - 'name' => 'edit-plan', - 'display_name' => 'Edit plan details', - 'group_key' => 'Plans', - ], - [ - 'name' => 'delete-plan', - 'display_name' => 'Delete plans', - 'group_key' => 'Plans', - ], - [ - 'name' => 'add-subscription', - 'display_name' => 'Add subscription', - 'group_key' => 'Subscriptions', - ], - [ - 'name' => 'edit-subscription', - 'display_name' => 'Edit subscription details', - 'group_key' => 'Subscriptions', - ], - [ - 'name' => 'renew-subscription', - 'display_name' => 'Renew subscription', - 'group_key' => 'Subscriptions', - ], - [ - 'name' => 'view-invoice', - 'display_name' => 'View invoice', - 'group_key' => 'Invoices', - ], - [ - 'name' => 'add-payment', - 'display_name' => 'Add payments', - 'group_key' => 'Payments', - ], - [ - 'name' => 'view-subscription', - 'display_name' => 'View subscription details', - 'group_key' => 'Subscriptions', - ], - [ - 'name' => 'view-payment', - 'display_name' => 'View payment details', - 'group_key' => 'Payments', - ], - [ - 'name' => 'edit-payment', - 'display_name' => 'Edit payment details', - 'group_key' => 'Payments', - ], - [ - 'name' => 'manage-members', - 'display_name' => 'Manage members', - 'group_key' => 'Members', - ], - [ - 'name' => 'manage-plans', - 'display_name' => 'Manage plans', - 'group_key' => 'Plans', - ], - [ - 'name' => 'manage-subscriptions', - 'display_name' => 'Manage subscriptions', - 'group_key' => 'Subscriptions', - ], - [ - 'name' => 'manage-invoices', - 'display_name' => 'Manage invoices', - 'group_key' => 'Invoices', - ], - [ - 'name' => 'manage-payments', - 'display_name' => 'Manage payments', - 'group_key' => 'Payments', - ], - [ - 'name' => 'manage-users', - 'display_name' => 'Manage users', - 'group_key' => 'Users', - ], - [ - 'name' => 'add-enquiry', - 'display_name' => 'Add enquiry', - 'group_key' => 'Enquiries', - ], - [ - 'name' => 'view-enquiry', - 'display_name' => 'View enquiry details', - 'group_key' => 'Enquiries', - ], - [ - 'name' => 'edit-enquiry', - 'display_name' => 'Edit enquiry details', - 'group_key' => 'Enquiries', - ], - [ - 'name' => 'add-enquiry-followup', - 'display_name' => 'Add enquiry followup', - 'group_key' => 'Enquiries', - ], - [ - 'name' => 'edit-enquiry-followup', - 'display_name' => 'Edit enquiry followup', - 'group_key' => 'Enquiries', - ], - [ - 'name' => 'transfer-enquiry', - 'display_name' => 'Transfer enquiry', - 'group_key' => 'Enquiries', - ], - [ - 'name' => 'manage-enquiries', - 'display_name' => 'Manage enquiries', - 'group_key' => 'Enquiries', - ], - [ - 'name' => 'add-expense', - 'display_name' => 'Add expense', - 'group_key' => 'Expenses', - ], - [ - 'name' => 'view-expense', - 'display_name' => 'View expense details', - 'group_key' => 'Expenses', - ], - [ - 'name' => 'edit-expense', - 'display_name' => 'Edit expense details', - 'group_key' => 'Expenses', - ], - [ - 'name' => 'manage-expenses', - 'display_name' => 'Manage expenses', - 'group_key' => 'Expenses', - ], - [ - 'name' => 'add-expenseCategory', - 'display_name' => 'Add expense category', - 'group_key' => 'Expense Categories', - ], - [ - 'name' => 'view-expenseCategory', - 'display_name' => 'View expense categories', - 'group_key' => 'Expense Categories', - ], - [ - 'name' => 'edit-expenseCategory', - 'display_name' => 'Edit expense category details', - 'group_key' => 'Expense Categories', - ], - [ - 'name' => 'delete-expenseCategory', - 'display_name' => 'Delete expense category', - 'group_key' => 'Expense Categories', - ], - [ - 'name' => 'manage-expenseCategories', - 'display_name' => 'Manage expense categories', - 'group_key' => 'Expense Categories', - ], - [ - 'name' => 'manage-settings', - 'display_name' => 'Manage settings', - 'group_key' => 'Global', - ], - [ - 'name' => 'cancel-subscription', - 'display_name' => 'Cancel subscription', - 'group_key' => 'Subscriptions', - ], - [ - 'name' => 'manage-services', - 'display_name' => 'Manage services', - 'group_key' => 'Services', - ], - [ - 'name' => 'add-service', - 'display_name' => 'Add services', - 'group_key' => 'Services', - ], - [ - 'name' => 'edit-service', - 'display_name' => 'Edit service details', - 'group_key' => 'Services', - ], - [ - 'name' => 'view-service', - 'display_name' => 'View service details', - 'group_key' => 'Services', - ], - [ - 'name' => 'manage-sms', - 'display_name' => 'Manage SMS', - 'group_key' => 'SMS', - ], - [ - 'name' => 'pagehead-stats', - 'display_name' => 'View pagehead counts', - 'group_key' => 'Global', - ], - [ - 'name' => 'view-dashboard-expense-tab', - 'display_name' => 'View expenses tab on dashboard', - 'group_key' => 'Dashboard', - ], - [ - 'name' => 'print-invoice', - 'display_name' => 'Print invoices', - 'group_key' => 'Invoices', - ], - [ - 'name' => 'delete-invoice', - 'display_name' => 'Delete invoices', - 'group_key' => 'Invoices', - ], - [ - 'name' => 'delete-subscription', - 'display_name' => 'Delete subscriptions', - 'group_key' => 'Subscriptions', - ], - [ - 'name' => 'delete-payment', - 'display_name' => 'Delete payment transactions', - 'group_key' => 'Payments', - ], - [ - 'name' => 'delete-expense', - 'display_name' => 'Delete expense details', - 'group_key' => 'Expenses', - ], - [ - 'name' => 'delete-service', - 'display_name' => 'Delete Service details', - 'group_key' => 'Services', - ], - [ - 'name' => 'add-discount', - 'display_name' => 'Add discount on a invoice', - 'group_key' => 'Invoices', - ], - [ - 'name' => 'change-subscription', - 'display_name' => 'Upgrade or downgrade a subscription', - 'group_key' => 'Subscriptions', - ], + [ + 'name' => 'manage-gymie', + 'display_name' => 'Manage Gymie', + 'group_key' => 'Global', + ], + [ + 'name' => 'view-dashboard-quick-stats', + 'display_name' => 'View quick stats on dashboard', + 'group_key' => 'Dashboard', + ], + [ + 'name' => 'view-dashboard-charts', + 'display_name' => 'View charts on dashboard', + 'group_key' => 'Dashboard', + ], + [ + 'name' => 'view-dashboard-members-tab', + 'display_name' => 'View members tab on dashboard', + 'group_key' => 'Dashboard', + ], + [ + 'name' => 'view-dashboard-enquiries-tab', + 'display_name' => 'View enquiries tab on dashboard', + 'group_key' => 'Dashboard', + ], + [ + 'name' => 'add-member', + 'display_name' => 'Add member', + 'group_key' => 'Members', + ], + [ + 'name' => 'view-member', + 'display_name' => 'View member details', + 'group_key' => 'Members', + ], + [ + 'name' => 'edit-member', + 'display_name' => 'Edit member details', + 'group_key' => 'Members', + ], + [ + 'name' => 'delete-member', + 'display_name' => 'Delete member', + 'group_key' => 'Members', + ], + [ + 'name' => 'add-plan', + 'display_name' => 'Add plans', + 'group_key' => 'Plans', + ], + [ + 'name' => 'view-plan', + 'display_name' => 'View plan details', + 'group_key' => 'Plans', + ], + [ + 'name' => 'edit-plan', + 'display_name' => 'Edit plan details', + 'group_key' => 'Plans', + ], + [ + 'name' => 'delete-plan', + 'display_name' => 'Delete plans', + 'group_key' => 'Plans', + ], + [ + 'name' => 'add-subscription', + 'display_name' => 'Add subscription', + 'group_key' => 'Subscriptions', + ], + [ + 'name' => 'edit-subscription', + 'display_name' => 'Edit subscription details', + 'group_key' => 'Subscriptions', + ], + [ + 'name' => 'renew-subscription', + 'display_name' => 'Renew subscription', + 'group_key' => 'Subscriptions', + ], + [ + 'name' => 'view-invoice', + 'display_name' => 'View invoice', + 'group_key' => 'Invoices', + ], + [ + 'name' => 'add-payment', + 'display_name' => 'Add payments', + 'group_key' => 'Payments', + ], + [ + 'name' => 'view-subscription', + 'display_name' => 'View subscription details', + 'group_key' => 'Subscriptions', + ], + [ + 'name' => 'view-payment', + 'display_name' => 'View payment details', + 'group_key' => 'Payments', + ], + [ + 'name' => 'edit-payment', + 'display_name' => 'Edit payment details', + 'group_key' => 'Payments', + ], + [ + 'name' => 'manage-members', + 'display_name' => 'Manage members', + 'group_key' => 'Members', + ], + [ + 'name' => 'manage-plans', + 'display_name' => 'Manage plans', + 'group_key' => 'Plans', + ], + [ + 'name' => 'manage-subscriptions', + 'display_name' => 'Manage subscriptions', + 'group_key' => 'Subscriptions', + ], + [ + 'name' => 'manage-invoices', + 'display_name' => 'Manage invoices', + 'group_key' => 'Invoices', + ], + [ + 'name' => 'manage-payments', + 'display_name' => 'Manage payments', + 'group_key' => 'Payments', + ], + [ + 'name' => 'manage-users', + 'display_name' => 'Manage users', + 'group_key' => 'Users', + ], + [ + 'name' => 'add-enquiry', + 'display_name' => 'Add enquiry', + 'group_key' => 'Enquiries', + ], + [ + 'name' => 'view-enquiry', + 'display_name' => 'View enquiry details', + 'group_key' => 'Enquiries', + ], + [ + 'name' => 'edit-enquiry', + 'display_name' => 'Edit enquiry details', + 'group_key' => 'Enquiries', + ], + [ + 'name' => 'add-enquiry-followup', + 'display_name' => 'Add enquiry followup', + 'group_key' => 'Enquiries', + ], + [ + 'name' => 'edit-enquiry-followup', + 'display_name' => 'Edit enquiry followup', + 'group_key' => 'Enquiries', + ], + [ + 'name' => 'transfer-enquiry', + 'display_name' => 'Transfer enquiry', + 'group_key' => 'Enquiries', + ], + [ + 'name' => 'manage-enquiries', + 'display_name' => 'Manage enquiries', + 'group_key' => 'Enquiries', + ], + [ + 'name' => 'add-expense', + 'display_name' => 'Add expense', + 'group_key' => 'Expenses', + ], + [ + 'name' => 'view-expense', + 'display_name' => 'View expense details', + 'group_key' => 'Expenses', + ], + [ + 'name' => 'edit-expense', + 'display_name' => 'Edit expense details', + 'group_key' => 'Expenses', + ], + [ + 'name' => 'manage-expenses', + 'display_name' => 'Manage expenses', + 'group_key' => 'Expenses', + ], + [ + 'name' => 'add-expenseCategory', + 'display_name' => 'Add expense category', + 'group_key' => 'Expense Categories', + ], + [ + 'name' => 'view-expenseCategory', + 'display_name' => 'View expense categories', + 'group_key' => 'Expense Categories', + ], + [ + 'name' => 'edit-expenseCategory', + 'display_name' => 'Edit expense category details', + 'group_key' => 'Expense Categories', + ], + [ + 'name' => 'delete-expenseCategory', + 'display_name' => 'Delete expense category', + 'group_key' => 'Expense Categories', + ], + [ + 'name' => 'manage-expenseCategories', + 'display_name' => 'Manage expense categories', + 'group_key' => 'Expense Categories', + ], + [ + 'name' => 'manage-settings', + 'display_name' => 'Manage settings', + 'group_key' => 'Global', + ], + [ + 'name' => 'cancel-subscription', + 'display_name' => 'Cancel subscription', + 'group_key' => 'Subscriptions', + ], + [ + 'name' => 'manage-services', + 'display_name' => 'Manage services', + 'group_key' => 'Services', + ], + [ + 'name' => 'add-service', + 'display_name' => 'Add services', + 'group_key' => 'Services', + ], + [ + 'name' => 'edit-service', + 'display_name' => 'Edit service details', + 'group_key' => 'Services', + ], + [ + 'name' => 'view-service', + 'display_name' => 'View service details', + 'group_key' => 'Services', + ], + [ + 'name' => 'manage-sms', + 'display_name' => 'Manage SMS', + 'group_key' => 'SMS', + ], + [ + 'name' => 'pagehead-stats', + 'display_name' => 'View pagehead counts', + 'group_key' => 'Global', + ], + [ + 'name' => 'view-dashboard-expense-tab', + 'display_name' => 'View expenses tab on dashboard', + 'group_key' => 'Dashboard', + ], + [ + 'name' => 'print-invoice', + 'display_name' => 'Print invoices', + 'group_key' => 'Invoices', + ], + [ + 'name' => 'delete-invoice', + 'display_name' => 'Delete invoices', + 'group_key' => 'Invoices', + ], + [ + 'name' => 'delete-subscription', + 'display_name' => 'Delete subscriptions', + 'group_key' => 'Subscriptions', + ], + [ + 'name' => 'delete-payment', + 'display_name' => 'Delete payment transactions', + 'group_key' => 'Payments', + ], + [ + 'name' => 'delete-expense', + 'display_name' => 'Delete expense details', + 'group_key' => 'Expenses', + ], + [ + 'name' => 'delete-service', + 'display_name' => 'Delete Service details', + 'group_key' => 'Services', + ], + [ + 'name' => 'add-discount', + 'display_name' => 'Add discount on a invoice', + 'group_key' => 'Invoices', + ], + [ + 'name' => 'change-subscription', + 'display_name' => 'Upgrade or downgrade a subscription', + 'group_key' => 'Subscriptions', + ], ]; foreach ($permissions as $permission) { diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php index 2c3a83c8..587cd5ea 100755 --- a/tests/ExampleTest.php +++ b/tests/ExampleTest.php @@ -1,6 +1,5 @@