From b14f8e2dfefb8c86d4a5be485a4e9f07c076fd38 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 2 Mar 2016 21:08:12 +1100 Subject: [PATCH 1/5] Bug fixes --- app/Services/PushService.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Services/PushService.php b/app/Services/PushService.php index 00591e263323..2e50fd586c2c 100644 --- a/app/Services/PushService.php +++ b/app/Services/PushService.php @@ -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!"; } From 50c5d52e08ebf0de6d2ddde43a7a5ed41e33ae48 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 2 Mar 2016 21:52:59 +1100 Subject: [PATCH 2/5] Bug Fixes --- app/Http/Controllers/AccountApiController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php index 5f34f267db7c..c42cfdeeec50 100644 --- a/app/Http/Controllers/AccountApiController.php +++ b/app/Http/Controllers/AccountApiController.php @@ -120,7 +120,8 @@ class AccountApiController extends BaseAPIController public function addDeviceToken(Request $request) { - $account = Auth::user()->account; + //$account = Auth::user()->account; + $account = Account::where('account_key', $request->account_key)->first(); //scan if this user has a token already registered (tokens can change, so we need to use the users email as key) $devices = json_decode($account->devices,TRUE); @@ -132,7 +133,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]); } } @@ -158,7 +159,8 @@ class AccountApiController extends BaseAPIController public function updatePushNotifications(Request $request) { - $account = Auth::user()->account; + //$account = Auth::user()->account; + $account = Account::where('account_key', $request->account_key)->first(); $devices = json_decode($account->devices, TRUE); From 8a33f6fec664c406c60087b7424f79b92572b838 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 2 Mar 2016 22:00:08 +1100 Subject: [PATCH 3/5] Bug Fixes --- app/Services/PushService.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Services/PushService.php b/app/Services/PushService.php index 2e50fd586c2c..e8d1176aebf8 100644 --- a/app/Services/PushService.php +++ b/app/Services/PushService.php @@ -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; } From 1d0c35ec76a59ff3e69b822cb7483fdb193b0295 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 2 Mar 2016 22:14:42 +1100 Subject: [PATCH 4/5] Bug Fixes --- app/Http/Controllers/AccountApiController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php index c42cfdeeec50..f0046d42e293 100644 --- a/app/Http/Controllers/AccountApiController.php +++ b/app/Http/Controllers/AccountApiController.php @@ -120,8 +120,8 @@ class AccountApiController extends BaseAPIController public function addDeviceToken(Request $request) { - //$account = Auth::user()->account; - $account = Account::where('account_key', $request->account_key)->first(); + $account = Auth::user()->account; + //$account = Account::where('account_key', $request->account_key)->first(); //scan if this user has a token already registered (tokens can change, so we need to use the users email as key) $devices = json_decode($account->devices,TRUE); @@ -159,8 +159,8 @@ class AccountApiController extends BaseAPIController public function updatePushNotifications(Request $request) { - //$account = Auth::user()->account; - $account = Account::where('account_key', $request->account_key)->first(); + $account = Auth::user()->account; + // $account = Account::where('account_key', $request->account_key)->first(); $devices = json_decode($account->devices, TRUE); From 6ff569a5a3d0997406dcb8c4245cb542c241f195 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 2 Mar 2016 22:16:06 +1100 Subject: [PATCH 5/5] Bug Fixes --- app/Http/Controllers/AccountApiController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php index f0046d42e293..5154370651f1 100644 --- a/app/Http/Controllers/AccountApiController.php +++ b/app/Http/Controllers/AccountApiController.php @@ -121,7 +121,6 @@ class AccountApiController extends BaseAPIController public function addDeviceToken(Request $request) { $account = Auth::user()->account; - //$account = Account::where('account_key', $request->account_key)->first(); //scan if this user has a token already registered (tokens can change, so we need to use the users email as key) $devices = json_decode($account->devices,TRUE); @@ -160,7 +159,6 @@ class AccountApiController extends BaseAPIController public function updatePushNotifications(Request $request) { $account = Auth::user()->account; - // $account = Account::where('account_key', $request->account_key)->first(); $devices = json_decode($account->devices, TRUE);