Browse Source

Apply fixes from StyleCI

pull/3/head
Nafies Luthfi 8 years ago
committed by StyleCI Bot
parent
commit
9757124dd5
  1. 3
      app/Console/Kernel.php
  2. 4
      app/Entities/BaseRepository.php
  3. 10
      app/Entities/EloquentRepository.php
  4. 1
      app/Entities/Invoices/Invoice.php
  5. 8
      app/Entities/Options/Option.php
  6. 1
      app/Entities/Payments/Payment.php
  7. 2
      app/Entities/Payments/PaymentPresenter.php
  8. 2
      app/Entities/Payments/PaymentsRepository.php
  9. 4
      app/Entities/Projects/Job.php
  10. 1
      app/Entities/Projects/JobPresenter.php
  11. 5
      app/Entities/Projects/JobsRepository.php
  12. 3
      app/Entities/Projects/Project.php
  13. 1
      app/Entities/Projects/ProjectPresenter.php
  14. 7
      app/Entities/Projects/ProjectsRepository.php
  15. 2
      app/Entities/Projects/Status.php
  16. 3
      app/Entities/Projects/Task.php
  17. 3
      app/Entities/Projects/TasksRepository.php
  18. 4
      app/Entities/ReferenceAbstract.php
  19. 18
      app/Entities/Reports/ReportsRepository.php
  20. 4
      app/Entities/Subscriptions/SubscriptionPresenter.php
  21. 3
      app/Entities/Subscriptions/SubscriptionsRepository.php
  22. 5
      app/Entities/Users/Event.php
  23. 2
      app/Entities/Users/Role.php
  24. 16
      app/Entities/Users/User.php
  25. 17
      app/Exceptions/Handler.php
  26. 5
      app/Exceptions/ReferenceKeyNotFoundException.php
  27. 110
      app/Http/Controllers/Api/EventsController.php
  28. 4
      app/Http/Controllers/Api/ProjectsController.php
  29. 6
      app/Http/Controllers/Auth/ChangePasswordController.php
  30. 6
      app/Http/Controllers/Auth/LoginController.php
  31. 7
      app/Http/Controllers/Auth/ResetPasswordController.php
  32. 3
      app/Http/Controllers/BackupsController.php
  33. 4
      app/Http/Controllers/Controller.php
  34. 5
      app/Http/Controllers/InstallationController.php
  35. 1
      app/Http/Controllers/Invoices/DraftsController.php
  36. 1
      app/Http/Controllers/Invoices/InvoicesController.php
  37. 3
      app/Http/Controllers/JobsController.php
  38. 1
      app/Http/Controllers/PagesController.php
  39. 19
      app/Http/Controllers/Partners/CustomersController.php
  40. 17
      app/Http/Controllers/Partners/VendorsController.php
  41. 7
      app/Http/Controllers/PaymentsController.php
  42. 4
      app/Http/Controllers/Projects/FeesController.php
  43. 2
      app/Http/Controllers/Projects/FilesController.php
  44. 1
      app/Http/Controllers/Projects/JobsController.php
  45. 15
      app/Http/Controllers/Projects/ProjectsController.php
  46. 4
      app/Http/Controllers/Projects/TasksController.php
  47. 5
      app/Http/Controllers/References/OptionsController.php
  48. 7
      app/Http/Controllers/ReportsController.php
  49. 7
      app/Http/Controllers/SubscriptionsController.php
  50. 3
      app/Http/Controllers/Users/AgencyController.php
  51. 3
      app/Http/Controllers/Users/ProfileController.php
  52. 2
      app/Http/Controllers/Users/UsersController.php
  53. 7
      app/Http/Middleware/Authenticate.php
  54. 5
      app/Http/Middleware/GlobalViewVariables.php
  55. 7
      app/Http/Middleware/RedirectIfAuthenticated.php
  56. 6
      app/Http/Middleware/Role.php
  57. 2
      app/Http/Requests/Jobs/CreateRequest.php
  58. 3
      app/Http/Requests/Jobs/DeleteRequest.php
  59. 3
      app/Http/Requests/Jobs/UpdateRequest.php
  60. 2
      app/Http/Requests/Payments/CreateRequest.php
  61. 45
      app/Http/Requests/Payments/DeleteRequest.php
  62. 2
      app/Http/Requests/Payments/UpdateRequest.php
  63. 4
      app/Http/Requests/Projects/CreateRequest.php
  64. 3
      app/Http/Requests/Projects/DeleteRequest.php
  65. 3
      app/Http/Requests/Projects/UpdateRequest.php
  66. 29
      app/Http/Requests/SubscriptionRequest.php
  67. 1
      app/Http/Requests/Tasks/CreateRequest.php
  68. 2
      app/Http/Requests/Tasks/DeleteRequest.php
  69. 2
      app/Http/Requests/Tasks/UpdateRequest.php
  70. 2
      app/Policies/EventPolicy.php
  71. 22
      app/Policies/Partners/CustomerPolicy.php
  72. 22
      app/Policies/Partners/VendorPolicy.php
  73. 22
      app/Policies/Projects/ProjectPolicy.php
  74. 22
      app/Policies/UserPolicy.php
  75. 1
      app/Providers/AuthServiceProvider.php
  76. 5
      app/Providers/EventServiceProvider.php
  77. 8
      app/Providers/RouteServiceProvider.php
  78. 28
      app/Queries/AdminDashboardQuery.php
  79. 9
      app/Services/Facades/Option.php
  80. 3
      app/Services/InvoiceDraft/InvoiceDraft.php
  81. 2
      app/Services/InvoiceDraft/Item.php
  82. 8
      app/Services/Option.php
  83. 44
      app/helpers.php
  84. 12
      config/auth.php
  85. 54
      config/backup-manager.php
  86. 10
      config/broadcasting.php
  87. 10
      config/cache.php
  88. 8
      config/filesystems.php
  89. 2
      database/factories/CustomerFactory.php
  90. 2
      database/factories/InvoiceFactory.php
  91. 3
      database/factories/ModelFactory.php
  92. 4
      database/factories/PaymentFactory.php
  93. 6
      database/factories/ProjectFactory.php
  94. 13
      database/factories/SubscriptionFactory.php
  95. 1
      database/factories/VendorFactory.php
  96. 5
      database/migrations/2014_10_12_000000_create_users_table.php
  97. 5
      database/migrations/2014_10_12_100000_create_password_resets_table.php
  98. 5
      database/migrations/2015_07_14_131409_create_site_options_table.php
  99. 67
      database/migrations/2016_07_06_110052_create_projects_table.php
  100. 1
      database/migrations/2016_07_08_182606_create_subscriptions_table.php

3
app/Console/Kernel.php

@ -19,7 +19,8 @@ class Kernel extends ConsoleKernel
/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @param \Illuminate\Console\Scheduling\Schedule $schedule
*
* @return void
*/
protected function schedule(Schedule $schedule)

4
app/Entities/BaseRepository.php

