@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | */ |
19 | 19 | public function postEmail(SheduleEmail $tasks) : void |
20 | 20 | { |
21 | - Mail::raw($tasks->email->text, function ($message) use ($tasks) { |
|
21 | + Mail::raw($tasks->email->text, function ($message) use ($tasks) { |
|
22 | 22 | $message->subject($tasks->email->theme); |
23 | 23 | $message->from(config('mail.from.address')); |
24 | 24 | $message->to(config('mail.from.address')); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | $tasks->email->users->each(function ($value) use ($message) { |
27 | 27 | $message->bcc($value->email); |
28 | 28 | }); |
29 | - }); |
|
29 | + }); |
|
30 | 30 | |
31 | 31 | // if to reached the sender |
32 | 32 | if (empty(Mail::failures())) { |
@@ -21,7 +21,7 @@ |
||
21 | 21 | 'email' => 'Email пользователя', |
22 | 22 | 'name' => 'Имя пользователя', |
23 | 23 | |
24 | - // transformer |
|
24 | + // transformer |
|
25 | 25 | 'status_action.1' => 'Сделано', |
26 | 26 | 'status_action.0' => 'В процессе', |
27 | 27 |
@@ -1,16 +1,16 @@ |
||
1 | 1 | <?php |
2 | 2 | return [ |
3 | - // CreateTaskRequest |
|
4 | - 'createTask.date.required' => 'Field date is required', |
|
5 | - 'createTask.date.date_format' => 'Field date format date Y-m-d H:i:s', |
|
6 | - 'createTask.theme.required' => 'Field theme is required', |
|
7 | - 'createTask.text.required' => 'Field text is required', |
|
8 | - 'createTask.mode.required' => 'Field mode is required', |
|
9 | - 'createTask.mode.exists' => 'Field mode is not exist in table', |
|
10 | - 'createTask.users.required' => 'Field users is required', |
|
11 | - 'createTask.users.array' => 'Field users is many', |
|
12 | - 'createTask.users.*.required' => 'Field users is required', |
|
13 | - 'createTask.users.*.exists' => 'Field users is not exist in table', |
|
3 | + // CreateTaskRequest |
|
4 | + 'createTask.date.required' => 'Field date is required', |
|
5 | + 'createTask.date.date_format' => 'Field date format date Y-m-d H:i:s', |
|
6 | + 'createTask.theme.required' => 'Field theme is required', |
|
7 | + 'createTask.text.required' => 'Field text is required', |
|
8 | + 'createTask.mode.required' => 'Field mode is required', |
|
9 | + 'createTask.mode.exists' => 'Field mode is not exist in table', |
|
10 | + 'createTask.users.required' => 'Field users is required', |
|
11 | + 'createTask.users.array' => 'Field users is many', |
|
12 | + 'createTask.users.*.required' => 'Field users is required', |
|
13 | + 'createTask.users.*.exists' => 'Field users is not exist in table', |
|
14 | 14 | |
15 | 15 | |
16 | 16 | ]; |
17 | 17 | \ No newline at end of file |
@@ -1,16 +1,16 @@ |
||
1 | 1 | <?php |
2 | 2 | return [ |
3 | - // CreateTaskRequest |
|
4 | - 'createTask.date.required' => 'Поле дата обязательно', |
|
5 | - 'createTask.date.date_format' => 'Формат даты должен быть Y-m-d H:i:s', |
|
6 | - 'createTask.theme.required' => 'Поле тема обязательно', |
|
7 | - 'createTask.text.required' => 'Поле текст обязательно', |
|
8 | - 'createTask.mode.required' => 'Поле тип отправки обязательно', |
|
9 | - 'createTask.mode.exists' => 'Тип отправки не найден в таблице', |
|
10 | - 'createTask.users.required' => 'Не меньше одного пользователя', |
|
11 | - 'createTask.users.array' => 'Поле пользователи должен быть массивом', |
|
12 | - 'createTask.users.*.required' => 'Не меньше одного пользователя', |
|
13 | - 'createTask.users.*.exists' => 'Пользователь не найден в таблице', |
|
3 | + // CreateTaskRequest |
|
4 | + 'createTask.date.required' => 'Поле дата обязательно', |
|
5 | + 'createTask.date.date_format' => 'Формат даты должен быть Y-m-d H:i:s', |
|
6 | + 'createTask.theme.required' => 'Поле тема обязательно', |
|
7 | + 'createTask.text.required' => 'Поле текст обязательно', |
|
8 | + 'createTask.mode.required' => 'Поле тип отправки обязательно', |
|
9 | + 'createTask.mode.exists' => 'Тип отправки не найден в таблице', |
|
10 | + 'createTask.users.required' => 'Не меньше одного пользователя', |
|
11 | + 'createTask.users.array' => 'Поле пользователи должен быть массивом', |
|
12 | + 'createTask.users.*.required' => 'Не меньше одного пользователя', |
|
13 | + 'createTask.users.*.exists' => 'Пользователь не найден в таблице', |
|
14 | 14 | |
15 | 15 | |
16 | 16 | ]; |
17 | 17 | \ No newline at end of file |
@@ -20,8 +20,8 @@ discard block |
||
20 | 20 | public function index() : Collection |
21 | 21 | { |
22 | 22 | $preData = SheduleEmail::with(['email.users', 'mode'])->get()->map(function ($value) { |
23 | - $value->status_action_human = $value->status_action_human; |
|
24 | - return $value; |
|
23 | + $value->status_action_human = $value->status_action_human; |
|
24 | + return $value; |
|
25 | 25 | }); |
26 | 26 | |
27 | 27 | return $preData; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | public function formColumn() |
76 | 76 | { |
77 | 77 | $forms = [ |
78 | - 'date' => [ |
|
78 | + 'date' => [ |
|
79 | 79 | 'label' => trans('postman::dashboard.date'), |
80 | 80 | 'rule' => [ |
81 | 81 | 'required'=> true, 'message'=> 'Please input Activity name', 'trigger'=> 'blur', |
@@ -100,12 +100,12 @@ discard block |
||
100 | 100 | 'cancel' => trans('postman::dashboard.form.button.cancel'), |
101 | 101 | ], |
102 | 102 | 'popup' => [ |
103 | - 'question' => trans('postman::dashboard.popup.question'), |
|
104 | - 'title' => trans('postman::dashboard.popup.title'), |
|
105 | - 'confirmButtonText' => trans('postman::dashboard.popup.confirmButtonText'), |
|
106 | - 'cancelButtonText' => trans('postman::dashboard.popup.cancelButtonText'), |
|
107 | - 'success.message' => trans('postman::dashboard.popup.success.message'), |
|
108 | - 'info.message' => trans('postman::dashboard.popup.info.message'), |
|
103 | + 'question' => trans('postman::dashboard.popup.question'), |
|
104 | + 'title' => trans('postman::dashboard.popup.title'), |
|
105 | + 'confirmButtonText' => trans('postman::dashboard.popup.confirmButtonText'), |
|
106 | + 'cancelButtonText' => trans('postman::dashboard.popup.cancelButtonText'), |
|
107 | + 'success.message' => trans('postman::dashboard.popup.success.message'), |
|
108 | + 'info.message' => trans('postman::dashboard.popup.info.message'), |
|
109 | 109 | ], |
110 | 110 | ]; |
111 | 111 |
@@ -13,7 +13,7 @@ |
||
13 | 13 | { |
14 | 14 | public static function parse() : void |
15 | 15 | { |
16 | - SheduleEmail::whereRaw('CAST(date AS Datetime) <= ? AND status_action = ?', [Carbon::now(), 0])->get() |
|
16 | + SheduleEmail::whereRaw('CAST(date AS Datetime) <= ? AND status_action = ?', [Carbon::now(), 0])->get() |
|
17 | 17 | ->each(function ($value) { |
18 | 18 | $value->mode->owner->postEmail($value); |
19 | 19 | }); |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | return [ |
3 | 3 | 'switcher' => true, |
4 | - /* |
|
4 | + /* |
|
5 | 5 | |-------------------------------------------------------------------------- |
6 | 6 | | List modes classes |
7 | 7 | |-------------------------------------------------------------------------- |
@@ -17,9 +17,9 @@ discard block |
||
17 | 17 | |-------------------------------------------------------------------------- |
18 | 18 | | Set middleware |
19 | 19 | */ |
20 | - 'middleware' => '', |
|
20 | + 'middleware' => '', |
|
21 | 21 | |
22 | - /* |
|
22 | + /* |
|
23 | 23 | |-------------------------------------------------------------------------- |
24 | 24 | | Sizes table |
25 | 25 | |-------------------------------------------------------------------------- |