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

Merge pull request #900 from turbo124/develop

Browse Source 
Develop
This commit is contained in:
David Bomba 2016-06-01 21:39:36 +10:00
commit 2a39fee1c6
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ class DashboardApiController extends BaseAPIController
{ {
public function index() public function index()
{ {
$view_all = !Auth::user()->hasPermission('view_all'); $view_all = Auth::user()->hasPermission('view_all');
$user_id = Auth::user()->id; $user_id = Auth::user()->id;
// total_income, billed_clients, invoice_sent and active_clients // total_income, billed_clients, invoice_sent and active_clients
@ -157,13 +157,12 @@ class DashboardApiController extends BaseAPIController
$hasQuotes = false; $hasQuotes = false;
foreach ([$upcoming, $pastDue] as $data) { foreach ([$upcoming, $pastDue] as $data) {
foreach ($data as $invoice) { foreach ($data as $invoice) {
if ($invoice->isType(INVOICE_TYPE_QUOTE)) { if ($invoice->invoice_type_id == INVOICE_TYPE_QUOTE) {
$hasQuotes = true; $hasQuotes = true;
} }
} }
} }
$data = [ $data = [
'id' => 1, 'id' => 1,
'paidToDate' => $paidToDate[0]->value ? $paidToDate[0]->value : 0, 'paidToDate' => $paidToDate[0]->value ? $paidToDate[0]->value : 0,

1
app/Http/Controllers/DocumentAPIController.php
View File

@ -33,6 +33,7 @@ class DocumentAPIController extends BaseAPIController
public function store(CreateDocumentRequest $request) public function store(CreateDocumentRequest $request)
{ {
$document = $this->documentRepo->upload($request->all()); $document = $this->documentRepo->upload($request->all());
return $this->itemResponse($document); return $this->itemResponse($document);

3
app/Ninja/Transformers/DocumentTransformer.php
View File

@ -14,6 +14,7 @@ class DocumentTransformer extends EntityTransformer
'type' => $document->type, 'type' => $document->type,
'invoice_id' => isset($document->invoice->public_id) ? (int) $document->invoice->public_id : null, 'invoice_id' => isset($document->invoice->public_id) ? (int) $document->invoice->public_id : null,
'expense_id' => isset($document->expense->public_id) ? (int) $document->expense->public_id : null, 'expense_id' => isset($document->expense->public_id) ? (int) $document->expense->public_id : null,
'updated_at' => $this->getTimestamp($document->updated_at),
]); ]);
} }
} }