From 760e624ff652e895e13cfc1b51a419f8b7983e00 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 1 Aug 2025 07:45:13 +1000 Subject: [PATCH] Fixes for payment schedule model --- app/DataMapper/Schedule/PaymentSchedule.php | 3 ++- app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php | 3 ++- app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/DataMapper/Schedule/PaymentSchedule.php b/app/DataMapper/Schedule/PaymentSchedule.php index e5805370da..f7ee4960a9 100644 --- a/app/DataMapper/Schedule/PaymentSchedule.php +++ b/app/DataMapper/Schedule/PaymentSchedule.php @@ -14,9 +14,10 @@ class PaymentSchedule /** * * @var array( + * 'id' => int, * 'date' => string, * 'amount' => float, - * 'percentage' => float + * 'is_amount' => bool * ) */ public array $schedule = []; diff --git a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php index 6249bef1dc..e2acafe90f 100644 --- a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php +++ b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php @@ -75,9 +75,10 @@ class StoreSchedulerRequest extends Request 'parameters.invoice_id' => ['bail','sometimes', 'string', 'required_if:template,payment_schedule'], 'parameters.auto_bill' => ['bail','sometimes', 'boolean', 'required_if:template,payment_schedule'], 'parameters.schedule' => ['bail','sometimes', 'array', 'required_if:template,payment_schedule'], + 'parameters.schedule.*.id' => ['bail','sometimes', 'integer'], 'parameters.schedule.*.date' => ['bail','sometimes', 'date:Y-m-d'], 'parameters.schedule.*.amount' => ['bail','sometimes', 'numeric'], - 'parameters.schedule.*.percentage' => ['bail','sometimes', 'numeric'], + 'parameters.schedule.*.is_amount' => ['bail','sometimes', 'boolean'], ]; return $rules; diff --git a/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php b/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php index e04340614c..fa83cb0584 100644 --- a/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php +++ b/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php @@ -75,9 +75,10 @@ class UpdateSchedulerRequest extends Request 'parameters.invoice_id' => ['bail','sometimes', 'string', 'required_if:template,payment_schedule'], 'parameters.auto_bill' => ['bail','sometimes', 'boolean', 'required_if:template,payment_schedule'], 'parameters.schedule' => ['bail','sometimes', 'array', 'required_if:template,payment_schedule','min:1'], + 'parameters.schedule.*.id' => ['bail','sometimes', 'integer'], 'parameters.schedule.*.date' => ['bail','sometimes', 'date:Y-m-d'], 'parameters.schedule.*.amount' => ['bail','sometimes', 'numeric'], - 'parameters.schedule.*.percentage' => ['bail','sometimes', 'numeric'], + 'parameters.schedule.*.is_amount' => ['bail','sometimes', 'boolean'], ]; return $rules;