From cbd6f212b50de93849acf7c4c29cec31e6e7330c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 18 Jan 2021 13:59:06 +1100 Subject: [PATCH] deprecate old getPaymentMethods() --- app/Http/Controllers/ClientPortal/InvoiceController.php | 2 +- app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php | 1 - app/Models/Client.php | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php index 1c6ee81eba1a..b7ced5d34948 100644 --- a/app/Http/Controllers/ClientPortal/InvoiceController.php +++ b/app/Http/Controllers/ClientPortal/InvoiceController.php @@ -123,7 +123,7 @@ class InvoiceController extends Controller //format totals $formatted_total = Number::formatMoney($total, auth()->user()->client); - $payment_methods = auth()->user()->client->getPaymentMethods($total); + $payment_methods = auth()->user()->client->service()->getPaymentMethods($total); $data = [ 'settings' => auth()->user()->client->getMergedSettings(), diff --git a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php index 6a4d06ab6297..059a26cf2a97 100644 --- a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php @@ -34,7 +34,6 @@ class UpdateTaskStatusRequest extends Request $rules = []; if ($this->input('name')) { - //$rules['name'] = 'unique:task_statuses,name,'.$this->id.',id,company_id,'.$this->task_status->company_id; $rules['name'] = Rule::unique('task_statuses')->where('company_id', auth()->user()->company()->id)->ignore($this->task_status->id); } diff --git a/app/Models/Client.php b/app/Models/Client.php index 6f079cd56860..09afcc4a86b5 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -433,6 +433,7 @@ class Client extends BaseModel implements HasLocalePreference * * @param float $amount The amount to be charged * @return array Array of payment labels and urls + * @deprecated 5.0.38 - see service()->getPaymentMethods($amount); */ public function getPaymentMethods($amount) :array {