mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-03 08:14:35 -04:00
Fix for task status null color value
This commit is contained in:
parent
44c96aa71c
commit
2e499adea6
@ -21,6 +21,7 @@ class TaskStatusFactory
|
|||||||
$task_status->user_id = $user_id;
|
$task_status->user_id = $user_id;
|
||||||
$task_status->company_id = $company_id;
|
$task_status->company_id = $company_id;
|
||||||
$task_status->name = '';
|
$task_status->name = '';
|
||||||
|
$task_status->color = '#fff';
|
||||||
|
|
||||||
return $task_status;
|
return $task_status;
|
||||||
}
|
}
|
||||||
|
@ -119,7 +119,9 @@ class InvoiceController extends Controller
|
|||||||
'hashed_ids' => $invoices->pluck('hashed_id'),
|
'hashed_ids' => $invoices->pluck('hashed_id'),
|
||||||
'total' => $total,
|
'total' => $total,
|
||||||
];
|
];
|
||||||
nlog($data);
|
|
||||||
|
// nlog($data);
|
||||||
|
|
||||||
return $this->render('invoices.payment', $data);
|
return $this->render('invoices.payment', $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -508,10 +508,7 @@ class InvoiceController extends BaseController
|
|||||||
*/
|
*/
|
||||||
public function bulk()
|
public function bulk()
|
||||||
{
|
{
|
||||||
|
|
||||||
/*
|
|
||||||
* WIP!
|
|
||||||
*/
|
|
||||||
$action = request()->input('action');
|
$action = request()->input('action');
|
||||||
|
|
||||||
$ids = request()->input('ids');
|
$ids = request()->input('ids');
|
||||||
|
@ -174,8 +174,11 @@ class TaskStatusController extends BaseController
|
|||||||
*/
|
*/
|
||||||
public function store(StoreTaskStatusRequest $request)
|
public function store(StoreTaskStatusRequest $request)
|
||||||
{
|
{
|
||||||
|
nlog($request->all());
|
||||||
|
|
||||||
$task_status = TaskStatusFactory::create(auth()->user()->company()->id, auth()->user()->id);
|
$task_status = TaskStatusFactory::create(auth()->user()->company()->id, auth()->user()->id);
|
||||||
$task_status->fill($request->all());
|
$task_status->fill($request->all());
|
||||||
|
|
||||||
$task_status->save();
|
$task_status->save();
|
||||||
|
|
||||||
return $this->itemResponse($task_status->fresh());
|
return $this->itemResponse($task_status->fresh());
|
||||||
|
@ -32,6 +32,9 @@ class StoreTaskStatusRequest extends Request
|
|||||||
{
|
{
|
||||||
$input = $this->all();
|
$input = $this->all();
|
||||||
|
|
||||||
|
if(array_key_exists('color', $input) && is_null($input['color']))
|
||||||
|
$input['color'] = '#fff';
|
||||||
|
|
||||||
$this->replace($input);
|
$this->replace($input);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,4 +38,14 @@ class UpdateTaskStatusRequest extends Request
|
|||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function prepareForValidation()
|
||||||
|
{
|
||||||
|
$input = $this->all();
|
||||||
|
|
||||||
|
if(array_key_exists('color', $input) && is_null($input['color']))
|
||||||
|
$input['color'] = '#fff';
|
||||||
|
|
||||||
|
$this->replace($input);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,5 +29,10 @@ class TaskStatus extends BaseModel
|
|||||||
*/
|
*/
|
||||||
protected $dates = ['deleted_at'];
|
protected $dates = ['deleted_at'];
|
||||||
|
|
||||||
protected $fillable = ['name','color','status_order'];
|
protected $fillable = [
|
||||||
|
'name',
|
||||||
|
'color',
|
||||||
|
'status_order',
|
||||||
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -97,7 +97,7 @@ class InvoiceMigrationRepository extends BaseRepository
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach ($data['invitations'] as $invitation) {
|
foreach ($data['invitations'] as $invitation) {
|
||||||
nlog($invitation);
|
// nlog($invitation);
|
||||||
|
|
||||||
$new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id);
|
$new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id);
|
||||||
$new_invitation->{$lcfirst_resource_id} = $model->id;
|
$new_invitation->{$lcfirst_resource_id} = $model->id;
|
||||||
|
@ -31,6 +31,7 @@ class TaskStatusFactory extends Factory
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'name' => $this->faker->text(7),
|
'name' => $this->faker->text(7),
|
||||||
|
'color' => '#fff',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user