1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-22 09:21:34 +02:00

Merge invoice document/api fix to master

This commit is contained in:
Hillel Coren 2016-10-25 13:30:28 +03:00
parent bf19a77053
commit 8e6113dad0

View File

@ -484,7 +484,8 @@ class InvoiceRepository extends BaseRepository
$invoice->invoice_items()->forceDelete(); $invoice->invoice_items()->forceDelete();
} }
$document_ids = !empty($data['document_ids'])?array_map('intval', $data['document_ids']):[];; if ( ! empty($data['document_ids'])) {
$document_ids = array_map('intval', $data['document_ids']);
foreach ($document_ids as $document_id){ foreach ($document_ids as $document_id){
$document = Document::scope($document_id)->first(); $document = Document::scope($document_id)->first();
if($document && Auth::user()->can('edit', $document)){ if($document && Auth::user()->can('edit', $document)){
@ -513,6 +514,7 @@ class InvoiceRepository extends BaseRepository
} }
} }
} }
}
foreach ($data['invoice_items'] as $item) { foreach ($data['invoice_items'] as $item) {
$item = (array) $item; $item = (array) $item;