From b3e27063ec0e9dfebfac0dcbfd3c303b5cd312d3 Mon Sep 17 00:00:00 2001 From: xiaoyaoxiangyun <44153101+xiaoyaoxiangyun@users.noreply.github.com> Date: Sat, 9 Mar 2019 15:43:47 +0800 Subject: [PATCH 1/4] Added temporary invitation mail the invitation content (and background) needs to be updated after the race agenda is established --- application/libraries/MY_Email.php | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/application/libraries/MY_Email.php b/application/libraries/MY_Email.php index 6e6da1d..57e9c0e 100644 --- a/application/libraries/MY_Email.php +++ b/application/libraries/MY_Email.php @@ -78,4 +78,38 @@ public function send_fee_received_mail($mail, $school, $fee) { $message = $school . '，

贵校车协交来的' . $fee . '元参赛费用已经收到，感谢你们对北大赛的大力支持！如有任何问题，请直接与各地区负责联系。' . $id_message; $this->send_mail($mail, $subject, $message); } + + /* + * Send invitation email. + * $subject and $message needs to be updated. + */ + public function send_invitation_mail($mail, $school, $association_name) { + $subject = '第十六届全国高校自行车交流赛邀请函'; + $id = $this->ci->user->get_id($mail); + $message = ' + +
+
+


+ +
+
+

+ 致 ' . $school . ' ' . $association_name . '： +

+

+ 北京大学自行车协会将于5月4日、5日和6日分别在北京大学和河北廊坊市固安县永定河自行车公园举办“北大车协 · 第十六届全国高校自行车交流赛”。本届比赛由xxx举办，并得到了xxx的大力支持。
+ 贵协作为全国知名的高校自行车运动社团，协会会员自行车运动水平优秀，学生素质高尚优良。我们诚挚邀请贵协参加“北大车协 · 第十六届全国高校自行车交流赛”， 以车会友，交流学习。 +

+ +

+ 北京大学自行车协会
+ 2018年4月 +

+ +
+
+ '; + $this->send_mail($mail, $subject, $message); + } } From adc67abe7dd261cd11671bd8d7ff845bd89a473c Mon Sep 17 00:00:00 2001 From: xiaoyaoxiangyun <44153101+xiaoyaoxiangyun@users.noreply.github.com> Date: Sat, 9 Mar 2019 15:46:06 +0800 Subject: [PATCH 2/4] send invitation mail after receiving the money --- application/controllers/admin.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/application/controllers/admin.php b/application/controllers/admin.php index 57f07bd..dda241f 100644 --- a/application/controllers/admin.php +++ b/application/controllers/admin.php @@ -62,7 +62,13 @@ public function pay() { $this->user->set_paid($data['id']); $query= $this->user->get_user_by_id($data['id']); $mail = $query['mail']; + $association_name = $query['association_name']; $this->email->send_fee_received_mail($mail, $data['school'], $data['bill']); + + // Send the invitation email. + $this->email->send_invitation_mail($mail, $data['school'], $association_name); + echo $data; + $response = array( 'code' => '0', 'msg' => '操作成功!' From c8e5ae8479c46ea9ee66d427a257b70d4fb5813e Mon Sep 17 00:00:00 2001 From: xiaoyaoxiangyun <44153101+xiaoyaoxiangyun@users.noreply.github.com> Date: Tue, 19 Mar 2019 09:23:03 +0800 Subject: [PATCH 3/4] merged fee_received and invitation email --- application/libraries/MY_Email.php | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/application/libraries/MY_Email.php b/application/libraries/MY_Email.php index 57e9c0e..f904b55 100644 --- a/application/libraries/MY_Email.php +++ b/application/libraries/MY_Email.php @@ -69,25 +69,14 @@ public function send_account_confirm_mail($mail) { } /* - * Send mail after money is received. + * Send mail of confirmation and invitation after money is received. + * $subject and $invitation needs to be updated. */ - public function send_fee_received_mail($mail, $school, $fee) { - $subject = '第十六届全国高校自行车交流赛缴费确认'; + public function send_fee_received_and_invitation_mail($mail, $school, $fee, $association_name) { + $subject = '第十六届全国高校自行车交流赛缴费确认及邀请函'; $id = $this->ci->user->get_id($mail); $id_message='

贵高校本次比赛的ID是' . $id . '，请领队同学务必牢记，并在比赛签到时出示。

祝好！

北京大学自行车协会'; - $message = $school . '，

贵校车协交来的' . $fee . '元参赛费用已经收到，感谢你们对北大赛的大力支持！如有任何问题，请直接与各地区负责联系。' . $id_message; - $this->send_mail($mail, $subject, $message); - } - - /* - * Send invitation email. - * $subject and $message needs to be updated. - */ - public function send_invitation_mail($mail, $school, $association_name) { - $subject = '第十六届全国高校自行车交流赛邀请函'; - $id = $this->ci->user->get_id($mail); - $message = ' - + $invitation_message = '



@@ -110,6 +99,7 @@ public function send_invitation_mail($mail, $school, $association_name) { '; + $message = $school . '，

贵校车协交来的' . $fee . '元参赛费用已经收到，感谢你们对北大赛的大力支持！如有任何问题，请直接与各地区负责联系。' . $id_message.'


以下是第十六届全国高校自行车交流赛邀请函，可截图保存：

'.$invitation_message; $this->send_mail($mail, $subject, $message); - } + } } From 81b246863408ad4024b90af254e055f1e1070b42 Mon Sep 17 00:00:00 2001 From: xiaoyaoxiangyun <44153101+xiaoyaoxiangyun@users.noreply.github.com> Date: Tue, 19 Mar 2019 09:23:50 +0800 Subject: [PATCH 4/4] merged fee_received and invitation email --- application/controllers/admin.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/application/controllers/admin.php b/application/controllers/admin.php index dda241f..fb3a9e2 100644 --- a/application/controllers/admin.php +++ b/application/controllers/admin.php @@ -63,11 +63,7 @@ public function pay() { $query= $this->user->get_user_by_id($data['id']); $mail = $query['mail']; $association_name = $query['association_name']; - $this->email->send_fee_received_mail($mail, $data['school'], $data['bill']); - - // Send the invitation email. - $this->email->send_invitation_mail($mail, $data['school'], $association_name); - echo $data; + $this->email->send_fee_received_and_invitation_mail($mail, $data['school'], $data['bill'], $association_name); $response = array( 'code' => '0',