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 branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2016-03-03 21:39:27 +02:00
commit 747f199ce8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,6 +132,8 @@ class AccountApiController extends BaseAPIController
$devices[$x]['token'] = $request->token; //update $devices[$x]['token'] = $request->token; //update
$account->devices = json_encode($devices); $account->devices = json_encode($devices);
$account->save(); $account->save();
$devices[$x]['account_key'] = $account->account_key;
return $this->response($devices[$x]); return $this->response($devices[$x]);
} }
} }
@ -142,6 +144,7 @@ class AccountApiController extends BaseAPIController
'token' => $request->token, 'token' => $request->token,
'email' => $request->email, 'email' => $request->email,
'device' => $request->device, 'device' => $request->device,
'account_key' => $account->account_key,
'notify_sent' => TRUE, 'notify_sent' => TRUE,
'notify_viewed' => TRUE, 'notify_viewed' => TRUE,
'notify_approved' => TRUE, 'notify_approved' => TRUE,
@ -174,15 +177,16 @@ class AccountApiController extends BaseAPIController
'token' => $devices[$x]['token'], 'token' => $devices[$x]['token'],
'email' => $devices[$x]['email'], 'email' => $devices[$x]['email'],
'device' => $devices[$x]['device'], 'device' => $devices[$x]['device'],
'account_key' => $account->account_key,
'notify_sent' => $request->notify_sent, 'notify_sent' => $request->notify_sent,
'notify_viewed' => $request->notify_viewed, 'notify_viewed' => $request->notify_viewed,
'notify_approved' => $request->notify_approved, 'notify_approved' => $request->notify_approved,
'notify_paid' => $request->notify_paid, 'notify_paid' => $request->notify_paid,
]; ];
unset($devices[$x]); //unset($devices[$x]);
$devices[] = $newDevice; $devices[$x] = $newDevice;
$account->devices = json_encode($devices); $account->devices = json_encode($devices);
$account->save(); $account->save();