diff --git a/app/Http/Requests/CreatePaymentAPIRequest.php b/app/Http/Requests/CreatePaymentAPIRequest.php index 2643800d0d03..d00fbb44573b 100644 --- a/app/Http/Requests/CreatePaymentAPIRequest.php +++ b/app/Http/Requests/CreatePaymentAPIRequest.php @@ -27,14 +27,16 @@ class CreatePaymentAPIRequest extends PaymentRequest 'amount' => 'required', ]; } - - $invoice = Invoice::scope($this->invoice_id)->firstOrFail(); + + $invoice = Invoice::scope($this->invoice_id) + ->invoices() + ->firstOrFail(); $this->merge([ - 'invoice_id' => $invoice->id, + 'invoice_id' => $invoice->id, 'client_id' => $invoice->client->id, ]); - + $rules = [ 'amount' => "required|less_than:{$invoice->balance}|positive", ]; diff --git a/app/Http/Requests/CreatePaymentRequest.php b/app/Http/Requests/CreatePaymentRequest.php index ae1ed9f74eff..8fff4aec8ba2 100644 --- a/app/Http/Requests/CreatePaymentRequest.php +++ b/app/Http/Requests/CreatePaymentRequest.php @@ -22,7 +22,9 @@ class CreatePaymentRequest extends PaymentRequest public function rules() { $input = $this->input(); - $invoice = Invoice::scope($input['invoice'])->firstOrFail(); + $invoice = Invoice::scope($input['invoice']) + ->invoices() + ->firstOrFail(); $rules = [ 'client' => 'required', // TODO: change to client_id once views are updated