diff --git a/app/Http/Controllers/Admin/EventHealthAllowanceCrudController.php b/app/Http/Controllers/Admin/EventHealthAllowanceCrudController.php index c5fa543..aa1e656 100644 --- a/app/Http/Controllers/Admin/EventHealthAllowanceCrudController.php +++ b/app/Http/Controllers/Admin/EventHealthAllowanceCrudController.php @@ -317,41 +317,49 @@ class EventHealthAllowanceCrudController extends CrudController switch($entry->check_state) { case '2': //過通 try { - Mail::to($entry->email)->send(new EventNotifyMail([ - "title" => "反轉代謝新人生 皮蛇疫苗加碼補 審核通過!", - "body" => "恭喜您審核通過!" - ."\n\n登記資料:" - ."\n流水號: C-".str_pad($entry->id, 6, '0', STR_PAD_LEFT) + Mail::to($entry->email)->send(new EventNotifyMail( + '桃園市政府衛生局114年桃園市健康管理計畫「翻轉代謝新人生,皮蛇疫苗加碼補」審核通過信件。', + [ + "title" => "翻轉代謝新人生,皮蛇疫苗加碼補 審核通過!", + "body" => "一、登記資料:" + ."\n流水號: A-".str_pad($entry->id, 6, '0', STR_PAD_LEFT) ."\n就醫院所:".$entry->hospital_name - ."\n姓名:".$entry->name - ."\n身份證字號:".substr($entry->twid,0,2)."xxxx".substr($entry->twid,-4) - ."\n行動電話:".$entry->phone - ."\n電子信箱:".$entry->email - ."\n收件地址:".$entry->address - ."\n\n補助方式將後續通知。" + ."\n姓名:".(mb_strlen($entry->name) > 2 ? mb_substr($entry->name,0,1)."*".mb_substr($entry->name,-1) : mb_substr($entry->name,0,1)."*") + ."\n身份證字號:".substr($entry->twid,0,2)."****".substr($entry->twid,-4) + ."\n電話號碼:".substr($entry->phone,0,2)."****".substr($entry->phone,-4) + ."\n\n二、補助通知:" + ."\n感謝您參與「114年桃園市健康管理計畫-翻轉代謝新人生 皮蛇疫苗加碼補」。" + ."\n請至本局指定醫療院所完成疫苗接種,並備妥以下資料申請經費補助:" + ."\n1.活動審核通過通知信" + ."\n2.帶狀皰疹疫苗接種收據或紀錄" + ."\n3.本人帳戶影本(如非臺灣銀行帳戶,將扣除30元匯費)" + ."\n4.切結書" + ."\n\n三、為確保資源分配公平,提醒您「翻轉代謝新人生 皮蛇疫苗加碼補」活動與「114年桃園市帶狀疱疹疫苗接種補助計畫」不可重複申請,應擇一參加。如經查證您已參加「114年桃園市帶狀疱疹疫苗接種補助計畫」,本活動所接受之經費補助將不予補助,並需退還已補助之費用5,000元。" + ."\n\n四、備妥以上資料於114年12月5日前以掛號方式寄至桃園市政府衛生局健康促進科(桃園市桃園區縣府路55號),信封註明114年桃園市健康管理計畫帶狀疱疹疫苗補助。" + ."\n\n敬請配合,以利後續作業。" , - ])); + ])); + } catch (Exception $ex) { } break; case '3': //未通過 try { - Mail::to($entry->email)->send(new EventNotifyMail([ - "title" => "反轉代謝新人生 皮蛇疫苗加碼補 未通過審核!", - "body" => "抱歉,您的審核未通過!" - ."\n請依以下理由重新上活動網站登記" + Mail::to($entry->email)->send(new EventNotifyMail( + '桃園市政府衛生局114年桃園市健康管理計畫「翻轉代謝新人生,皮蛇疫苗加碼補」審核未通過信件。', + [ + "title" => "翻轉代謝新人生,皮蛇疫苗加碼補 審核未通過!", + "body" => "抱歉,您的審核未通過!請依以下理由重新上活動網站登記。" ."\n理由:".$entry->check_reson ."\n\n登記資料:" - ."\n流水號: C-".str_pad($entry->id, 6, '0', STR_PAD_LEFT) + ."\n流水號: A-".str_pad($entry->id, 6, '0', STR_PAD_LEFT) ."\n就醫院所:".$entry->hospital_name - ."\n姓名:".$entry->name - ."\n身份證字號:".substr($entry->twid,0,2)."xxxx".substr($entry->twid,-4) - ."\n行動電話:".$entry->phone - ."\n電子信箱:".$entry->email - ."\n收件地址:".$entry->address + ."\n姓名:".(mb_strlen($entry->name) > 2 ? mb_substr($entry->name,0,1)."*".mb_substr($entry->name,-1) : mb_substr($entry->name,0,1)."*") + ."\n身份證字號:".substr($entry->twid,0,2)."****".substr($entry->twid,-4) + ."\n電話號碼:".substr($entry->phone,0,2)."****".substr($entry->phone,-4) , - ])); + ])); } catch (Exception $ex) { } diff --git a/app/Http/Controllers/Admin/EventImprovedHealthCrudController.php b/app/Http/Controllers/Admin/EventImprovedHealthCrudController.php index 64697ad..9daedf4 100644 --- a/app/Http/Controllers/Admin/EventImprovedHealthCrudController.php +++ b/app/Http/Controllers/Admin/EventImprovedHealthCrudController.php @@ -346,44 +346,42 @@ class EventImprovedHealthCrudController extends CrudController switch($entry->check_state) { case '2': //過通 try { - Mail::to($entry->email)->send(new EventNotifyMail([ - "title" => "健康達標GO 大獎汽車不是夢 審核通過!", - "body" => "恭喜您審核通過!" - ."\n\n登記資料:" - ."\n流水號: B-".str_pad($entry->id, 6, '0', STR_PAD_LEFT) - ."\n疾病類別:".$diseaseTypes[$entry->disease_type] + Mail::to($entry->email)->send(new EventNotifyMail( + '桃園市政府衛生局114年桃園市健康管理計畫「健康達標GO,大獎汽車不是夢」審核通過信件。', + [ + "title" => "健康達標GO,大獎汽車不是夢 審核通過!", + "body" => "登記資料:" + ."\n流水號: A-".str_pad($entry->id, 6, '0', STR_PAD_LEFT) ."\n就醫院所:".$entry->hospital_name - ."\n姓名:".$entry->name - ."\n身份證字號:".substr($entry->twid,0,2)."xxxx".substr($entry->twid,-4) - ."\n行動電話:".$entry->phone - ."\n電子信箱:".$entry->email - ."\n收件地址:".$entry->address - ."\n抽獎說明:本活動將於10月抽出得獎名單並公告於「活動網站/最新消息」及「桃園市政府衛生局網站/訊息公告/最新消息」。" - + ."\n姓名:".(mb_strlen($entry->name) > 2 ? mb_substr($entry->name,0,1)."*".mb_substr($entry->name,-1) : mb_substr($entry->name,0,1)."*") + ."\n身份證字號:".substr($entry->twid,0,2)."****".substr($entry->twid,-4) + ."\n電話號碼:".substr($entry->phone,0,2)."****".substr($entry->phone,-4) + ."\n\n抽獎說明:" + ."\n本活動將於10月抽出得獎名單並公告於「活動網站/最新消息」及「桃園市政府衛生局網站/訊息公告/最新消息」。" , - ])); + ])); + } catch (Exception $ex) { } break; case '3': //未通過 try { - Mail::to($entry->email)->send(new EventNotifyMail([ - "title" => "健康達標GO 大獎汽車不是夢 審核未通過!", - "body" => "抱歉,您的審核未通過!" - ."\n請依以下理由重新上活動網站登記" + Mail::to($entry->email)->send(new EventNotifyMail( + '桃園市政府衛生局114年桃園市健康管理計畫「健康達標GO,大獎汽車不是夢」審核未通過信件。', + [ + "title" => "健康達標GO,大獎汽車不是夢 審核未通過!", + "body" => "抱歉,您的審核未通過!請依以下理由重新上活動網站登記。" ."\n理由:".$entry->check_reson ."\n\n登記資料:" - ."\n流水號: B-".str_pad($entry->id, 6, '0', STR_PAD_LEFT) - ."\n疾病類別:".$diseaseTypes[$entry->disease_type] + ."\n流水號: A-".str_pad($entry->id, 6, '0', STR_PAD_LEFT) ."\n就醫院所:".$entry->hospital_name - ."\n姓名:".$entry->name - ."\n身份證字號:".substr($entry->twid,0,2)."xxxx".substr($entry->twid,-4) - ."\n行動電話:".$entry->phone - ."\n電子信箱:".$entry->email - ."\n收件地址:".$entry->address + ."\n姓名:".(mb_strlen($entry->name) > 2 ? mb_substr($entry->name,0,1)."*".mb_substr($entry->name,-1) : mb_substr($entry->name,0,1)."*") + ."\n身份證字號:".substr($entry->twid,0,2)."****".substr($entry->twid,-4) + ."\n電話號碼:".substr($entry->phone,0,2)."****".substr($entry->phone,-4) , - ])); + ])); + } catch (Exception $ex) { } diff --git a/app/Http/Controllers/Admin/EventMetabolismCrudController.php b/app/Http/Controllers/Admin/EventMetabolismCrudController.php index d10edec..4106d54 100644 --- a/app/Http/Controllers/Admin/EventMetabolismCrudController.php +++ b/app/Http/Controllers/Admin/EventMetabolismCrudController.php @@ -289,42 +289,43 @@ class EventMetabolismCrudController extends CrudController switch($entry->check_state) { case '2': //過通 try { - Mail::to($entry->email)->send(new EventNotifyMail([ - "title" => "符合代謝新收案 早鳥報名最划算 審核通過!", - "body" => "恭喜您審核通過!" - ."\n\n登記資料:" + Mail::to($entry->email)->send(new EventNotifyMail( + '桃園市政府衛生局114年桃園市健康管理計畫「符合代謝新收案,早鳥報名最划算」審核通過信件。', + [ + "title" => "符合代謝新收案,早鳥報名最划算 審核通過!", + "body" => "登記資料:" ."\n流水號: A-".str_pad($entry->id, 6, '0', STR_PAD_LEFT) ."\n就醫院所:".$entry->hospital_name - ."\n姓名:".$entry->name - ."\n身份證字號:".substr($entry->twid,0,2)."xxxx".substr($entry->twid,-4) - ."\n行動電話:".$entry->phone - ."\n電子信箱:".$entry->email - ."\n收件地址:".$entry->address - ."\n\n禮券發送方式說明:凡報名經審核通過者,我們將於3個工作天內,將 7-ELEVEN 電子禮券序號寄送至您報名時所填寫的電子信箱,敬請留意收信。" - ."\n抽獎說明:本活動將於10月抽出得獎名單並公告於「活動網站/最新消息」及「桃園市政府衛生局網站/訊息公告/最新消息」。" + ."\n姓名:".(mb_strlen($entry->name) > 2 ? mb_substr($entry->name,0,1)."*".mb_substr($entry->name,-1) : mb_substr($entry->name,0,1)."*") + ."\n身份證字號:".substr($entry->twid,0,2)."****".substr($entry->twid,-4) + ."\n電話號碼:".substr($entry->phone,0,2)."****".substr($entry->phone,-4) + ."\n\n禮券發送方式說明:" + ."\n凡報名經審核通過者,我們將於3個工作天內,將7-ELEVEN電子禮券序號寄送至您報名時所填寫的電子信箱,敬請留意收信。" + ."\n抽獎說明:" + ."\n本活動將於10月抽出得獎名單並公告於「活動網站/最新消息」及「桃園市政府衛生局網站/訊息公告/最新消息」。" , - ])); + ])); + } catch (Exception $ex) { } break; case '3': //未通過 try { - Mail::to($entry->email)->send(new EventNotifyMail([ - "title" => "符合代謝新收案 早鳥報名最划算 審核未通過!", - "body" => "抱歉,您的審核未通過!" - ."\n請依以下理由重新上活動網站登記" + Mail::to($entry->email)->send(new EventNotifyMail( + '桃園市政府衛生局114年桃園市健康管理計畫「符合代謝新收案,早鳥報名最划算」審核未通過信件。', + [ + "title" => "符合代謝新收案,早鳥報名最划算 審核未通過!", + "body" => "抱歉,您的審核未通過!請依以下理由重新上活動網站登記。" ."\n理由:".$entry->check_reson ."\n\n登記資料:" ."\n流水號: A-".str_pad($entry->id, 6, '0', STR_PAD_LEFT) ."\n就醫院所:".$entry->hospital_name - ."\n姓名:".$entry->name - ."\n身份證字號:".substr($entry->twid,0,2)."xxxx".substr($entry->twid,-4) - ."\n行動電話:".$entry->phone - ."\n電子信箱:".$entry->email - ."\n收件地址:".$entry->address + ."\n姓名:".(mb_strlen($entry->name) > 2 ? mb_substr($entry->name,0,1)."*".mb_substr($entry->name,-1) : mb_substr($entry->name,0,1)."*") + ."\n身份證字號:".substr($entry->twid,0,2)."****".substr($entry->twid,-4) + ."\n電話號碼:".substr($entry->phone,0,2)."****".substr($entry->phone,-4) , - ])); + ])); } catch (Exception $ex) { } diff --git a/app/Http/Controllers/HealthAllowanceFillFormController.php b/app/Http/Controllers/HealthAllowanceFillFormController.php index f12b038..5b1582a 100644 --- a/app/Http/Controllers/HealthAllowanceFillFormController.php +++ b/app/Http/Controllers/HealthAllowanceFillFormController.php @@ -358,18 +358,20 @@ class HealthAllowanceFillFormController extends Controller DB::commit(); try { - Mail::to($request->input('email'))->send(new EventNotifyMail([ - "title" => "反轉代謝新人生 皮蛇疫苗加碼補 登記成功!", - "body" => "登記資料:" - ."\n流水號: C-".str_pad($eventItem->id, 6, '0', STR_PAD_LEFT) + Mail::to($request->input('email'))->send(new EventNotifyMail( + '桃園市政府衛生局114年桃園市健康管理計畫「翻轉代謝新人生,皮蛇疫苗加碼補」登記成功信件', + [ + "title" => "翻轉代謝新人生,皮蛇疫苗加碼補 登記成功!", + "body" => "我們將於3個工作天內進行審核您的資料,並通知您審核結果,敬請留意收信。" + ."\n\n登記資料:" + ."\n流水號: A-".str_pad($eventItem->id, 6, '0', STR_PAD_LEFT) ."\n就醫院所:".$request->input('hospital_name') - ."\n姓名:".$request->input('name') - ."\n身份證字號:".substr($request->input('twid'),0,2)."xxxx".substr($request->input('twid'),-4) - ."\n行動電話:".$request->input('phone') - ."\n電子信箱:".$request->input('email') - ."\n收件地址:".$request->input('address') + ."\n姓名:".(mb_strlen($request->input('name')) > 2 ? mb_substr($request->input('name'),0,1)."*".mb_substr($request->input('name'),-1) : mb_substr($request->input('name'),0,1)."*") + ."\n身份證字號:".substr($request->input('twid'),0,2)."****".substr($request->input('twid'),-4) + ."\n電話號碼:".substr($request->input('phone'),0,2)."****".substr($request->input('phone'),-4) , - ])); + ])); + } catch (Exception $ex) { } diff --git a/app/Http/Controllers/ImprovedHealthFillFormController.php b/app/Http/Controllers/ImprovedHealthFillFormController.php index d64f44e..e0ebb0b 100644 --- a/app/Http/Controllers/ImprovedHealthFillFormController.php +++ b/app/Http/Controllers/ImprovedHealthFillFormController.php @@ -347,18 +347,20 @@ class ImprovedHealthFillFormController extends Controller DB::commit(); try { - Mail::to($request->input('email'))->send(new EventNotifyMail([ - "title" => "健康達標GO 大獎汽車不是夢 登記成功!", - "body" => "登記資料:" - ."\n流水號: B-".str_pad($eventItem->id, 6, '0', STR_PAD_LEFT) + + Mail::to($request->input('email'))->send(new EventNotifyMail( + '桃園市政府衛生局114年桃園市健康管理計畫「健康達標GO,大獎汽車不是夢」登記成功信件', + [ + "title" => "健康達標GO,大獎汽車不是夢 登記成功!", + "body" => "我們將於3個工作天內進行審核您的資料,並通知您審核結果,敬請留意收信。" + ."\n\n登記資料:" + ."\n流水號: A-".str_pad($eventItem->id, 6, '0', STR_PAD_LEFT) ."\n就醫院所:".$request->input('hospital_name') - ."\n姓名:".$request->input('name') - ."\n身份證字號:".substr($request->input('twid'),0,2)."xxxx".substr($request->input('twid'),-4) - ."\n行動電話:".$request->input('phone') - ."\n電子信箱:".$request->input('email') - ."\n收件地址:".$request->input('address') + ."\n姓名:".(mb_strlen($request->input('name')) > 2 ? mb_substr($request->input('name'),0,1)."*".mb_substr($request->input('name'),-1) : mb_substr($request->input('name'),0,1)."*") + ."\n身份證字號:".substr($request->input('twid'),0,2)."****".substr($request->input('twid'),-4) + ."\n電話號碼:".substr($request->input('phone'),0,2)."****".substr($request->input('phone'),-4) , - ])); + ])); } catch (Exception $ex) { } diff --git a/app/Http/Controllers/MetabolismFillFormController.php b/app/Http/Controllers/MetabolismFillFormController.php index d1c6a54..f3ac31f 100644 --- a/app/Http/Controllers/MetabolismFillFormController.php +++ b/app/Http/Controllers/MetabolismFillFormController.php @@ -274,18 +274,19 @@ class MetabolismFillFormController extends Controller DB::commit(); try { - Mail::to($request->input('email'))->send(new EventNotifyMail([ - "title" => "符合代謝新收案 早鳥報名最划算 登記成功!", - "body" => "登記資料:" + Mail::to($request->input('email'))->send(new EventNotifyMail( + '桃園市政府衛生局114年桃園市健康管理計畫「符合代謝新收案,早鳥報名最划算」登記成功信件', + [ + "title" => "符合代謝新收案,早鳥報名最划算 登記成功!", + "body" => "我們將於3個工作天內進行審核您的資料,並通知您審核結果,敬請留意收信。" + ."\n\n登記資料:" ."\n流水號: A-".str_pad($eventItem->id, 6, '0', STR_PAD_LEFT) ."\n就醫院所:".$request->input('hospital_name') - ."\n姓名:".$request->input('name') - ."\n身份證字號:".substr($request->input('twid'),0,2)."xxxx".substr($request->input('twid'),-4) - ."\n行動電話:".$request->input('phone') - ."\n電子信箱:".$request->input('email') - ."\n收件地址:".$request->input('address') + ."\n姓名:".(mb_strlen($request->input('name')) > 2 ? mb_substr($request->input('name'),0,1)."*".mb_substr($request->input('name'),-1) : mb_substr($request->input('name'),0,1)."*") + ."\n身份證字號:".substr($request->input('twid'),0,2)."****".substr($request->input('twid'),-4) + ."\n電話號碼:".substr($request->input('phone'),0,2)."****".substr($request->input('phone'),-4) , - ])); + ])); } catch (Exception $ex) { } diff --git a/app/Mail/EventNotifyMail.php b/app/Mail/EventNotifyMail.php index ffc091b..759d69a 100644 --- a/app/Mail/EventNotifyMail.php +++ b/app/Mail/EventNotifyMail.php @@ -13,14 +13,16 @@ class EventNotifyMail extends Mailable { use Queueable, SerializesModels; + public $subject; public $data; /** * Create a new message instance. */ - public function __construct($data) + public function __construct($subject, $data) { // + $this->subject = $subject; $this->data = $data; } @@ -30,7 +32,7 @@ class EventNotifyMail extends Mailable public function envelope(): Envelope { return new Envelope( - subject: '桃園市政府衛生局 114年慢性病防治管理暨多元行銷宣導', + subject: $this->subject, ); } diff --git a/public/assets/doc/114health-exam-form.pdf b/public/assets/doc/114health-exam-form.pdf index 57ac0c3..de04f08 100644 Binary files a/public/assets/doc/114health-exam-form.pdf and b/public/assets/doc/114health-exam-form.pdf differ diff --git a/public/assets/images/health_allowance_intro_01.jpg b/public/assets/images/health_allowance_intro_01.jpg index ff52a05..66b9937 100644 Binary files a/public/assets/images/health_allowance_intro_01.jpg and b/public/assets/images/health_allowance_intro_01.jpg differ diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 2894690..016de92 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -573,4 +573,18 @@ body { .anchor-point { text-decoration: none; color: unset; +} + +.main-area .inner-table, +.main-area .inner-table th, +.main-area .inner-table tr, +.main-area .inner-table td { + border: solid 1px gray; + padding: 0.4em; + font-size: unset; +} + +.main-area .inner-table td p { + font-size: unset; + margin: 0; } \ No newline at end of file diff --git a/resources/sass/images/btn-4.png b/resources/sass/images/btn-4.png index 5d6b423..ffbb951 100644 Binary files a/resources/sass/images/btn-4.png and b/resources/sass/images/btn-4.png differ diff --git a/resources/views/event-notify-mail.blade.php b/resources/views/event-notify-mail.blade.php index 1625fbc..cee4cb3 100644 --- a/resources/views/event-notify-mail.blade.php +++ b/resources/views/event-notify-mail.blade.php @@ -11,7 +11,8 @@
活動網站網址:https://health.goodcake.tw/
-客服電話:(02) 2297-0109 / 客服信箱:info@shibasays.com
+客服電話:(02)2297-0109
+客服信箱:info@shibasays.com
- Ⓒ2025 桃園市政府衛生局-定期追蹤不落拍-健康管理醫起來-活動網站 -