Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 06:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reimplement fees and limits logic

Browse Source
This commit is contained in:
David Bomba 2020-07-07 23:23:47 +10:00
parent 83fc30f7e7
commit daa3cc2b68
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Models/Client.php
View File

@ -448,28 +448,30 @@ class Client extends BaseModel implements HasLocalePreference
if ($company_gateways) { if ($company_gateways) {
$gateways = $this->company->company_gateways->whereIn('id', $payment_gateways); //this will never hit $gateways = $this->company->company_gateways->whereIn('id', $payment_gateways); //this will never hit
} else { } else {
$gateways = $this->company->company_gateways; $gateways = $this->company->company_gateways->where('is_deleted', false);
} }
$gateways->filter(function ($method) use ($amount) { $valid_gateways = $gateways->filter(function ($method) use ($amount) {
$fees_and_limits = $method->fees_and_limits; if(isset($method->fees_and_limits))
$fees_and_limits = $method->fees_and_limits->{"1"};
if(!$fees_and_limits) else
return false; return true;
if ((property_exists($fees_and_limits, 'min_limit')) && $fees_and_limits->min_limit !== null && $amount < $fees_and_limits->min_limit) {
return false;
}
if ((property_exists($fees_and_limits, 'max_limit')) && $fees_and_limits->max_limit !== null && $amount > $fees_and_limits->min_limit) { if ((property_exists($fees_and_limits, 'min_limit')) && $fees_and_limits->min_limit !== null && $amount < $fees_and_limits->min_limit)
return false;
if ((property_exists($fees_and_limits, 'max_limit')) && $fees_and_limits->max_limit !== null && $amount > $fees_and_limits->min_limit)
return false; return false;
}
}); return true;
})->all();
$payment_methods = []; $payment_methods = [];
foreach ($gateways as $gateway) { foreach ($valid_gateways as $gateway) {
foreach ($gateway->driver($this)->gatewayTypes() as $type) { foreach ($gateway->driver($this)->gatewayTypes() as $type) {
$payment_methods[] = [$gateway->id => $type]; $payment_methods[] = [$gateway->id => $type];
} }