@@ -49,6 +49,10 @@ discard block |
||
49 | 49 | }); |
50 | 50 | } |
51 | 51 | |
52 | + /** |
|
53 | + * @param string $title |
|
54 | + * @param string $message |
|
55 | + */ |
|
52 | 56 | static private function sendPushs($title, $message, $additionalData = '') |
53 | 57 | { |
54 | 58 | $clients = explode(';', config('app.gcm_clients')); |
@@ -58,6 +62,9 @@ discard block |
||
58 | 62 | //self::sendPushNotification($clients, $message, $title); |
59 | 63 | } |
60 | 64 | |
65 | + /** |
|
66 | + * @param string $additionalData |
|
67 | + */ |
|
61 | 68 | static private function sendPushNotification($to, $message, $title, $additionalData) |
62 | 69 | { |
63 | 70 | // replace API |
@@ -25,15 +25,15 @@ discard block |
||
25 | 25 | public function handle(OkEvent $event) |
26 | 26 | { |
27 | 27 | // |
28 | - \Log::info('Meeting correctly optimised (company id = ' . $event->getCompany()->id . ')'); |
|
28 | + \Log::info('Meeting correctly optimised (company id = '.$event->getCompany()->id.')'); |
|
29 | 29 | $company = $event->getCompany()->fresh(); |
30 | 30 | //send email to company |
31 | 31 | self::sendCompanyEmail($company->email); |
32 | 32 | //send emails to employees |
33 | - $employees = $company->employees()->with(['meetings'=>function($query){ |
|
33 | + $employees = $company->employees()->with([ 'meetings'=>function($query) { |
|
34 | 34 | $query->where('start_time', '>=', new \DateTime()); |
35 | - }])->get(); |
|
36 | - self::sendPushs('New meeting scheduled', $employees->get(0)->meetings->get(0)['title'] . ' - ' . $employees->get(0)->meetings->get(0)['start_time'], $employees->get(0)->meetings->get(0)['id']); |
|
35 | + } ])->get(); |
|
36 | + self::sendPushs('New meeting scheduled', $employees->get(0)->meetings->get(0)[ 'title' ].' - '.$employees->get(0)->meetings->get(0)[ 'start_time' ], $employees->get(0)->meetings->get(0)[ 'id' ]); |
|
37 | 37 | foreach ($employees as $employee) |
38 | 38 | self::sendEmployeeEmail($employee->email, $employee->meetings); |
39 | 39 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | */ |
44 | 44 | static private function sendCompanyEmail($email) |
45 | 45 | { |
46 | - \Mail::queue('emails.optimise.ok.company', [], function ($message) use ($email) { |
|
46 | + \Mail::queue('emails.optimise.ok.company', [ ], function($message) use ($email) { |
|
47 | 47 | $message->from(config('mail.from.address'), config('mail.from.name')); |
48 | 48 | $message->to($email)->subject('Meetings optimised'); |
49 | 49 | }); |
@@ -63,8 +63,7 @@ discard block |
||
63 | 63 | // replace API |
64 | 64 | //\Log::info('GCM registration id: ' . $to); |
65 | 65 | $registrationIds = array($to); |
66 | - $msg = array |
|
67 | - ( |
|
66 | + $msg = array( |
|
68 | 67 | 'message' => $message, |
69 | 68 | 'title' => $title, |
70 | 69 | 'vibrate' => 1, |
@@ -73,14 +72,12 @@ discard block |
||
73 | 72 | |
74 | 73 | // you can also add images, additionalData |
75 | 74 | ); |
76 | - $fields = array |
|
77 | - ( |
|
75 | + $fields = array( |
|
78 | 76 | 'registration_ids' => $registrationIds, |
79 | 77 | 'data' => $msg |
80 | 78 | ); |
81 | - $headers = array |
|
82 | - ( |
|
83 | - 'Authorization: key=' . config('app.gcm_key'), |
|
79 | + $headers = array( |
|
80 | + 'Authorization: key='.config('app.gcm_key'), |
|
84 | 81 | 'Content-Type: application/json' |
85 | 82 | ); |
86 | 83 | $ch = curl_init(); |
@@ -93,7 +90,7 @@ discard block |
||
93 | 90 | $result = curl_exec($ch); |
94 | 91 | curl_close($ch); |
95 | 92 | //echo $result; |
96 | - \Log::info('GCM results: ' . $result); |
|
93 | + \Log::info('GCM results: '.$result); |
|
97 | 94 | } |
98 | 95 | |
99 | 96 | /** |
@@ -102,7 +99,7 @@ discard block |
||
102 | 99 | */ |
103 | 100 | static private function sendEmployeeEmail($email, $meetings) |
104 | 101 | { |
105 | - \Mail::queue('emails.optimise.ok.employee', ['meetings' => $meetings], function ($message) use ($email) { |
|
102 | + \Mail::queue('emails.optimise.ok.employee', [ 'meetings' => $meetings ], function($message) use ($email) { |
|
106 | 103 | $message->from(config('mail.from.address'), config('mail.from.name')); |
107 | 104 | $message->to($email)->subject('Meetings of next week'); |
108 | 105 | }); |