@ -9,13 +9,12 @@ use App\Entities\Projects\Project;
use App\Entities\Users\User;
/**
* Base Repository Class
* Base Repository Class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
abstract class BaseRepository extends EloquentRepository
{
public function getCustomersList()
{
return Customer::orderBy('name')->pluck('name', 'id');
@ -27,6 +26,7 @@ abstract class BaseRepository extends EloquentRepository
'Customer' => Customer::orderBy('name')->pluck('name', 'id')->all(),
'Vendor' => Vendor::orderBy('name')->pluck('name', 'id')->all(),
];
return $partners;
}

10
app/Entities/EloquentRepository.php

@ -6,7 +6,7 @@ use App\Exceptions\EntityNotFoundException;
use Illuminate\Database\Eloquent\Model;
/**
* Eloquent Repository Class
* Eloquent Repository Class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
@ -71,29 +71,30 @@ abstract class EloquentRepository
if ($data[$key] == '') {
$data[$key] = null;
}
}
return $this->storeArray($data);
}
}
public function update($data = [], $modelId)
public function update($data, $modelId)
{
foreach ($data as $key => $value) {
if (!$data[$key]) {
$data[$key] = null;
}
}
$model = $this->requireById($modelId);
$model->update($data);
return $model;
}
public function delete($modelId)
{
$model = $this->requireById($modelId);
return $model->delete();
}
@ -110,6 +111,7 @@ abstract class EloquentRepository
{
$model = $this->getNewInstance($data);
$this->storeEloquentModel($model);
return $model;
}
}

1
app/Entities/Invoices/Invoice.php

@ -45,6 +45,7 @@ class Invoice extends Model
return ++$lastInvoiceNo;
}
}
return $prefix.'001';
}

8
app/Entities/Options/Option.php

@ -4,9 +4,9 @@ namespace App\Entities\Options;
use Illuminate\Database\Eloquent\Model;
class Option extends Model {
protected $fillable = ['key','value'];
class Option extends Model
{
protected $fillable = ['key', 'value'];
protected $table = 'site_options';
public $timestamps = false;
public $timestamps = false;
}

1
app/Entities/Payments/Payment.php

@ -2,7 +2,6 @@
namespace App\Entities\Payments;
use App\Entities\Payments\PaymentPresenter;
use App\Entities\Projects\Project;
use Illuminate\Database\Eloquent\Model;
use Laracasts\Presenter\PresentableTrait;

2
app/Entities/Payments/PaymentPresenter.php

@ -25,4 +25,4 @@ class PaymentPresenter extends Presenter
{
return paymentTypes($this->entity->type_id);
}
}
}

2
app/Entities/Payments/PaymentsRepository.php

@ -5,7 +5,7 @@ namespace App\Entities\Payments;
use App\Entities\BaseRepository;
/**
* Payments Repository Class
* Payments Repository Class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/

4
app/Entities/Projects/Job.php

@ -2,15 +2,12 @@
namespace App\Entities\Projects;
use App\Entities\Projects\JobPresenter;
use App\Entities\Projects\Project;
use App\Entities\Users\User;
use Illuminate\Database\Eloquent\Model;
use Laracasts\Presenter\PresentableTrait;
class Job extends Model
{
use PresentableTrait;
protected $presenter = JobPresenter::class;
@ -35,5 +32,4 @@ class Job extends Model
{
return $this->type_id == 1 ? 'Project' : 'Additional';
}
}

1
app/Entities/Projects/JobPresenter.php

@ -20,5 +20,4 @@ class JobPresenter extends Presenter
{
return link_to_route('projects.jobs.index', trans('project.jobs'), [$this->project_id]);
}
}

5
app/Entities/Projects/JobsRepository.php

@ -3,7 +3,6 @@
namespace App\Entities\Projects;
use App\Entities\BaseRepository;
use App\Entities\Projects\Project;
use DB;
/**
@ -40,6 +39,7 @@ class JobsRepository extends BaseRepository
public function createJob($jobData, $projectId)
{
$jobData['project_id'] = $projectId;
return $this->storeArray($jobData);
}
@ -77,13 +77,12 @@ class JobsRepository extends BaseRepository
return Task::findOrFail($taskId);
}
public function update($jobData = [], $jobId)
public function update($jobData, $jobId)
{
foreach ($jobData as $key => $value) {
if (!$jobData[$key]) {
$jobData[$key] = null;
}
}
$jobData['price'] = str_replace('.', '', $jobData['price']);

3
app/Entities/Projects/Project.php

@ -5,8 +5,6 @@ namespace App\Entities\Projects;
use App\Entities\Invoices\Invoice;
use App\Entities\Partners\Customer;
use App\Entities\Payments\Payment;
use App\Entities\Projects\ProjectPresenter;
use App\Entities\Projects\Task;
use App\Entities\Subscriptions\Subscription;
use Illuminate\Database\Eloquent\Model;
use Laracasts\Presenter\PresentableTrait;
@ -131,5 +129,4 @@ class Project extends Model
->with('worker', 'tasks')
->get();
}
}

1
app/Entities/Projects/ProjectPresenter.php

@ -35,5 +35,4 @@ class ProjectPresenter extends Presenter
return $workDuration.' Hari';
}
}

7
app/Entities/Projects/ProjectsRepository.php

@ -8,7 +8,7 @@ use DB;
use ProjectStatus;
/**
* Projects Repository Class
* Projects Repository Class.
*/
class ProjectsRepository extends BaseRepository
{
@ -29,7 +29,6 @@ class ProjectsRepository extends BaseRepository
if ($statusId && in_array($statusId, $statusIds)) {
$query->where('status_id', $statusId);
}
})
->withCount('payments')
->with('customer')
@ -50,6 +49,7 @@ class ProjectsRepository extends BaseRepository
$project = $this->storeArray($projectData);
DB::commit();
return $project;
}
@ -60,7 +60,7 @@ class ProjectsRepository extends BaseRepository
public function createNewCustomer($customerName, $customerEmail)
{
$newCustomer = new Customer;
$newCustomer = new Customer();
$newCustomer->name = $customerName;
$newCustomer->email = $customerEmail;
$newCustomer->save();
@ -88,6 +88,7 @@ class ProjectsRepository extends BaseRepository
$project->delete();
DB::commit();
return 'deleted';
}

2
app/Entities/Projects/Status.php

