From ce0bcd494d7fe951bb429e3c59c6cb622d2fb3ed Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 21 Feb 2022 07:51:49 +1100 Subject: [PATCH] Revert for gateway query --- app/Services/Client/PaymentMethod.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Services/Client/PaymentMethod.php b/app/Services/Client/PaymentMethod.php index 4a18387d2215..f36fb2b2d3db 100644 --- a/app/Services/Client/PaymentMethod.php +++ b/app/Services/Client/PaymentMethod.php @@ -70,16 +70,16 @@ class PaymentMethod $transformed_ids = $this->transformKeys(explode(',', $company_gateways)); - $this->gateways = - CompanyGateway::with('gateway') - ->where('company_id', $this->client->company_id) + $this->gateways = $this->client + ->company + ->company_gateways ->whereIn('id', $transformed_ids) ->where('is_deleted', false) ->whereNull('deleted_at') ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa') ->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority return array_search($model->id, $transformed_ids);// this closure sorts for us - })->get(); + }); } else { @@ -105,15 +105,16 @@ class PaymentMethod $transformed_ids = $this->transformKeys(explode(',', $company_gateways)); - $this->gateways = CompanyGateway::with('gateway') - ->where('company_id', $this->client->company_id) + $this->gateways = $this->client + ->company + ->company_gateways ->whereIn('id', $transformed_ids) ->where('is_deleted', false) ->whereNull('deleted_at') ->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa') ->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority return array_search($model->id, $transformed_ids);// this closure sorts for us - })->get(); + }); } else {