diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index 4219b6863c0d..05b9ee944f6a 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -465,7 +465,10 @@ class CompanySettings extends BaseSettings public $allow_billable_task_items = false; + public $show_task_item_description = false; + public static $casts = [ + 'show_task_item_description' => 'bool', 'allow_billable_task_items' => 'bool', 'accept_client_input_quote_approval' => 'bool', 'custom_sending_email' => 'string', diff --git a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php index 9061d57912d6..fcc52ae8c302 100644 --- a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php +++ b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php @@ -34,7 +34,7 @@ class StoreSchedulerRequest extends Request $rules = [ 'name' => ['bail', 'required', Rule::unique('schedulers')->where('company_id', auth()->user()->company()->id)], 'is_paused' => 'bail|sometimes|boolean', - 'frequency_id' => 'bail|required|integer|digits_between:1,12', + 'frequency_id' => 'bail|sometimes|integer|digits_between:1,12', 'next_run' => 'bail|required|date:Y-m-d|after_or_equal:today', 'next_run_client' => 'bail|sometimes|date:Y-m-d', 'template' => 'bail|required|string', diff --git a/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php b/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php index 02a5e69b5351..fab559b55bc4 100644 --- a/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php +++ b/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php @@ -30,7 +30,7 @@ class UpdateSchedulerRequest extends Request $rules = [ 'name' => ['bail', 'sometimes', Rule::unique('schedulers')->where('company_id', auth()->user()->company()->id)->ignore($this->task_scheduler->id)], 'is_paused' => 'bail|sometimes|boolean', - 'frequency_id' => 'bail|required|integer|digits_between:1,12', + 'frequency_id' => 'bail|sometimes|integer|digits_between:1,12', 'next_run' => 'bail|required|date:Y-m-d|after_or_equal:today', 'next_run_client' => 'bail|sometimes|date:Y-m-d', 'template' => 'bail|required|string', diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php index 83a1ced0c5fd..b15e78de4d2d 100644 --- a/app/PaymentDrivers/BaseDriver.php +++ b/app/PaymentDrivers/BaseDriver.php @@ -59,7 +59,6 @@ class BaseDriver extends AbstractPaymentDriver /* The Invitation */ public $invitation; - /* The client */ public $client; @@ -91,7 +90,7 @@ class BaseDriver extends AbstractPaymentDriver /** @var array */ public $required_fields = []; - public function __construct(CompanyGateway $company_gateway, ?Client $client = null, $invitation = false) + public function __construct(CompanyGateway $company_gateway, ?Client $client = null, $invitation = null) { $this->company_gateway = $company_gateway; $this->invitation = $invitation;