@ -41,7 +41,7 @@ class Status extends ReferenceAbstract
public static function getIconById($singleId)
{
if (!!static::getById($singleId) && isset(static::$icons[$singleId])) {
if ((bool) static::getById($singleId) && isset(static::$icons[$singleId])) {
return static::$icons[$singleId];
}

3
app/Entities/Projects/Task.php

@ -2,13 +2,11 @@
namespace App\Entities\Projects;
use App\Entities\Projects\TaskPresenter;
use Illuminate\Database\Eloquent\Model;
use Laracasts\Presenter\PresentableTrait;
class Task extends Model
{
use PresentableTrait;
protected $presenter = TaskPresenter::class;
@ -18,5 +16,4 @@ class Task extends Model
{
return $this->belongsTo(Job::class, 'project_id');
}
}

3
app/Entities/Projects/TasksRepository.php

@ -5,7 +5,7 @@ namespace App\Entities\Projects;
use App\Entities\BaseRepository;
/**
* Tasks Repository Class
* Tasks Repository Class.
*/
class TasksRepository extends BaseRepository
{
@ -19,6 +19,7 @@ class TasksRepository extends BaseRepository
public function createTask($taskData, $jobId)
{
$taskData['job_id'] = $jobId;
return $this->storeArray($taskData);
}

4
app/Entities/ReferenceAbstract.php

@ -6,7 +6,7 @@ use App\Exceptions\ReferenceKeyNotFoundException;
use Illuminate\Support\Arr;
/**
* Base of References class
* Base of References class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
@ -57,7 +57,7 @@ abstract class ReferenceAbstract
public static function getColorById($colorId)
{
if (!!static::getById($colorId) && isset(static::$colors[$colorId])) {
if ((bool) static::getById($colorId) && isset(static::$colors[$colorId])) {
return static::$colors[$colorId];
}

18
app/Entities/Reports/ReportsRepository.php

@ -8,7 +8,7 @@ use App\Entities\Projects\Project;
use DB;
/**
* Reports Repository Class
* Reports Repository Class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
@ -31,9 +31,9 @@ class ReportsRepository extends BaseRepository
public function getMonthlyReports($year, $month)
{
$rawQuery = "date, count(`id`) as count";
$rawQuery .= ", sum(if(in_out = 1, amount, 0)) AS cashin";
$rawQuery .= ", sum(if(in_out = 0, amount, 0)) AS cashout";
$rawQuery = 'date, count(`id`) as count';
$rawQuery .= ', sum(if(in_out = 1, amount, 0)) AS cashin';
$rawQuery .= ', sum(if(in_out = 0, amount, 0)) AS cashout';
$reportsData = DB::table('payments')->select(DB::raw($rawQuery))
->where(DB::raw('YEAR(date)'), $year)
@ -54,10 +54,10 @@ class ReportsRepository extends BaseRepository
public function getYearlyReports($year)
{
$rawQuery = "MONTH(date) as month";
$rawQuery .= ", count(`id`) as count";
$rawQuery .= ", sum(if(in_out = 1, amount, 0)) AS cashin";
$rawQuery .= ", sum(if(in_out = 0, amount, 0)) AS cashout";
$rawQuery = 'MONTH(date) as month';
$rawQuery .= ', count(`id`) as count';
$rawQuery .= ', sum(if(in_out = 1, amount, 0)) AS cashin';
$rawQuery .= ', sum(if(in_out = 0, amount, 0)) AS cashout';
$reportsData = DB::table('payments')->select(DB::raw($rawQuery))
->where(DB::raw('YEAR(date)'), $year)
@ -80,9 +80,9 @@ class ReportsRepository extends BaseRepository
{
// On Progress, Done, On Hold
$projects = Project::whereIn('status_id', [2, 3, 6])->with('payments', 'customer')->get();
return $projects->filter(function ($project) {
return $project->cashInTotal() < $project->project_value;
})->values();
}
}

4
app/Entities/Subscriptions/SubscriptionPresenter.php

@ -8,6 +8,6 @@ class SubscriptionPresenter extends Presenter
{
public function customerNameAndEmail()
{
return $this->customer_id ? $this->customer->name . ' (' . $this->customer->email . ')' : '-';
return $this->customer_id ? $this->customer->name.' ('.$this->customer->email.')' : '-';
}
}
}

3
app/Entities/Subscriptions/SubscriptionsRepository.php

@ -5,7 +5,7 @@ namespace App\Entities\Subscriptions;
use App\Entities\BaseRepository;
/**
* Subscriptions Repository Class
* Subscriptions Repository Class.
*/
class SubscriptionsRepository extends BaseRepository
{
@ -28,7 +28,6 @@ class SubscriptionsRepository extends BaseRepository
if ($q) {
$query->where('name', 'like', '%'.$q.'%');
}
})
->with('customer', 'vendor')
->paginate($this->_paginate);

5
app/Entities/Users/Event.php

@ -3,7 +3,6 @@
namespace App\Entities\Users;
use App\Entities\Projects\Project;
use App\Entities\Users\User;
use Illuminate\Database\Eloquent\Model;
/**
@ -11,9 +10,9 @@ use Illuminate\Database\Eloquent\Model;
*/
class Event extends Model
{
protected $table = 'user_events';
protected $table = 'user_events';
protected $guarded = ['id', 'created_at', 'updated_at'];
protected $casts = ['is_allday' => 'boolean'];
protected $casts = ['is_allday' => 'boolean'];
public function user()
{

2
app/Entities/Users/Role.php

@ -5,7 +5,7 @@ namespace App\Entities\Users;
use App\Entities\ReferenceAbstract;
/**
* Role Class
* Role Class.
*/
class Role extends ReferenceAbstract
{

16
app/Entities/Users/User.php

@ -35,7 +35,8 @@ class User extends Authenticatable
/**
* Assign the given role to the user.
*
* @param string $role
* @param string $role
*
* @return void
*/
public function assignRole(string $roleName)
@ -51,7 +52,8 @@ class User extends Authenticatable
/**
* Remove the given role from the user.
*
* @param string $role
* @param string $role
*
* @return void
*/
public function removeRole(string $roleName)
@ -67,8 +69,9 @@ class User extends Authenticatable
/**
* Determine if the user has the given role.
*
* @param string $role
* @return boolean
* @param string $role
*
* @return bool
*/
public function hasRole(string $roleName)
{
@ -80,8 +83,9 @@ class User extends Authenticatable
/**
* Determine if the user has the given array of role.
*
* @param array $role
* @return boolean
* @param array $role
*
* @return bool
*/
public function hasRoles(array $roleNameArray)
{

17
app/Exceptions/Handler.php

@ -28,7 +28,8 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $exception
* @param \Exception $exception
*
* @return void
*/
public function report(Exception $exception)
@ -39,8 +40,9 @@ class Handler extends ExceptionHandler
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
*
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $exception)
@ -48,22 +50,22 @@ class Handler extends ExceptionHandler
// throw $exception;
if ($exception instanceof AuthorizationException) {
if ($request->expectsJson()) {
return response()->json(['error' => 'Forbidden Action.'], 403);
}
flash()->error('Invalid access');
return redirect()->home();
}
if ($exception instanceof EntityNotFoundException) {
if ($request->expectsJson()) {
return response()->json(['error' => 'Data not found.'], 404);
}
flash()->error('Data not found.');
return redirect()->home();
}
@ -73,8 +75,9 @@ class Handler extends ExceptionHandler
/**
* Convert an authentication exception into an unauthenticated response.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Auth\AuthenticationException $exception
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Auth\AuthenticationException $exception
*
* @return \Illuminate\Http\Response
*/
protected function unauthenticated($request, AuthenticationException $exception)

5
app/Exceptions/ReferenceKeyNotFoundException.php

@ -3,9 +3,10 @@
namespace App\Exceptions;
/**
* Reference Key Not Found Exception
* Reference Key Not Found Exception.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
class ReferenceKeyNotFoundException extends \RuntimeException
{}
{
}

110
app/Http/Controllers/Api/EventsController.php

@ -12,27 +12,29 @@ class EventsController extends Controller
{
$start = $request->get('start');
$end = $request->get('end');
$events = Event::where(function($query) use ($start, $end) {
if ($start && $end)
$events = Event::where(function ($query) use ($start, $end) {
if ($start && $end) {
$query->whereBetween('start', [$start, $end]);
}
})->with('user')->get();
$response = fractal()
->collection($events)
->transformWith(function($event) {
->transformWith(function ($event) {
$isOwnEvent = $event->user_id == auth()->id();
return [
'id' => $event->id,
'user' => $event->user->name,
'user_id' => $event->user_id,
'id' => $event->id,
'user' => $event->user->name,
'user_id' => $event->user_id,
'project_id' => $event->project_id,
'title' => $event->title,
'body' => $event->body,
'start' => $event->start,
'end' => $event->end,
'allDay' => $event->is_allday,
'editable' => true,
'color' => $isOwnEvent ? '' : '#B7B7B7',
'title' => $event->title,
'body' => $event->body,
'start' => $event->start,
'end' => $event->end,
'allDay' => $event->is_allday,
'editable' => true,
'color' => $isOwnEvent ? '' : '#B7B7B7',
];
})
->toArray();
@ -44,37 +46,37 @@ class EventsController extends Controller
{
$this->validate($request, [
'project_id' => 'nullable|numeric|exists:projects,id',
'title' => 'required|string|max:60',
'body' => 'nullable|string|max:255',
'start' => 'required|date|date_format:Y-m-d H:i:s',
'end' => 'date|date_format:Y-m-d H:i:s',
'is_allday' => '',
'title' => 'required|string|max:60',
'body' => 'nullable|string|max:255',
'start' => 'required|date|date_format:Y-m-d H:i:s',
'end' => 'date|date_format:Y-m-d H:i:s',
'is_allday' => '',
]);
$event = new Event;
$event = new Event();
$event->user_id = auth()->id();
$event->project_id = $request->get('project_id');
$event->title = $request->get('title');
$event->body = $request->get('body');
$event->start = $request->get('start');
$event->end = $request->get('is_allday') == "true" ? null : $request->get('end');
$event->is_allday = $request->get('is_allday') == "true" ? 1 : 0;
$event->end = $request->get('is_allday') == 'true' ? null : $request->get('end');
$event->is_allday = $request->get('is_allday') == 'true' ? 1 : 0;
$event->save();
$response = [
'message' => trans('event.created')
'message' => trans('event.created'),
] + fractal()->item($event)
->transformWith(function($event) {
->transformWith(function ($event) {
return [
'id' => $event->id,
'id' => $event->id,
'project_id' => $event->project_id,
'user' => $event->user->name,
'title' => $event->title,
'body' => $event->body,
'start' => $event->start,
'end' => $event->end,
'allDay' => $event->is_allday,
'user' => $event->user->name,
'title' => $event->title,
'body' => $event->body,
'start' => $event->start,
'end' => $event->end,
'allDay' => $event->is_allday,
];
})
->toArray();
@ -90,11 +92,11 @@ class EventsController extends Controller
public function update(Request $request)
{
$this->validate($request, [
'id' => 'required|numeric|exists:user_events,id',
'id' => 'required|numeric|exists:user_events,id',
'project_id' => 'nullable|numeric|exists:projects,id',
'title' => 'required|string|max:60',
'body' => 'nullable|string|max:255',
'is_allday' => '',
'title' => 'required|string|max:60',
'body' => 'nullable|string|max:255',
'is_allday' => '',
]);
$event = Event::findOrFail($request->get('id'));
@ -108,18 +110,18 @@ class EventsController extends Controller
$event->save();
$response = [
'message' => trans('event.updated')
'message' => trans('event.updated'),
] + fractal()->item($event)
->transformWith(function($event) {
->transformWith(function ($event) {
return [
'id' => $event->id,
'id' => $event->id,
'project_id' => $event->project_id,
'user' => $event->user->name,
'title' => $event->title,
'body' => $event->body,
'start' => $event->start,
'end' => $event->end,
'allDay' => $event->is_allday,
'user' => $event->user->name,
'title' => $event->title,
'body' => $event->body,
'start' => $event->start,
'end' => $event->end,
'allDay' => $event->is_allday,
];
})
->toArray();
@ -130,7 +132,7 @@ class EventsController extends Controller
public function destroy(Request $request)
{
$this->validate($request, [
'id' => 'required|numeric|exists:user_events,id'
'id' => 'required|numeric|exists:user_events,id',
]);
$event = Event::findOrFail($request->get('id'));
@ -143,9 +145,9 @@ class EventsController extends Controller
public function reschedule(Request $request)
{
$this->validate($request, [
'id' => 'required|numeric|exists:user_events,id',
'id' => 'required|numeric|exists:user_events,id',
'start' => 'required|date|date_format:Y-m-d H:i:s',
'end' => 'date|date_format:Y-m-d H:i:s',
'end' => 'date|date_format:Y-m-d H:i:s',
]);
$event = Event::findOrFail($request->get('id'));
@ -160,16 +162,16 @@ class EventsController extends Controller
$event->save();
$response = [
'message' => trans('event.rescheduled')
'message' => trans('event.rescheduled'),
] + fractal()->item($event)
->transformWith(function($event) {
->transformWith(function ($event) {
return [
'id' => $event->id,
'user' => $event->user->name,
'title' => $event->title,
'body' => $event->body,
'start' => $event->start,
'end' => $event->end,
'id' => $event->id,
'user' => $event->user->name,
'title' => $event->title,
'body' => $event->body,
'start' => $event->start,
'end' => $event->end,
'allDay' => $event->is_allday,
];
})

4
app/Http/Controllers/Api/ProjectsController.php

@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
/**
* Projects Controller
* Projects Controller.
*
* @author Nafies Luthfi <nafiesl@gmail.com>
*/
@ -19,6 +19,7 @@ class ProjectsController extends Controller
{
$this->repo = $repo;
}
public function index(Request $request)
{
return $this->repo->getProjects($request->get('q'), $request->get('status_id'));
@ -39,6 +40,7 @@ class ProjectsController extends Controller
return $project;
})
->toArray();
return $response;
}
}

6
app/Http/Controllers/Auth/ChangePasswordController.php

@ -25,8 +25,8 @@ class ChangePasswordController extends Controller
public function update(Request $request)
{
$input = $request->validate([
'old_password' => 'required',
'password' => 'required|between:6,15|confirmed',
'old_password' => 'required',
'password' => 'required|between:6,15|confirmed',
'password_confirmation' => 'required',
]);
@ -36,10 +36,12 @@ class ChangePasswordController extends Controller
$user->save();
flash(trans('auth.password_changed'), 'success');
return back();
}
flash(trans('auth.old_password_failed'), 'danger');
return back();
}
}

6
app/Http/Controllers/Auth/LoginController.php

@ -41,7 +41,8 @@ class LoginController extends Controller
/**
* Send the response after the user was authenticated.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response
*/
protected function sendLoginResponse(Request $request)
@ -59,7 +60,8 @@ class LoginController extends Controller
/**
* Log the user out of the application.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response
*/
public function logout(Request $request)

7
app/Http/Controllers/Auth/ResetPasswordController.php

@ -33,14 +33,15 @@ class ResetPasswordController extends Controller
/**
* Reset the given user's password.
*
* @param \Illuminate\Contracts\Auth\CanResetPassword $user
* @param string $password
* @param \Illuminate\Contracts\Auth\CanResetPassword $user
* @param string $password
*
* @return void
*/
protected function resetPassword($user, $password)
{
$user->forceFill([
'password' => $password,
'password' => $password,
'remember_token' => str_random(60),
])->save();

3
app/Http/Controllers/BackupsController.php

@ -62,6 +62,7 @@ class BackupsController extends Controller
}
flash(trans('backup.deleted', ['filename' => $fileName]), 'warning');
return redirect()->route('backups.index');
}
@ -79,6 +80,7 @@ class BackupsController extends Controller
}
flash(trans('backup.restored', ['filename' => $fileName]), 'success');
return redirect()->route('backups.index');
}
@ -98,6 +100,7 @@ class BackupsController extends Controller
}
flash(trans('backup.uploaded', ['filename' => $fileName]), 'success');
return redirect()->route('backups.index');
}
}

