diff --git a/app/Factory/TaskStatusFactory.php b/app/Factory/TaskStatusFactory.php index fa564d4bb977..ffcff72af0dd 100644 --- a/app/Factory/TaskStatusFactory.php +++ b/app/Factory/TaskStatusFactory.php @@ -21,6 +21,7 @@ class TaskStatusFactory $task_status->user_id = $user_id; $task_status->company_id = $company_id; $task_status->name = ''; + $task_status->color = '#fff'; return $task_status; } diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php index 3eb8a885a886..0ae249cf8bee 100644 --- a/app/Http/Controllers/ClientPortal/InvoiceController.php +++ b/app/Http/Controllers/ClientPortal/InvoiceController.php @@ -119,7 +119,9 @@ class InvoiceController extends Controller 'hashed_ids' => $invoices->pluck('hashed_id'), 'total' => $total, ]; -nlog($data); + +// nlog($data); + return $this->render('invoices.payment', $data); } diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 4a75d6d0f46f..a986afc1a28a 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -508,10 +508,7 @@ class InvoiceController extends BaseController */ public function bulk() { - - /* - * WIP! - */ + $action = request()->input('action'); $ids = request()->input('ids'); diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php index 76e593f9da80..ccb9533a06ec 100644 --- a/app/Http/Controllers/TaskStatusController.php +++ b/app/Http/Controllers/TaskStatusController.php @@ -174,8 +174,11 @@ class TaskStatusController extends BaseController */ public function store(StoreTaskStatusRequest $request) { + nlog($request->all()); + $task_status = TaskStatusFactory::create(auth()->user()->company()->id, auth()->user()->id); $task_status->fill($request->all()); + $task_status->save(); return $this->itemResponse($task_status->fresh()); diff --git a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php index ec3e44f4675d..ca58e64a3372 100644 --- a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php @@ -32,6 +32,9 @@ class StoreTaskStatusRequest extends Request { $input = $this->all(); + if(array_key_exists('color', $input) && is_null($input['color'])) + $input['color'] = '#fff'; + $this->replace($input); } diff --git a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php index 0b0667a51c86..3b799d21e118 100644 --- a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php @@ -38,4 +38,14 @@ class UpdateTaskStatusRequest extends Request return $rules; } + + protected function prepareForValidation() + { + $input = $this->all(); + + if(array_key_exists('color', $input) && is_null($input['color'])) + $input['color'] = '#fff'; + + $this->replace($input); + } } diff --git a/app/Models/TaskStatus.php b/app/Models/TaskStatus.php index 915893e04b8e..d87d06fca47f 100644 --- a/app/Models/TaskStatus.php +++ b/app/Models/TaskStatus.php @@ -29,5 +29,10 @@ class TaskStatus extends BaseModel */ protected $dates = ['deleted_at']; - protected $fillable = ['name','color','status_order']; + protected $fillable = [ + 'name', + 'color', + 'status_order', + ]; + } diff --git a/app/Repositories/Migration/InvoiceMigrationRepository.php b/app/Repositories/Migration/InvoiceMigrationRepository.php index 832af28d8e44..9fff645bf7f0 100644 --- a/app/Repositories/Migration/InvoiceMigrationRepository.php +++ b/app/Repositories/Migration/InvoiceMigrationRepository.php @@ -97,7 +97,7 @@ class InvoiceMigrationRepository extends BaseRepository } foreach ($data['invitations'] as $invitation) { - nlog($invitation); + // nlog($invitation); $new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id); $new_invitation->{$lcfirst_resource_id} = $model->id; diff --git a/database/factories/TaskStatusFactory.php b/database/factories/TaskStatusFactory.php index a04d679d6888..babef656a9b0 100644 --- a/database/factories/TaskStatusFactory.php +++ b/database/factories/TaskStatusFactory.php @@ -31,6 +31,7 @@ class TaskStatusFactory extends Factory { return [ 'name' => $this->faker->text(7), + 'color' => '#fff', ]; } }