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 parsing product cost

Browse Source
This commit is contained in:
Hillel Coren 2018-02-14 19:58:48 +02:00
parent 060d0cab8d
commit 116bc07e9a
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/InvoiceController.php
View File

@ -372,14 +372,10 @@ class InvoiceController extends BaseController
$action = Input::get('action'); $action = Input::get('action');
$entityType = Input::get('entityType'); $entityType = Input::get('entityType');
if (config('ninja.lock_sent_invoices')) { $invoice = $this->invoiceService->save($data, $request->entity());
$invoice = $request->entity(); $entityType = $invoice->getEntityType();
} else { $message = trans("texts.updated_{$entityType}");
$invoice = $this->invoiceService->save($data, $request->entity()); Session::flash('message', $message);
$entityType = $invoice->getEntityType();
$message = trans("texts.updated_{$entityType}");
Session::flash('message', $message);
}
if ($action == 'clone_invoice') { if ($action == 'clone_invoice') {
return url(sprintf('invoices/%s/clone', $invoice->public_id)); return url(sprintf('invoices/%s/clone', $invoice->public_id));

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

@ -742,7 +742,7 @@ class InvoiceRepository extends BaseRepository
if ($product && (Auth::user()->can('edit', $product))) { if ($product && (Auth::user()->can('edit', $product))) {
$product->notes = ($task || $expense) ? '' : $item['notes']; $product->notes = ($task || $expense) ? '' : $item['notes'];
if (! $account->convert_products) { if (! $account->convert_products) {
$product->cost = $expense ? 0 : $item['cost']; $product->cost = $expense ? 0 : Utils::parseFloat($item['cost']);
} }
$product->tax_name1 = isset($item['tax_name1']) ? $item['tax_name1'] : null; $product->tax_name1 = isset($item['tax_name1']) ? $item['tax_name1'] : null;
$product->tax_rate1 = isset($item['tax_rate1']) ? $item['tax_rate1'] : 0; $product->tax_rate1 = isset($item['tax_rate1']) ? $item['tax_rate1'] : 0;