4
app/Http/Controllers/Controller.php

@ -2,10 +2,10 @@
namespace App\Http\Controllers;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Routing\Controller as BaseController;
class Controller extends BaseController
{

5
app/Http/Controllers/InstallationController.php

@ -8,7 +8,7 @@ use Auth;
use DB;
/**
* Installation Controller
* Installation Controller.
*
* @author Nafies Luthfi <nafiesl@gmail.com>
*/
@ -24,6 +24,7 @@ class InstallationController extends Controller
if (User::count()) {
return redirect()->route('auth.login');
}
return view('auth.app-install');
}
@ -31,7 +32,6 @@ class InstallationController extends Controller
{
$agencyData = collect($request->only('agency_name', 'agency_website', 'email'))
->map(function ($value, $key) {
if ($key == 'email') {
$key = 'agency_email';
}
@ -57,6 +57,7 @@ class InstallationController extends Controller
DB::commit();
flash()->success(trans('auth.welcome', ['name' => $admin->name]));
return redirect()->route('home');
}
}

1
app/Http/Controllers/Invoices/DraftsController.php

@ -41,6 +41,7 @@ class DraftsController extends Controller
}
$projects = Project::pluck('name', 'id');
return view('invoice-drafts.index', compact('draft', 'projects'));
}

1
app/Http/Controllers/Invoices/InvoicesController.php

@ -56,6 +56,7 @@ class InvoicesController extends Controller
if (request('invoice_id') == $invoice->id && $invoice->delete()) {
flash(trans('invoice.deleted'), 'warning');
return redirect()->route('projects.invoices', $invoice->project_id);
}

3
app/Http/Controllers/JobsController.php

@ -86,9 +86,8 @@ class JobsController extends Controller
{
if ($req->ajax()) {
$data = $this->repo->tasksReorder($req->get('postData'));
return 'oke';
}
return null;
}
}

1
app/Http/Controllers/PagesController.php

@ -15,5 +15,4 @@ class PagesController extends Controller
{
return view('pages.about');
}
}

19
app/Http/Controllers/Partners/CustomersController.php

@ -37,7 +37,8 @@ class CustomersController extends Controller
/**
* Store a newly created customer in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
@ -62,7 +63,8 @@ class CustomersController extends Controller
/**
* Show the specified customer.
*
* @param \App\Entities\Partners\Customer $customer
* @param \App\Entities\Partners\Customer $customer
*
* @return \Illuminate\Http\Response
*/
public function show(Customer $customer)
@ -73,7 +75,8 @@ class CustomersController extends Controller
/**
* Show the edit customer form.
*
* @param \App\Entities\Partners\Customer $customer
* @param \App\Entities\Partners\Customer $customer
*
* @return \Illuminate\Http\Response
*/
public function edit(Customer $customer)
@ -84,8 +87,9 @@ class CustomersController extends Controller
/**
* Update the specified customer in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Entities\Partners\Customer $customer
* @param \Illuminate\Http\Request $request
* @param \App\Entities\Partners\Customer $customer
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Customer $customer)
@ -111,7 +115,8 @@ class CustomersController extends Controller
/**
* Remove the specified customer from storage.
*
* @param \App\Entities\Partners\Customer $customer
* @param \App\Entities\Partners\Customer $customer
*
* @return \Illuminate\Http\Response
*/
public function destroy(Customer $customer)
@ -125,10 +130,12 @@ class CustomersController extends Controller
if (request('customer_id') == $customer->id && $customer->delete()) {
flash(trans('customer.deleted'), 'warning');
return redirect()->route('customers.index', $routeParam);
}
flash(trans('customer.undeleted'), 'danger');
return back();
}
}

17
app/Http/Controllers/Partners/VendorsController.php

@ -16,7 +16,7 @@ class VendorsController extends Controller
public function index()
{
$editableVendor = null;
$vendors = Vendor::where(function ($query) {
$vendors = Vendor::where(function ($query) {
$query->where('name', 'like', '%'.request('q').'%');
})->paginate(25);
@ -30,7 +30,8 @@ class VendorsController extends Controller
/**
* Store a newly created vendor in storage.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
@ -44,14 +45,16 @@ class VendorsController extends Controller
Vendor::create($newVendorData);
flash(trans('vendor.created'), 'success');
return redirect()->route('vendors.index');
}
/**
* Update the specified vendor in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Entities\Partners\Vendor $vendor
* @param \Illuminate\Http\Request $request
* @param \App\Entities\Partners\Vendor $vendor
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Vendor $vendor)
@ -68,13 +71,15 @@ class VendorsController extends Controller
$vendor = $vendor->update($vendorData);
flash(trans('vendor.updated'), 'success');
return redirect()->route('vendors.index', $routeParam);
}
/**
* Remove the specified vendor from storage.
*
* @param \App\Entities\Partners\Vendor $vendor
* @param \App\Entities\Partners\Vendor $vendor
*
* @return \Illuminate\Http\Response
*/
public function destroy(Vendor $vendor)
@ -87,10 +92,12 @@ class VendorsController extends Controller
if (request('vendor_id') == $vendor->id && $vendor->delete()) {
flash(trans('vendor.deleted'), 'warning');
return redirect()->route('vendors.index', $routeParam);
}
flash(trans('vendor.undeleted'), 'danger');
return back();
}
}

7
app/Http/Controllers/PaymentsController.php

@ -11,7 +11,7 @@ use App\Http\Requests\Payments\UpdateRequest;
use Illuminate\Http\Request;
/**
* Payments Controller class
* Payments Controller class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
@ -28,6 +28,7 @@ class PaymentsController extends Controller
{
$payments = $this->repo->getPayments($request->only('q', 'partner_id'));
$partnersList = Customer::pluck('name', 'id')->all();
return view('payments.index', compact('payments', 'partnersList'));
}
@ -35,6 +36,7 @@ class PaymentsController extends Controller
{
$projects = $this->repo->getProjectsList();
$partners = $this->repo->getCustomersAndVendorsList();
return view('payments.create', compact('projects', 'partners'));
}
@ -42,6 +44,7 @@ class PaymentsController extends Controller
{
$payment = $this->repo->create($request->except('_token'));
flash()->success(trans('payment.created'));
return redirect()->route('projects.payments', $payment->project_id);
}
@ -54,6 +57,7 @@ class PaymentsController extends Controller
{
$projects = $this->repo->getProjectsList();
$partners = $this->repo->getCustomersAndVendorsList();
return view('payments.edit', compact('payment', 'projects', 'partners'));
}
@ -62,6 +66,7 @@ class PaymentsController extends Controller
$payment->update($request->except(['_method', '_token']));
flash()->success(trans('payment.updated'));
return redirect()->route('payments.show', $payment->id);
}

4
app/Http/Controllers/Projects/FeesController.php

@ -8,7 +8,7 @@ use App\Entities\Users\User;
use App\Http\Controllers\Controller;
/**
* Project Fees Controller
* Project Fees Controller.
*
* @author Nafies Luthfi <nafiesl@gmail.com>
*/
@ -17,6 +17,7 @@ class FeesController extends Controller
public function create(Project $project)
{
$partners = User::pluck('name', 'id')->all();
return view('projects.fees.create', compact('project', 'partners'));
}
@ -36,6 +37,7 @@ class FeesController extends Controller
Payment::create($newPaymentData);
flash()->success(trans('payment.created'));
return redirect()->route('projects.payments', $project->id);
}
}

2
app/Http/Controllers/Projects/FilesController.php

@ -53,7 +53,6 @@ class FilesController extends Controller
} else {
flash()->error('Upload file gagal, coba kembali.');
}
} else {
flash()->error('Upload file gagal, coba kembali.');
}
@ -67,6 +66,7 @@ class FilesController extends Controller
if ($file && file_exists(storage_path('app/public/files/'.$file->filename))) {
$extension = FileSystem::extension('public/files/'.$file->filename);
return response()->download(storage_path('app/public/files/'.$file->filename), $file->title.'.'.$extension);
}

1
app/Http/Controllers/Projects/JobsController.php

@ -47,6 +47,7 @@ class JobsController extends Controller
if ($req->has('project_id')) {
$selectedProject = $this->repo->requireProjectById($req->get('project_id'));
}
return view('jobs.add-from-other-project', compact('project', 'workers', 'projects', 'selectedProject'));
}

15
app/Http/Controllers/Projects/ProjectsController.php

