Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Fixes for the API

Browse Source
This commit is contained in:
Hillel Coren 2016-07-15 16:47:18 +03:00
parent 86c08f3af5
commit 36e50e7bcb
4 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/AccountApiController.php
View File

@ -34,12 +34,12 @@ class AccountApiController extends BaseAPIController
public function register(RegisterRequest $request)
{
$account = $this->accountRepo->create($request->first_name, $request->last_name, $request->email, $request->password);
$account = $this->accountRepo->create($request->first_name, $request->last_name, $request->email, $request->password);
$user = $account->users()->first();
Auth::login($user, true);
event(new UserSignedUp());
return $this->processLogin($request);
}
@ -71,9 +71,8 @@ class AccountApiController extends BaseAPIController
$account = Auth::user()->account;
$updatedAt = $request->updated_at ? date('Y-m-d H:i:s', $request->updated_at) : false;
$account->loadAllData($updatedAt);
$transformer = new AccountTransformer(null, $request->serializer);
$account->load($transformer->getDefaultIncludes());
$account = $this->createItem($account, $transformer, 'account');
return $this->response($account);

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

@ -87,16 +87,8 @@ class BaseAPIController extends Controller
$query->with($includes);
if ($updatedAt = Input::get('updated_at')) {
$updatedAt = date('Y-m-d H:i:s', $updatedAt);
$query->where(function($query) use ($includes, $updatedAt) {
$query->where('updated_at', '>=', $updatedAt);
foreach ($includes as $include) {
$query->orWhereHas($include, function($query) use ($updatedAt) {
$query->where('updated_at', '>=', $updatedAt);
});
}
});
if ($updatedAt = intval(Input::get('updated_at'))) {
$query->where('updated_at', '>=', date('Y-m-d H:i:s', $updatedAt));
}
if ($clientPublicId = Input::get('client_id')) {

26
app/Models/Account.php
View File

@ -998,32 +998,6 @@ class Account extends Eloquent
$this->save();
}
/**
* @param null $updatedAt
*/
public function loadAllData($updatedAt = null)
{
$map = [
'users' => [],
'clients' => ['contacts'],
'invoices' => ['invoice_items', 'user', 'client', 'payments'],
'products' => [],
'tax_rates' => [],
'expenses' => ['client', 'invoice', 'vendor'],
'payments' => ['invoice'],
'expense_categories' => [],
];
foreach ($map as $key => $values) {
$this->load([$key => function($query) use ($values, $updatedAt) {
$query->withTrashed()->with($values);
if ($updatedAt) {
$query->where('updated_at', '>=', $updatedAt);
}
}]);
}
}
/**
* @param bool $client
*/

2
app/Ninja/Transformers/AccountTransformer.php
View File

@ -13,7 +13,7 @@ class AccountTransformer extends EntityTransformer
protected $defaultIncludes = [
'users',
'products',
'taxRates',
'tax_rates',
'expense_categories'
];