Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Code Issues Releases Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2022-07-20 15:12:47 +10:00
parent 138fb7afd4
commit 3251bbdc6a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Export/CSV/InvoiceItemExport.php
View File

@ -147,7 +147,12 @@ class InvoiceItemExport extends BaseExport
if(str_contains($key, "item.")){ if(str_contains($key, "item.")){
$key = str_replace("item.", "", $key); $key = str_replace("item.", "", $key);
$item_array[$key] = $item->{$key};
if(property_exists($item, $key))
$item_array[$key] = $item->{$key};
else
$item_array[$key] = '';
} }
} }

5
app/Models/CompanyGateway.php
View File

@ -301,11 +301,6 @@ class CompanyGateway extends BaseModel
$fee = $this->calcGatewayFee($amount, $gateway_type_id); $fee = $this->calcGatewayFee($amount, $gateway_type_id);
// if ($fee > 0) {
// $fee = Number::formatMoney(round($fee, 2), $client);
// $label = ' - '.$fee.' '.ctrans('texts.fee');
// }
if($fee > 0) { if($fee > 0) {
$fees_and_limits = $this->fees_and_limits->{$gateway_type_id}; $fees_and_limits = $this->fees_and_limits->{$gateway_type_id};