@ -10,7 +10,7 @@ use App\Http\Requests\Projects\UpdateRequest;
use Illuminate\Http\Request;
/**
* Projects Controller
* Projects Controller.
*
* @author Nafies Luthfi <nafiesl@gmail.com>
*/
@ -32,12 +32,14 @@ class ProjectsController extends Controller
}
$projects = $this->repo->getProjects($request->get('q'), $statusId);
return view('projects.index', compact('projects', 'status'));
}
public function create()
{
$customers = $this->repo->getCustomersList();
return view('projects.create', compact('customers'));
}
@ -45,12 +47,14 @@ class ProjectsController extends Controller
{
$project = $this->repo->create($request->except('_token'));
flash()->success(trans('project.created'));
return redirect()->route('projects.show', $project->id);
}
public function show($projectId)
{
$project = $this->repo->requireById($projectId);
return view('projects.show', compact('project'));
}
@ -58,6 +62,7 @@ class ProjectsController extends Controller
{
$project = $this->repo->requireById($projectId);
$customers = $this->repo->getCustomersList();
return view('projects.edit', compact('project', 'customers'));
}
@ -65,12 +70,14 @@ class ProjectsController extends Controller
{
$project = $this->repo->update($request->except(['_method', '_token']), $projectId);
flash()->success(trans('project.updated'));
return redirect()->route('projects.edit', $projectId);
}
public function delete($projectId)
{
$project = $this->repo->requireById($projectId);
return view('projects.delete', compact('project'));
}
@ -89,6 +96,7 @@ class ProjectsController extends Controller
public function subscriptions($projectId)
{
$project = $this->repo->requireById($projectId);
return view('projects.subscriptions', compact('project'));
}
@ -96,6 +104,7 @@ class ProjectsController extends Controller
{
$project = $this->repo->requireById($projectId);
$project->load('payments.partner');
return view('projects.payments', compact('project'));
}
@ -103,6 +112,7 @@ class ProjectsController extends Controller
{
$project = $this->repo->updateStatus($request->get('status_id'), $projectId);
flash()->success(trans('project.updated'));
return redirect()->route('projects.show', $projectId);
}
@ -110,9 +120,8 @@ class ProjectsController extends Controller
{
if ($request->ajax()) {
$data = $this->repo->jobsReorder($request->get('postData'));
return 'oke';
}
return null;
}
}

4
app/Http/Controllers/Projects/TasksController.php

@ -15,7 +15,6 @@ use App\Http\Requests\Tasks\UpdateRequest;
*/
class TasksController extends Controller
{
private $repo;
public function __construct(TasksRepository $repo)
@ -27,6 +26,7 @@ class TasksController extends Controller
{
$job = $this->repo->createTask($req->except('_token'), $jobId);
flash()->success(trans('task.created'));
return redirect()->route('jobs.show', $jobId);
}
@ -34,6 +34,7 @@ class TasksController extends Controller
{
$task = $this->repo->update($req->except(['_method', '_token']), $taskId);
flash()->success(trans('task.updated'));
return redirect()->route('jobs.show', $task->job_id);
}
@ -51,5 +52,4 @@ class TasksController extends Controller
return redirect()->route('jobs.show', $jobId);
}
}

5
app/Http/Controllers/References/OptionsController.php

@ -23,13 +23,14 @@ class OptionsController extends Controller
public function store(Request $req)
{
$newOptionData = $req->validate([
'key' => 'required|max:255|alpha_dash',
'key' => 'required|max:255|alpha_dash',
'value' => 'max:255',
]);
$option = Option::create($newOptionData);
flash()->success(trans('option.created'));
return redirect()->route('options.index');
}
@ -55,7 +56,7 @@ class OptionsController extends Controller
}
flash()->success(trans('option.updated'));
return redirect()->route('options.index');
}
}

7
app/Http/Controllers/ReportsController.php

