Merge branch 'master' into feature/EK-76

common/helpers/Email.php

@@ -13,15 +13,8 @@ class Email
      */
     public static function sendRegistrationEmail(string $email, string $userName, string $password)
     {
-        $subject = 'Elken Welcome You.';
-        // $str = "<p>恭喜！  恭喜您成功注册到Elken Global系统和家庭。  我们致力于打造你来打造他人  使用下面提供的链接登录您的后台办公室   用户名=".$userName." 密码=".$password."  我们建议您将密码更改为您容易记住的密码。  如需进一步查询，请随时联系+23480 3413 0554  我们致力于确保您成功。  再次恭喜！</p>";
-        $str = "
-            <p>CONGRATULATIONS!</p>
-            <p>Congratulations on your successful registration into Elken Global system and family.  We are committed to building you to build others  Login to your back office using the link provided below  <a href='https://ngds.elken.com/#/login'>Member Management System</a>   Username = ".$userName." Password = ".$password."</p>  
-<p>We recommend that you change your password to what you will easily remember.  For further inquiries do not hesitate to contact +23480 3413 0554  We are committed to ensuring that you succeed.  </p>
-            <p>Once again congratulations!</p>
-        ";
-        $message = \Yii::t('app', $str);
+        $subject = \Yii::t('app', 'decRegistrationEmailSubject');
+        $message = \Yii::t('app', 'decRegistrationEmailContent', ['userName' => $userName, 'passWord' => $password]);
 
         $mailer = Yii::$app->mailer;
         $mailer->useFileTransport = false;

common/messages/en-US/app.php

@@ -226,7 +226,17 @@ return [
     'dataFormatError' => 'Data format error',
     'decUserNameDoesNotExist' => '请输入报单中心编号',
     'decUserNameIsWrong' => '报单中心编号输入错误',
-
+    'decRegistrationEmailSubject' => 'Elken Welcome You.',
+    'decRegistrationEmailContent' => "
+        <p>Welcome to Elken Global!</p>
+        <p>Congratulations on successfully joining the Elken family! We are committed to empowering you to grow and succeed.</p>  
+        <p>Access your back office here: <a href='https://ngds.elken.com'>https://ngds.elken.com</a></p>
+        <p>Username: [{userName}]</p>
+        <p>Password: {passWord} (Please change it for security reasons.)</p>
+        <p>To kickstart your success journey, explore essential resources, videos, and guides here: <a href='https://bit.ly/ElkenWelcomeKit'>https://bit.ly/ElkenWelcomeKit</a></p>
+        <p>For any inquiries, reach out to us at +23480 3413 0554. We are here to support you every step of the way.</p>
+        <p>Welcome aboard, and best wishes for your success!</p>
+    ",
 
 
     # 奖金

common/messages/zh-CN/app.php

@@ -232,6 +232,17 @@ return [
     'currencyDoesNotExist' => '未设置汇率',
     'countryDoesNotSelect' => '未选择国家',
     'transferMemberDoesNotSame' => '转账会员非本国会员',
+    'decRegistrationEmailSubject' => '欢迎来到Elken Global！',
+    'decRegistrationEmailContent' => "
+        <p>欢迎来到Elken Global！</p>
+        <p>祝贺您成功加入Elken大家庭！我们致力于赋予您成长和成功的能力。</p>  
+        <p>访问您的后台: <a href='https://ngds.elken.com'>https://ngds.elken.com</a></p>
+        <p>用户名: [{userName}]</p>
+        <p>密码: {passWord} (出于安全原因，请更改密码。)</p>
+        <p>要启动您的成功之旅，请在此处浏览必要的资源、视频和指南: <a href='https://bit.ly/ElkenWelcomeKit'>https://bit.ly/ElkenWelcomeKit</a></p>
+        <p>如有任何疑问，请致电+23480 3413 0554联系我们。我们在这里帮助您完成每一步。</p>
+        <p>欢迎加入，祝你成功！</p>
+    ",
 
     # 奖金
     'memberBonus' => '收益积分',