mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 00:11:35 +02:00
Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop
This commit is contained in:
commit
fbf618a226
@ -1,5 +1,6 @@
|
|||||||
<?php namespace App\Http\Controllers;
|
<?php namespace App\Http\Controllers;
|
||||||
|
|
||||||
|
use App\Http\Requests\ClientRequest;
|
||||||
use Response;
|
use Response;
|
||||||
use Input;
|
use Input;
|
||||||
use App\Models\Client;
|
use App\Models\Client;
|
||||||
@ -52,6 +53,31 @@ class ClientApiController extends BaseAPIController
|
|||||||
return $this->listResponse($clients);
|
return $this->listResponse($clients);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @SWG\Get(
|
||||||
|
* path="/clients/{client_id}",
|
||||||
|
* summary="Individual Client",
|
||||||
|
* tags={"client"},
|
||||||
|
* @SWG\Response(
|
||||||
|
* response=200,
|
||||||
|
* description="A single client",
|
||||||
|
* @SWG\Schema(type="object", @SWG\Items(ref="#/definitions/Client"))
|
||||||
|
* ),
|
||||||
|
* @SWG\Response(
|
||||||
|
* response="default",
|
||||||
|
* description="an ""unexpected"" error"
|
||||||
|
* )
|
||||||
|
* )
|
||||||
|
*/
|
||||||
|
|
||||||
|
public function show(ClientRequest $request)
|
||||||
|
{
|
||||||
|
return $this->itemResponse($request->entity());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @SWG\Post(
|
* @SWG\Post(
|
||||||
* path="/clients",
|
* path="/clients",
|
||||||
|
@ -23,8 +23,8 @@ class DashboardApiController extends BaseAPIController
|
|||||||
|
|
||||||
$dashboardRepo = $this->dashboardRepo;
|
$dashboardRepo = $this->dashboardRepo;
|
||||||
$metrics = $dashboardRepo->totals($accountId, $userId, $viewAll);
|
$metrics = $dashboardRepo->totals($accountId, $userId, $viewAll);
|
||||||
$paidToDate = $dashboardRepo->paidToDate($account, $userId, $viewAll);
|
$paidToDate = $dashboardRepo->paidToDate($user->account, $userId, $viewAll);
|
||||||
$averageInvoice = $dashboardRepo->averages($account, $userId, $viewAll);
|
$averageInvoice = $dashboardRepo->averages($user->account, $userId, $viewAll);
|
||||||
$balances = $dashboardRepo->balances($accountId, $userId, $viewAll);
|
$balances = $dashboardRepo->balances($accountId, $userId, $viewAll);
|
||||||
$activities = $dashboardRepo->activities($accountId, $userId, $viewAll);
|
$activities = $dashboardRepo->activities($accountId, $userId, $viewAll);
|
||||||
$pastDue = $dashboardRepo->pastDue($accountId, $userId, $viewAll);
|
$pastDue = $dashboardRepo->pastDue($accountId, $userId, $viewAll);
|
||||||
|
Loading…
Reference in New Issue
Block a user