@ -3,7 +3,6 @@
namespace App\Http\Controllers;
use App\Entities\Reports\ReportsRepository;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
/**
@ -23,6 +22,7 @@ class ReportsController extends Controller
public function index(Request $req)
{
$reports = $this->repo->getAll($req->get('q'));
return view('reports.payments.index', compact('reports'));
}
@ -32,6 +32,7 @@ class ReportsController extends Controller
$date = $req->get('date', date('Y-m-d'));
$payments = $this->repo->getDailyReports($date, $q);
return view('reports.payments.daily', compact('payments', 'date'));
}
@ -46,6 +47,7 @@ class ReportsController extends Controller
$reports = $this->repo->getMonthlyReports($year, $month);
$months = \getMonths();
$years = \getYears();
return view('reports.payments.monthly', compact('reports', 'months', 'years', 'month', 'year'));
}
@ -55,13 +57,14 @@ class ReportsController extends Controller
$reports = $this->repo->getYearlyReports($year);
$years = \getYears();
return view('reports.payments.yearly', compact('reports', 'years', 'year'));
}
public function currentCredits()
{
$projects = $this->repo->getCurrentCredits();
return view('reports.current-credits', compact('projects'));
}
}

7
app/Http/Controllers/SubscriptionsController.php

@ -5,7 +5,6 @@ namespace App\Http\Controllers;
use App\Entities\Subscriptions\Subscription;
use App\Entities\Subscriptions\SubscriptionsRepository;
use App\Entities\Subscriptions\Type;
use App\Http\Controllers\Controller;
use App\Http\Requests\SubscriptionRequest as FormRequest;
use Illuminate\Http\Request;
@ -43,9 +42,10 @@ class SubscriptionsController extends Controller
public function store(FormRequest $subscriptionCreateRequest)
{
$subscriptionCreateRequest->approveFor(new Subscription);
$subscriptionCreateRequest->approveFor(new Subscription());
flash()->success(trans('subscription.created'));
return redirect()->route('subscriptions.index');
}
@ -71,6 +71,7 @@ class SubscriptionsController extends Controller
$subscriptionUpdateRequest->approveFor($subscription);
flash()->success(trans('subscription.updated'));
return redirect()->route('subscriptions.edit', $subscription->id);
}
@ -79,6 +80,7 @@ class SubscriptionsController extends Controller
$subscriptionDeleteRequest->approveToDelete($subscription);
flash()->success(trans('subscription.deleted'));
return redirect()->route('subscriptions.index');
}
@ -91,5 +93,4 @@ class SubscriptionsController extends Controller
{
return trans('subscription.'.$pageType).' - '.$subscription->name.' - '.$subscription->customer->name;
}
}

3
app/Http/Controllers/Users/AgencyController.php

@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
use Option;
/**
* Agency Profile Controller
* Agency Profile Controller.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
@ -64,6 +64,7 @@ class AgencyController extends Controller
Option::set('agency_logo_path', $filename);
flash(trans('agency.updated'), 'success');
return redirect()->route('users.agency.show');
}
}

3
app/Http/Controllers/Users/ProfileController.php

@ -5,7 +5,7 @@ namespace App\Http\Controllers\Users;
use App\Http\Controllers\Controller;
/**
* User Profile Controller
* User Profile Controller.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
@ -14,6 +14,7 @@ class ProfileController extends Controller
public function show()
{
$user = auth()->user();
return view('users.profile.show', compact('user'));
}

2
app/Http/Controllers/Users/UsersController.php

@ -96,6 +96,7 @@ class UsersController extends Controller
\DB::table('user_roles')->insert($rolesData);
flash()->success(trans('user.updated'));
return redirect()->route('users.edit', $user->id);
}
@ -123,5 +124,4 @@ class UsersController extends Controller
return redirect()->route('users.index');
}
}

7
app/Http/Middleware/Authenticate.php

@ -10,9 +10,10 @@ class Authenticate
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
*
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)

5
app/Http/Middleware/GlobalViewVariables.php

@ -16,8 +16,9 @@ class GlobalViewVariables
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)

7
app/Http/Middleware/RedirectIfAuthenticated.php

@ -10,9 +10,10 @@ class RedirectIfAuthenticated
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
*
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)

6
app/Http/Middleware/Role.php

@ -14,8 +14,9 @@ class Role
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next, $names)
@ -29,6 +30,7 @@ class Role
// Cek apakah grup user ada di dalam array $nameArray?
if (auth()->user()->hasRoles($nameArray) == false) {
flash()->error('Anda tidak dapat mengakses halaman '.$request->path().'.');
return redirect()->route('home');
}

2
app/Http/Requests/Jobs/CreateRequest.php

@ -15,6 +15,7 @@ class CreateRequest extends Request
public function authorize()
{
$project = Project::findOrFail($this->segment(2));
return auth()->user()->can('manage_jobs', $project);
}
@ -33,5 +34,4 @@ class CreateRequest extends Request
'description' => 'max:255',
];
}
}

3
app/Http/Requests/Jobs/DeleteRequest.php

@ -7,7 +7,6 @@ use App\Http\Requests\Request;
class DeleteRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
@ -16,6 +15,7 @@ class DeleteRequest extends Request
public function authorize()
{
$project = Project::findOrFail($this->get('project_id'));
return auth()->user()->can('manage_jobs', $project);
}
@ -31,5 +31,4 @@ class DeleteRequest extends Request
'project_id' => 'required',
];
}
}

3
app/Http/Requests/Jobs/UpdateRequest.php

@ -7,7 +7,6 @@ use App\Http\Requests\Request;
class UpdateRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
@ -16,6 +15,7 @@ class UpdateRequest extends Request
public function authorize()
{
$project = Project::findOrFail($this->get('project_id'));
return auth()->user()->can('manage_jobs', $project);
}
@ -34,5 +34,4 @@ class UpdateRequest extends Request
'description' => 'max:255',
];
}
}

2
app/Http/Requests/Payments/CreateRequest.php

@ -6,7 +6,6 @@ use App\Http\Requests\Request;
class CreateRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
@ -34,5 +33,4 @@ class CreateRequest extends Request
'description' => 'required|max:255',
];
}
}

45
app/Http/Requests/Payments/DeleteRequest.php

@ -4,28 +4,27 @@ namespace App\Http\Requests\Payments;
use App\Http\Requests\Request;
class DeleteRequest extends Request {
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return auth()->user()->can('manage_payments');
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'payment_id' => 'required'
];
}
class DeleteRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return auth()->user()->can('manage_payments');
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'payment_id' => 'required',
];
}
}

2
app/Http/Requests/Payments/UpdateRequest.php

@ -6,7 +6,6 @@ use App\Http\Requests\Request;
class UpdateRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
@ -34,5 +33,4 @@ class UpdateRequest extends Request
'description' => 'required|max:255',
];
}
}

4
app/Http/Requests/Projects/CreateRequest.php

@ -7,7 +7,6 @@ use App\Http\Requests\Request;
class CreateRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
@ -15,7 +14,7 @@ class CreateRequest extends Request
*/
public function authorize()
{
return auth()->user()->can('create', new Project);
return auth()->user()->can('create', new Project());
}
/**
@ -43,5 +42,4 @@ class CreateRequest extends Request
'customer_email.required_without' => 'Email Customer Wajib diisi.',
];
}
}

3
app/Http/Requests/Projects/DeleteRequest.php

@ -7,7 +7,6 @@ use App\Http\Requests\Request;
class DeleteRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
@ -16,6 +15,7 @@ class DeleteRequest extends Request
public function authorize()
{
$project = Project::findOrFail($this->segment(2));
return auth()->user()->can('update', $project);
}
@ -30,5 +30,4 @@ class DeleteRequest extends Request
'project_id' => 'required',
];
}
}

3
app/Http/Requests/Projects/UpdateRequest.php

@ -7,7 +7,6 @@ use App\Http\Requests\Request;
class UpdateRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
@ -16,6 +15,7 @@ class UpdateRequest extends Request
public function authorize()
{
$project = Project::findOrFail($this->segment(2));
return auth()->user()->can('update', $project);
}
@ -37,5 +37,4 @@ class UpdateRequest extends Request
'customer_id' => 'nullable|numeric',
];
}
}

29
app/Http/Requests/SubscriptionRequest.php

@ -4,11 +4,9 @@ namespace App\Http\Requests;
use App\Entities\Projects\Project;
use App\Entities\Subscriptions\Subscription;
use App\Http\Requests\Request;
class SubscriptionRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
@ -47,28 +45,28 @@ class SubscriptionRequest extends Request
public function getCreateRules()
{
return [
'name' => 'required|max:60',
'price' => 'required|numeric',
'name' => 'required|max:60',
'price' => 'required|numeric',
'start_date' => 'required|date|date_format:Y-m-d',
'due_date' => 'required|date|date_format:Y-m-d',
'due_date' => 'required|date|date_format:Y-m-d',
'project_id' => 'required|numeric|exists:projects,id',
'vendor_id' => 'required|numeric|exists:vendors,id',
'type_id' => 'required|numeric',
'remark' => 'max:255',
'vendor_id' => 'required|numeric|exists:vendors,id',
'type_id' => 'required|numeric',
'remark' => 'max:255',
];
}
public function getUpdateRules()
{
return [
'name' => 'required|max:60',
'price' => 'required|numeric',
'name' => 'required|max:60',
'price' => 'required|numeric',
'start_date' => 'required|date|date_format:Y-m-d',
'due_date' => 'required|date|date_format:Y-m-d',
'due_date' => 'required|date|date_format:Y-m-d',
'project_id' => 'required|numeric|exists:projects,id',
'vendor_id' => 'required|numeric|exists:vendors,id',
'type_id' => 'required|numeric',
'remark' => 'max:255',
'vendor_id' => 'required|numeric|exists:vendors,id',
'type_id' => 'required|numeric',
'remark' => 'max:255',
];
}
@ -90,9 +88,7 @@ class SubscriptionRequest extends Request
$subscriptionData['customer_id'] = $project->customer_id;
$subscription->update($subscriptionData);
} else {
$subscription->project_id = $project->id;
$subscription->vendor_id = $this->get('vendor_id');
$subscription->customer_id = $project->customer_id;
@ -113,5 +109,4 @@ class SubscriptionRequest extends Request
{
$subscription->delete();
}
}

1
app/Http/Requests/Tasks/CreateRequest.php

@ -30,5 +30,4 @@ class CreateRequest extends Request
'route_name' => 'max:255',
];
}
}

2
app/Http/Requests/Tasks/DeleteRequest.php

@ -6,7 +6,6 @@ use App\Http\Requests\Request;
class DeleteRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
@ -29,5 +28,4 @@ class DeleteRequest extends Request
'job_id' => 'required',
];
}
}

2
app/Http/Requests/Tasks/UpdateRequest.php

@ -6,7 +6,6 @@ use App\Http\Requests\Request;
class UpdateRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
@ -31,5 +30,4 @@ class UpdateRequest extends Request
'route_name' => 'max:255',
];
}
}

2
app/Policies/EventPolicy.php

@ -7,7 +7,7 @@ use App\Entities\Users\User;
use Illuminate\Auth\Access\HandlesAuthorization;
/**
* Event model policy class
* Event model policy class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/

22
app/Policies/Partners/CustomerPolicy.php

@ -7,7 +7,7 @@ use App\Entities\Users\User;
use Illuminate\Auth\Access\HandlesAuthorization;
/**
* Customer model policy class
* Customer model policy class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
@ -18,8 +18,9 @@ class CustomerPolicy
/**
* Determine whether the user can view the customer.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Customer $customer
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Customer $customer
*
* @return mixed
*/
public function view(User $user, Customer $customer)
@ -31,8 +32,9 @@ class CustomerPolicy
/**
* Determine whether the user can create customers.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Customer $customer
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Customer $customer
*
* @return mixed
*/
public function create(User $user, Customer $customer)
@ -44,8 +46,9 @@ class CustomerPolicy
/**
* Determine whether the user can update the customer.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Customer $customer
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Customer $customer
*
* @return mixed
*/
public function update(User $user, Customer $customer)
@ -57,8 +60,9 @@ class CustomerPolicy
/**
* Determine whether the user can delete the customer.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Customer $customer
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Customer $customer
*
* @return mixed
*/
public function delete(User $user, Customer $customer)

22
app/Policies/Partners/VendorPolicy.php

@ -7,7 +7,7 @@ use App\Entities\Users\User;
use Illuminate\Auth\Access\HandlesAuthorization;
/**
* Vendor model policy class
* Vendor model policy class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
@ -18,8 +18,9 @@ class VendorPolicy
/**
* Determine whether the user can view the project.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Vendor $vendor
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Vendor $vendor
*
* @return mixed
*/
public function view(User $user, Vendor $vendor)
@ -30,8 +31,9 @@ class VendorPolicy
/**
* Determine whether the user can create projects.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Vendor $vendor
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Vendor $vendor
*
* @return mixed
*/
public function create(User $user, Vendor $vendor)
@ -42,8 +44,9 @@ class VendorPolicy
/**
* Determine whether the user can update the project.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Vendor $vendor
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Vendor $vendor
*
* @return mixed
*/
public function update(User $user, Vendor $vendor)
@ -54,8 +57,9 @@ class VendorPolicy
/**
* Determine whether the user can delete the project.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Vendor $vendor
* @param \App\Entities\Users\User $user
* @param \App\Entities\Partners\Vendor $vendor
*
* @return mixed
*/
public function delete(User $user, Vendor $vendor)

22
app/Policies/Projects/ProjectPolicy.php

@ -7,7 +7,7 @@ use App\Entities\Users\User;
use Illuminate\Auth\Access\HandlesAuthorization;
/**
* Project model policy class
* Project model policy class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
@ -18,8 +18,9 @@ class ProjectPolicy
/**
* Determine whether the user can view the project.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Projects\Project $project
* @param \App\Entities\Users\User $user
* @param \App\Entities\Projects\Project $project
*
* @return mixed
*/
public function view(User $user, Project $project)
@ -31,8 +32,9 @@ class ProjectPolicy
/**
* Determine whether the user can create projects.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Projects\Project $project
* @param \App\Entities\Users\User $user
* @param \App\Entities\Projects\Project $project
*
* @return mixed
*/
public function create(User $user, Project $project)
@ -44,8 +46,9 @@ class ProjectPolicy
/**
* Determine whether the user can update the project.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Projects\Project $project
* @param \App\Entities\Users\User $user
* @param \App\Entities\Projects\Project $project
*
* @return mixed
*/
public function update(User $user, Project $project)
@ -56,8 +59,9 @@ class ProjectPolicy
/**
* Determine whether the user can delete the project.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Projects\Project $project
* @param \App\Entities\Users\User $user
* @param \App\Entities\Projects\Project $project
*
* @return mixed
*/
public function delete(User $user, Project $project)

22
app/Policies/UserPolicy.php

