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

Fixes for gateway fees

Browse Source
This commit is contained in:
Hillel Coren 2017-03-17 16:58:33 +02:00
parent 0f63ea782f
commit c68bbf252c
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -622,6 +622,7 @@ class InvoiceRepository extends BaseRepository
} }
} }
if (Auth::check()) {
if ($productKey = trim($item['product_key'])) { if ($productKey = trim($item['product_key'])) {
if ($account->update_products if ($account->update_products
&& ! $invoice->has_tasks && ! $invoice->has_tasks
@ -646,8 +647,9 @@ class InvoiceRepository extends BaseRepository
} }
} }
} }
}
$invoiceItem = InvoiceItem::createNew(); $invoiceItem = InvoiceItem::createNew($invoice);
$invoiceItem->fill($item); $invoiceItem->fill($item);
$invoiceItem->product_id = isset($product) ? $product->id : null; $invoiceItem->product_id = isset($product) ? $product->id : null;
$invoiceItem->product_key = isset($item['product_key']) ? (trim($invoice->is_recurring ? $item['product_key'] : Utils::processVariables($item['product_key']))) : ''; $invoiceItem->product_key = isset($item['product_key']) ? (trim($invoice->is_recurring ? $item['product_key'] : Utils::processVariables($item['product_key']))) : '';
@ -1043,6 +1045,7 @@ class InvoiceRepository extends BaseRepository
$data = $invoice->toArray(); $data = $invoice->toArray();
$data[$location] = 0; $data[$location] = 0;
$this->save($data, $invoice); $this->save($data, $invoice);
$invoice->load('invoice_items');
} }
} }
} }