Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 17:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hillelcoren/invoice-ninja

Browse Source
This commit is contained in:
Hillel Coren 2016-01-12 08:57:28 +02:00
commit 5dbdec43f3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/InvoiceApiController.php
View File

@ -1,6 +1,7 @@
<?php namespace App\Http\Controllers;
use Auth;
use Illuminate\Support\Facades\Log;
use Utils;
use Response;
use Input;
@ -51,9 +52,9 @@ class InvoiceApiController extends BaseAPIController
{
$paginator = Invoice::scope();
$invoices = Invoice::scope()
->with(array_merge(['invoice_items'], $this->getIncluded()))
->where('invoices.is_quote', '=', false)
->where('invoices.is_recurring', '=', false);
->with(array_merge(['invoice_items'], $this->getIncluded()));
// ->where('invoices.is_quote', '=', false)
// ->where('invoices.is_recurring', '=', false);
if ($clientPublicId = Input::get('client_id')) {
$filter = function($query) use ($clientPublicId) {