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

Revert Payment method getters

Browse Source
This commit is contained in:
David Bomba 2022-02-20 15:58:58 +11:00
parent 1b2a5fa09a
commit ea6905f4a0
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,26 +70,24 @@ class PaymentMethod
$transformed_ids = $this->transformKeys(explode(',', $company_gateways)); $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
$this->gateways = $this->client $this->gateways =
->company CompanyGateway::with('gateway')
->company_gateways ->where('company_id', $this->client->company_id)
->whereIn('id', $transformed_ids) ->whereIn('id', $transformed_ids)
->where('is_deleted', false) ->where('is_deleted', false)
->whereNull('deleted_at') ->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
}); })->get();
} else { } else {
$this->gateways = $this->client $this->gateways = CompanyGateway::with('gateway')
->company ->where('company_id', $this->client->company_id)
->company_gateways
->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa') ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa')
->whereNull('deleted_at') ->whereNull('deleted_at')
->where('is_deleted', false); ->where('is_deleted', false)->get();
} }
@ -107,25 +105,23 @@ class PaymentMethod
$transformed_ids = $this->transformKeys(explode(',', $company_gateways)); $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
$this->gateways = $this->client $this->gateways = CompanyGateway::with('gateway')
->company ->where('company_id', $this->client->company_id)
->company_gateways
->whereIn('id', $transformed_ids) ->whereIn('id', $transformed_ids)
->where('is_deleted', false) ->where('is_deleted', false)
->whereNull('deleted_at') ->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
}); })->get();
} else { } else {
$this->gateways = $this->client $this->gateways = CompanyGateway::with('gateway')
->company ->where('company_id', $this->client->company_id)
->company_gateways
->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa') ->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa')
->whereNull('deleted_at') ->whereNull('deleted_at')
->where('is_deleted', false); ->where('is_deleted', false)->get();
} }