@ -7,7 +7,7 @@ use App\Entities\Users\User as Worker;
use Illuminate\Auth\Access\HandlesAuthorization;
/**
* User model policy class
* User model policy class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
@ -18,8 +18,9 @@ class UserPolicy
/**
* Determine whether the user can view the user.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
*
* @return mixed
*/
public function view(User $user, Worker $worker)
@ -30,8 +31,9 @@ class UserPolicy
/**
* Determine whether the user can create users.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
*
* @return mixed
*/
public function create(User $user, Worker $worker)
@ -42,8 +44,9 @@ class UserPolicy
/**
* Determine whether the user can update the user.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
*
* @return mixed
*/
public function update(User $user, Worker $worker)
@ -54,8 +57,9 @@ class UserPolicy
/**
* Determine whether the user can delete the user.
*
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
* @param \App\Entities\Users\User $user
*
* @return mixed
*/
public function delete(User $user, Worker $worker)

1
app/Providers/AuthServiceProvider.php

@ -2,7 +2,6 @@
namespace App\Providers;
use App\Entities\Users\Permission;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Gate;

5
app/Providers/EventServiceProvider.php

@ -2,8 +2,8 @@
namespace App\Providers;
use Illuminate\Support\Facades\Event;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Event;
class EventServiceProvider extends ServiceProvider
{
@ -21,7 +21,8 @@ class EventServiceProvider extends ServiceProvider
/**
* Register any other events for your application.
*
* @param \Illuminate\Contracts\Events\Dispatcher $events
* @param \Illuminate\Contracts\Events\Dispatcher $events
*
* @return void
*/
public function boot()

8
app/Providers/RouteServiceProvider.php

@ -2,8 +2,8 @@
namespace App\Providers;
use Illuminate\Support\Facades\Route;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Route;
class RouteServiceProvider extends ServiceProvider
{
@ -53,7 +53,7 @@ class RouteServiceProvider extends ServiceProvider
{
Route::group([
'middleware' => 'web',
'namespace' => $this->namespace,
'namespace' => $this->namespace,
], function ($router) {
require base_path('routes/web.php');
});
@ -70,8 +70,8 @@ class RouteServiceProvider extends ServiceProvider
{
Route::group([
'middleware' => 'api',
'namespace' => $this->namespace,
'prefix' => 'api',
'namespace' => $this->namespace,
'prefix' => 'api',
], function ($router) {
require base_path('routes/api.php');
});

28
app/Queries/AdminDashboardQuery.php

@ -16,10 +16,11 @@ use Carbon\Carbon;
class AdminDashboardQuery
{
/**
* Get total money earned on an year
* Get total money earned on an year.
*
* @param string|integer $year
* @return integer Amount of earnings
* @param string|int $year
*
* @return int Amount of earnings
*/
public function totalEarnings($year)
{
@ -32,14 +33,16 @@ class AdminDashboardQuery
$totalEarnings -= $payment->amount;
}
}
return $totalEarnings;
}
/**
* Get number of projects that has been finished on a year
* Get number of projects that has been finished on a year.
*
* @param string|integer $year
* @return integer Number of finished projects
* @param string|int $year
*
* @return int Number of finished projects
*/
public function totalFinishedProjects($year)
{
@ -47,10 +50,11 @@ class AdminDashboardQuery
}
/**
* Get current outstanding customer payment amount
* Get current outstanding customer payment amount.
*
* @param string|int $year Year of queried payment records
*
* @param string|integer $year Year of queried payment records
* @return integer Amount of outstanding customer payment
* @return int Amount of outstanding customer payment
*/
public function currentOutstandingCustomerPayment($year)
{
@ -74,7 +78,7 @@ class AdminDashboardQuery
}
/**
* Get list of customer subscriptions that expires on next 60 days
* Get list of customer subscriptions that expires on next 60 days.
*
* @return \Illuminate\Support\Collection Collection of filtered subscriptions
*/
@ -91,9 +95,9 @@ class AdminDashboardQuery
}
/**
* Get on progress project jobs count
* Get on progress project jobs count.
*
* @return integer
* @return int
*/
public function onProgressJobCount()
{

9
app/Services/Facades/Option.php

@ -5,11 +5,14 @@ namespace App\Services\Facades;
use Illuminate\Support\Facades\Facade;
/**
* Option facade class
* Option facade class.
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
class Option extends Facade
{
protected static function getFacadeAccessor() { return 'option'; }
}
protected static function getFacadeAccessor()
{
return 'option';
}
}

3
app/Services/InvoiceDraft/InvoiceDraft.php

@ -35,7 +35,8 @@ class InvoiceDraft
unset($this->items[$itemKey]);
}
function empty() {
public function empty()
{
$this->items = [];
}

2
app/Services/InvoiceDraft/Item.php

@ -15,7 +15,7 @@ class Item
public function __construct(array $itemDetail)
{
$this->description = $itemDetail['description'];
$this->amount = $itemDetail['amount'];
$this->amount = $itemDetail['amount'];
}
public function updateAttribute(array $newItemData)

8
app/Services/Option.php

@ -5,13 +5,12 @@ namespace App\Services;
use App\Entities\Options\Option as SiteOption;
/**
* Option Class (Site Option Service)
* Option Class (Site Option Service).
*
* @author Nafies Luthfi <nafiesL@gmail.com>
*/
class Option
{
protected $option;
public function __construct()
@ -31,6 +30,7 @@ class Option
if ($option) {
return $option->value;
}
return $default;
}
@ -42,8 +42,8 @@ class Option
$option->value = $value;
$option->save();
} else {
$option = new SiteOption;
$option->key = $key;
$option = new SiteOption();
$option->key = $key;
$option->value = $value;
$option->save();
}

44
app/helpers.php

@ -1,9 +1,11 @@
<?php
/**
* Rupiah Format
* @param int $number money in integer format
* @return string money in string format
* Rupiah Format.
*
* @param int $number money in integer format
*
* @return string money in string format
*/
function formatNo($number)
{
@ -12,7 +14,9 @@ function formatNo($number)
function formatRp($number)
{
if ($number == 0) {return 'Rp. 0';}
if ($number == 0) {
return 'Rp. 0';
}
if ($number < 0) {
return '- Rp. '.formatNo(abs($number));
}
@ -26,11 +30,13 @@ function formatDecimal($number)
}
/**
* Delete button
* @param array $form_params Delete form attribute
* @param string $button_label Button text
* @param array $button_options Button option
* @return string Delete Button Form
* Delete button.
*
* @param array $form_params Delete form attribute
* @param string $button_label Button text
* @param array $button_options Button option
*
* @return string Delete Button Form
*/
function delete_button($form_params = [], $button_label = 'Delete', $button_options = [], $hiddenFields = [])
{
@ -61,14 +67,14 @@ function delete_button($form_params = [], $button_label = 'Delete', $button_opti
function formatDate($date)
{
if (!$date || $date == '0000-00-00') {
return null;
return;
}
$explodedDate = explode('-', $date);
if (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[0], $explodedDate[2])) {
return $explodedDate[2].'-'.$explodedDate[1].'-'.$explodedDate[0];
} else if (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[2], $explodedDate[0])) {
} elseif (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[2], $explodedDate[0])) {
return $explodedDate[2].'-'.$explodedDate[1].'-'.$explodedDate[0];
}
@ -85,6 +91,7 @@ function dateId($date)
if (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[2], $explodedDate[0])) {
$months = getMonths();
return $explodedDate[2].' '.$months[$explodedDate[1]].' '.$explodedDate[0];
}
@ -93,7 +100,7 @@ function dateId($date)
function monthNumber($number)
{
return str_pad($number, 2, "0", STR_PAD_LEFT);
return str_pad($number, 2, '0', STR_PAD_LEFT);
}
function monthId($monthNumber)
@ -104,6 +111,7 @@ function monthId($monthNumber)
$months = getMonths();
$monthNumber = monthNumber($monthNumber);
return $months[$monthNumber];
}
@ -131,6 +139,7 @@ function getYears()
foreach ($yearRange as $year) {
$years[$year] = $year;
}
return $years;
}
@ -179,11 +188,12 @@ function formatSizeUnits($bytes)
}
/**
* Overide Laravel Collective link_to_route helper function
* @param string $name Name of route
* @param string $title Text that displayed on view
* @param array $parameters URL Parameter
* @param array $attributes The anchor tag atributes
* Overide Laravel Collective link_to_route helper function.
*
* @param string $name Name of route
* @param string $title Text that displayed on view
* @param array $parameters URL Parameter
* @param array $attributes The anchor tag atributes
*/
function html_link_to_route($name, $title = null, $parameters = [], $attributes = [])
{

12
config/auth.php

@ -14,7 +14,7 @@ return [
*/
'defaults' => [
'guard' => 'web',
'guard' => 'web',
'passwords' => 'users',
],
@ -37,12 +37,12 @@ return [
'guards' => [
'web' => [
'driver' => 'session',
'driver' => 'session',
'provider' => 'users',
],
'api' => [
'driver' => 'token',
'driver' => 'token',
'provider' => 'users',
],
],
@ -67,7 +67,7 @@ return [
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => App\Entities\Users\User::class,
'model' => App\Entities\Users\User::class,
],
// 'users' => [
@ -98,8 +98,8 @@ return [
'passwords' => [
'users' => [
'provider' => 'users',
'table' => 'password_resets',
'expire' => 60,
'table' => 'password_resets',
'expire' => 60,
],
],

54
config/backup-manager.php

@ -6,7 +6,7 @@ return [
'root' => storage_path('app'),
],
's3' => [
'type' => 'AwsS3',
'type' => 'AwsS3',
'key' => '',
'secret' => '',
'region' => 'us-east-1',
@ -14,48 +14,48 @@ return [
'root' => '',
],
'gcs' => [
'type' => 'Gcs',
'type' => 'Gcs',
'key' => '',
'secret' => '',
'bucket' => '',
'root' => '',
],
'rackspace' => [
'type' => 'Rackspace',
'username' => '',
'key' => '',
'type' => 'Rackspace',
'username' => '',
'key' => '',
'container' => '',
'zone' => '',
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
'root' => '',
'zone' => '',
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
'root' => '',
],
'dropbox' => [
'type' => 'Dropbox',
'token' => '',
'key' => '',
'type' => 'Dropbox',
'token' => '',
'key' => '',
'secret' => '',
'app' => '',
'root' => '',
'app' => '',
'root' => '',
],
'ftp' => [
'type' => 'Ftp',
'host' => '',
'type' => 'Ftp',
'host' => '',
'username' => '',
'password' => '',
'port' => 21,
'passive' => true,
'ssl' => true,
'timeout' => 30,
'root' => '',
'port' => 21,
'passive' => true,
'ssl' => true,
'timeout' => 30,
'root' => '',
],
'sftp' => [
'type' => 'Sftp',
'host' => '',
'username' => '',
'password' => '',
'port' => 21,
'timeout' => 10,
'type' => 'Sftp',
'host' => '',
'username' => '',
'password' => '',
'port' => 21,
'timeout' => 10,
'privateKey' => '',
'root' => '',
'root' => '',
],
];

10
config/broadcasting.php

@ -29,17 +29,17 @@ return [
'connections' => [
'pusher' => [
'driver' => 'pusher',
'key' => env('PUSHER_KEY'),
'secret' => env('PUSHER_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'driver' => 'pusher',
'key' => env('PUSHER_KEY'),
'secret' => env('PUSHER_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
],
],
'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
],

10
config/cache.php

@ -37,8 +37,8 @@ return [
],
'database' => [
'driver' => 'database',
'table' => 'cache',
'driver' => 'database',
'table' => 'cache',
'connection' => null,
],
@ -51,15 +51,15 @@ return [
'driver' => 'memcached',
'servers' => [
[
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'weight' => 100,
],
],
],
'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
],

8
config/filesystems.php

@ -45,18 +45,18 @@ return [
'local' => [
'driver' => 'local',
'root' => storage_path('app'),
'root' => storage_path('app'),
],
'public' => [
'driver' => 'local',
'root' => storage_path('app/public'),
'driver' => 'local',
'root' => storage_path('app/public'),
'visibility' => 'public',
],
's3' => [
'driver' => 's3',
'key' => 'your-key',
'key' => 'your-key',
'secret' => 'your-secret',
'region' => 'your-region',
'bucket' => 'your-bucket',

2
database/factories/CustomerFactory.php

@ -1,11 +1,9 @@
<?php
use App\Entities\Agencies\Agency;
use App\Entities\Partners\Customer;
use Faker\Generator as Faker;
$factory->define(Customer::class, function (Faker $faker) {
return [
'name' => $faker->company,
];

2
database/factories/InvoiceFactory.php

@ -10,7 +10,7 @@ $factory->define(Invoice::class, function (Faker $faker) {
'project_id' => function () {
return factory(Project::class)->create()->id;
},
'number' => (new Invoice)->generateNewNumber(),
'number' => (new Invoice())->generateNewNumber(),
'items' => [],
'date' => '2010-10-10',
'amount' => 100000,

3
database/factories/ModelFactory.php

@ -17,7 +17,6 @@ $factory->define(User::class, function (Faker\Generator $faker) {
});
$factory->define(Job::class, function (Faker\Generator $faker) {
return [
'project_id' => function () {
return factory(Project::class)->create()->id;
@ -34,7 +33,6 @@ $factory->define(Job::class, function (Faker\Generator $faker) {
});
$factory->define(Task::class, function (Faker\Generator $faker) {
return [
'job_id' => function () {
return factory(Job::class)->create()->id;
@ -47,7 +45,6 @@ $factory->define(Task::class, function (Faker\Generator $faker) {
});
$factory->define(Event::class, function (Faker\Generator $faker) {
return [
'user_id' => function () {
return factory(User::class)->create()->id;

4
database/factories/PaymentFactory.php

@ -8,7 +8,6 @@ use App\Entities\Users\User;
use Faker\Generator as Faker;
$factory->define(Payment::class, function (Faker $faker) {
return [
'project_id' => function () {
return factory(Project::class)->create()->id;
@ -26,12 +25,10 @@ $factory->define(Payment::class, function (Faker $faker) {
});
$factory->state(Payment::class, 'customer', function (Faker $faker) {
return [];
});
$factory->state(Payment::class, 'vendor', function (Faker $faker) {
return [
'in_out' => 0,
'type_id' => 1,
@ -43,7 +40,6 @@ $factory->state(Payment::class, 'vendor', function (Faker $faker) {
});
$factory->state(Payment::class, 'fee', function (Faker $faker) {
return [
'in_out' => 0,
'type_id' => 1,

6
database/factories/ProjectFactory.php

@ -1,15 +1,13 @@
<?php
use App\Entities\Agencies\Agency;
use App\Entities\Partners\Customer;
use App\Entities\Projects\Project;
use Faker\Generator as Faker;
$factory->define(Project::class, function (Faker $faker) {
$proposalDate = $faker->dateTimeBetween('-1 year', '-1 month')->format('Y-m-d');
$startDate = Carbon::parse($proposalDate)->addDays(10);
$endDate = $startDate->addDays(rand(1, 13) * 7);
$startDate = Carbon::parse($proposalDate)->addDays(10);
$endDate = $startDate->addDays(rand(1, 13) * 7);
return [
'name' => $faker->sentence(3),

13
database/factories/SubscriptionFactory.php

@ -8,19 +8,18 @@ use Carbon\Carbon;
use Faker\Generator as Faker;
$factory->define(Subscription::class, function (Faker $faker) {
$startDate = Carbon::parse($faker->dateTimeBetween('-1 year', '-1 month')->format('Y-m-d'));
return [
'project_id' => function () {
return factory(Project::class)->create()->id;
},
'type_id' => 1,
'status_id' => 1,
'name' => 'www.'.str_random(10).'.com',
'price' => 125000,
'start_date' => $startDate->format('Y-m-d'),
'due_date' => $startDate->addYears(1)->format('Y-m-d'),
'type_id' => 1,
'status_id' => 1,
'name' => 'www.'.str_random(10).'.com',
'price' => 125000,
'start_date' => $startDate->format('Y-m-d'),
'due_date' => $startDate->addYears(1)->format('Y-m-d'),
'customer_id' => function () {
return factory(Customer::class)->create()->id;
},

1
database/factories/VendorFactory.php

@ -4,7 +4,6 @@ use App\Entities\Partners\Vendor;
use Faker\Generator as Faker;
$factory->define(Vendor::class, function (Faker $faker) {
return [
'name' => $faker->company,
];

5
database/migrations/2014_10_12_000000_create_users_table.php

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateUsersTable extends Migration
{
@ -12,8 +12,7 @@ class CreateUsersTable extends Migration
*/
public function up()
{
Schema::create('users', function (Blueprint $table)
{
Schema::create('users', function (Blueprint $table) {
$table->increments('id');
$table->string('name');
$table->string('email')->unique();

5
database/migrations/2014_10_12_100000_create_password_resets_table.php

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreatePasswordResetsTable extends Migration
{
@ -12,8 +12,7 @@ class CreatePasswordResetsTable extends Migration
*/
public function up()
{
Schema::create('password_resets', function (Blueprint $table)
{
Schema::create('password_resets', function (Blueprint $table) {
$table->string('email')->index();
$table->string('token')->index();
$table->timestamp('created_at');

5
database/migrations/2015_07_14_131409_create_site_options_table.php

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateSiteOptionsTable extends Migration
{
@ -12,8 +12,7 @@ class CreateSiteOptionsTable extends Migration
*/
public function up()
{
Schema::create('site_options', function (Blueprint $table)
{
Schema::create('site_options', function (Blueprint $table) {
$table->increments('id');
$table->string('key', 60)->index();
$table->string('value');

67
database/migrations/2016_07_06_110052_create_projects_table.php

@ -3,40 +3,37 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateProjectsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('projects', function(Blueprint $table)
{
$table->increments('id');
$table->string('name', 60);
$table->string('description')->nullable();
$table->date('proposal_date')->nullable();
$table->date('start_date')->nullable();
$table->date('end_date')->nullable();
$table->integer('project_value')->unsigned();
$table->integer('proposal_value')->unsigned()->nullable();
$table->boolean('status_id')->default(1)->comment('1: planned, 2: on progress, 3: done, 4: closed, 5: canceled, 6: on hold ');
$table->integer('customer_id')->unsigned();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('projects');
}
class CreateProjectsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('projects', function (Blueprint $table) {
$table->increments('id');
$table->string('name', 60);
$table->string('description')->nullable();
$table->date('proposal_date')->nullable();
$table->date('start_date')->nullable();
$table->date('end_date')->nullable();
$table->integer('project_value')->unsigned();
$table->integer('proposal_value')->unsigned()->nullable();
$table->boolean('status_id')->default(1)->comment('1: planned, 2: on progress, 3: done, 4: closed, 5: canceled, 6: on hold ');
$table->integer('customer_id')->unsigned();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('projects');
}
}

1
database/migrations/2016_07_08_182606_create_subscriptions_table.php

@ -37,5 +37,4 @@ class CreateSubscriptionsTable extends Migration
{
Schema::drop('subscriptions');
}
}

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save