Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply fixes from StyleCI #97

Open
wants to merge 1 commit into
base: dependabot/composer/rap2hpoutre/laravel-log-viewer-0.13.0
Choose a base branch
from
Open

Apply fixes from StyleCI #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/ChequeDetail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace App;

use Sofa\Eloquence\Eloquence;
use Illuminate\Database\Eloquent\Model;
use Sofa\Eloquence\Eloquence;

class ChequeDetail extends Model
{
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/BirthdaySms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/ExpenseAlert.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/FollowupSms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/PendingInvoice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
64 changes: 32 additions & 32 deletions app/Console/Commands/RepeatExpense.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/SetExpired.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/Console/Commands/SmsEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/SmsExpired.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/SmsExpiring.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/Enquiry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace App;

use Sofa\Eloquence\Eloquence;
use Illuminate\Database\Eloquent\Model;
use Sofa\Eloquence\Eloquence;

class Enquiry extends Model
{
Expand Down
2 changes: 1 addition & 1 deletion app/Exceptions/Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion app/Expense.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
11 changes: 5 additions & 6 deletions app/ExpenseCategory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace App;

use Lubus\Constants\Status;
use Illuminate\Database\Eloquent\Model;

class ExpenseCategory extends Model
Expand All @@ -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)
Expand Down
47 changes: 23 additions & 24 deletions app/Http/Controllers/AclController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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');

Expand All @@ -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');

Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/Auth/AuthController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down