@@ -61,6 +61,10 @@ |
||
61 | 61 | }); |
62 | 62 | } |
63 | 63 | |
64 | + /** |
|
65 | + * @param string $title |
|
66 | + * @param string $message |
|
67 | + */ |
|
64 | 68 | static private function sendPushs($title, $message) |
65 | 69 | { |
66 | 70 | $clients = explode(';', config('app.gcm_key')); |
@@ -25,14 +25,14 @@ 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(); |
|
35 | + } ])->get(); |
|
36 | 36 | foreach ($employees as $employee) |
37 | 37 | self::sendEmployeeEmail($employee->email, $employee->meetings); |
38 | 38 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | */ |
43 | 43 | static private function sendCompanyEmail($email) |
44 | 44 | { |
45 | - \Mail::queue('emails.optimise.ok.company', [], function ($message) use ($email) { |
|
45 | + \Mail::queue('emails.optimise.ok.company', [ ], function($message) use ($email) { |
|
46 | 46 | $message->from(config('mail.from.address'), config('mail.from.name')); |
47 | 47 | $message->to($email)->subject('Meetings optimised'); |
48 | 48 | }); |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | */ |
55 | 55 | static private function sendEmployeeEmail($email, $meetings) |
56 | 56 | { |
57 | - self::sendPushs('New meeting scheduled', $meetings[0]['title'] . ' - ' . $meetings[0]['start_time']); |
|
58 | - \Mail::queue('emails.optimise.ok.employee', ['meetings' => $meetings], function ($message) use ($email) { |
|
57 | + self::sendPushs('New meeting scheduled', $meetings[ 0 ][ 'title' ].' - '.$meetings[ 0 ][ 'start_time' ]); |
|
58 | + \Mail::queue('emails.optimise.ok.employee', [ 'meetings' => $meetings ], function($message) use ($email) { |
|
59 | 59 | $message->from(config('mail.from.address'), config('mail.from.name')); |
60 | 60 | $message->to($email)->subject('Meetings of next week'); |
61 | 61 | }); |
@@ -73,8 +73,7 @@ discard block |
||
73 | 73 | { |
74 | 74 | // replace API |
75 | 75 | $registrationIds = array($to); |
76 | - $msg = array |
|
77 | - ( |
|
76 | + $msg = array( |
|
78 | 77 | 'message' => $message, |
79 | 78 | 'title' => $title, |
80 | 79 | 'vibrate' => 1, |
@@ -82,14 +81,12 @@ discard block |
||
82 | 81 | |
83 | 82 | // you can also add images, additionalData |
84 | 83 | ); |
85 | - $fields = array |
|
86 | - ( |
|
84 | + $fields = array( |
|
87 | 85 | 'registration_ids' => $registrationIds, |
88 | 86 | 'data' => $msg |
89 | 87 | ); |
90 | - $headers = array |
|
91 | - ( |
|
92 | - 'Authorization: key=' . config('app.gcm_key'), |
|
88 | + $headers = array( |
|
89 | + 'Authorization: key='.config('app.gcm_key'), |
|
93 | 90 | 'Content-Type: application/json' |
94 | 91 | ); |
95 | 92 | $ch = curl_init(); |