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

Merge pull request #746 from turbo124/develop

Browse Source 
Bug Fixes
This commit is contained in:
David Bomba 2016-03-02 22:17:25 +11:00
commit 01ca591026
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ class AccountApiController extends BaseAPIController
$devices[$x]['token'] = $request->token; //update
$account->devices = json_encode($devices);
$account->save();
return $this->response($account);
return $this->response($devices[$x]);
}
}

22
app/Services/PushService.php
View File

@ -51,7 +51,7 @@ class PushService
foreach($devices as $device)
{
if(($device["notify_{$type}"] == TRUE) && ($device['device'] == 'ios'))
$this->pushMessage($invoice, $device['token'], $device["notify_{$type}"]);
$this->pushMessage($invoice, $device['token'], $type);
}
@ -104,19 +104,19 @@ class PushService
{
switch($type)
{
case 'notify_sent':
case 'sent':
return $this->entitySentMessage($invoice);
break;
case 'notify_paid':
case 'paid':
return $this->invoicePaidMessage($invoice);
break;
case 'notify_approved':
case 'approved':
return $this->quoteApprovedMessage($invoice);
break;
case 'notify_viewed':
case 'viewed':
return $this->entityViewedMessage($invoice);
break;
}
@ -129,9 +129,9 @@ class PushService
private function entitySentMessage($invoice)
{
if($invoice->is_quote)
return 'Quote #{$invoice->invoice_number} sent!';
return "Quote #{$invoice->invoice_number} sent!";
else
return 'Invoice #{$invoice->invoice_number} sent!';
return "Invoice #{$invoice->invoice_number} sent";
}
@ -141,7 +141,7 @@ class PushService
*/
private function invoicePaidMessage($invoice)
{
return 'Invoice #{$invoice->invoice_number} paid!';
return "Invoice #{$invoice->invoice_number} paid!";
}
/**
@ -150,7 +150,7 @@ class PushService
*/
private function quoteApprovedMessage($invoice)
{
return 'Quote #{$invoice->invoice_number} approved!';
return "Quote #{$invoice->invoice_number} approved!";
}
/**
@ -160,9 +160,9 @@ class PushService
private function entityViewedMessage($invoice)
{
if($invoice->is_quote)
return 'Quote #{$invoice->invoice_number} viewed!';
return "Quote #{$invoice->invoice_number} viewed!";
else
return 'Invoice #{$invoice->invoice_number} viewed!';
return "Invoice #{$invoice->invoice_number} viewed!";
}