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

Fix for LimitsAndFees regression (#3580)

Browse Source 
* Fixes for migration

* Fix regression
This commit is contained in:
David Bomba 2020-04-02 11:17:30 +11:00 committed by GitHub
parent 25c662c734
commit aefa6749af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
View File

@ -84,48 +84,20 @@ trait CompanyGatewayFeesAndLimitsSaver
{ {
$new_arr = []; $new_arr = [];
if(!is_array($fees_and_limits))
return $new_arr;
$fal = new FeesAndLimits;
foreach ($fees_and_limits as $key => $value) { foreach ($fees_and_limits as $key => $value) {
$fal = new FeesAndLimits;
$key = $this->transformFeesAndLimitsKeys($key); foreach ($value as $k => $v) {
$fal->{$k} = $v;
$fal->{$key} = BaseSettings::castAttribute(FeesAndLimits::$casts[$key], $value); $fal->{$k} = BaseSettings::castAttribute(FeesAndLimits::$casts[$k], $v);
}
$new_arr[$key] = (array)$fal;
} }
return $fal; return $new_arr;
} }
private function transformFeesAndLimitsKeys($key)
{
switch ($key) {
case 'tax_name1':
return 'fee_tax_name1';
break;
case 'tax_name2':
return 'fee_tax_name2';
break;
case 'tax_name3':
return 'fee_tax_name3';
break;
case 'tax_rate1':
return 'fee_tax_rate1';
break;
case 'tax_rate2':
return 'fee_tax_rate2';
break;
case 'tax_rate3':
return 'fee_tax_rate3';
break;
default:
return $key;
break;
}
}
} }