Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 16:07:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6400 from turbo124/v5-develop

Browse Source 
Fixes for ghost company gateways
This commit is contained in:
David Bomba 2021-08-05 22:30:37 +10:00 committed by GitHub
commit a9694ad1ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Services/Client/PaymentMethod.php
View File

@ -74,6 +74,8 @@ class PaymentMethod
->company ->company
->company_gateways ->company_gateways
->whereIn('id', $transformed_ids) ->whereIn('id', $transformed_ids)
->where('is_deleted', false)
->whereNull('deleted_at')
->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa') ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa')
->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority ->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 return array_search($model->id, $transformed_ids);// this closure sorts for us
@ -85,6 +87,7 @@ class PaymentMethod
->company ->company
->company_gateways ->company_gateways
->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa') ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa')
->whereNull('deleted_at')
->where('is_deleted', false); ->where('is_deleted', false);
} }
@ -107,6 +110,8 @@ class PaymentMethod
->company ->company
->company_gateways ->company_gateways
->whereIn('id', $transformed_ids) ->whereIn('id', $transformed_ids)
->where('is_deleted', false)
->whereNull('deleted_at')
->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa') ->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa')
->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority ->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 return array_search($model->id, $transformed_ids);// this closure sorts for us
@ -118,6 +123,7 @@ class PaymentMethod
->company ->company
->company_gateways ->company_gateways
->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa') ->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa')
->whereNull('deleted_at')
->where('is_deleted', false); ->where('is_deleted', false);
} }