Merge branch 'integration' into wittaya

www/src/Controller/UserCardsController.php

@@ -302,15 +302,15 @@ class UserCardsController extends AppController
                         }
                         }
 
 
 
 
-                        $this->Flash->success(__('บันทึกสำเร็จ'));
+                        $this->Flash->success(__('Save Complete'));
                         return $this->redirect(['controller' => 'Profiles', 'action' => 'index']);
                         return $this->redirect(['controller' => 'Profiles', 'action' => 'index']);
                     }
                     }
                 }else{
                 }else{
-                    $this->Flash->error(__('ลงทะเบียนไว้อยู่แล้ว'));
+                    $this->Flash->error(__('Already registered'));
                     return $this->redirect(['controller' => 'UserCards', 'action' => 'viewCard']);
                     return $this->redirect(['controller' => 'UserCards', 'action' => 'viewCard']);
                 }
                 }
             }else{
             }else{
-                $this->Flash->error(__('ไม่พบข้อมูล'));
+                $this->Flash->error(__('Data not found'));
                 return $this->redirect(['controller' => 'UserCards', 'action' => 'viewCard']);
                 return $this->redirect(['controller' => 'UserCards', 'action' => 'viewCard']);
             }
             }
         }
         }

www/src/Controller/UsersController.php

@@ -18,13 +18,11 @@ class UsersController extends AppController {
      */
      */
     public function initialize() {
     public function initialize() {
         parent::initialize();
         parent::initialize();
-
-       // $this->Auth->allow(['signin', 'signout', 'signup', 'verify', 'forgotPassword', 'createAccount', 'pinCode', 'pinCodepassword', 'changeForgotpassword']);
-
-        $this->Auth->allow(['signin', 'signout', 'signup', 'verify','forgotPassword','createAccount','pinCode','pinCodepassword','registersendpin','forgotsendpin','changeForgotpassword']);
-
+        // $this->Auth->allow(['signin', 'signout', 'signup', 'verify', 'forgotPassword', 'createAccount', 'pinCode', 'pinCodepassword', 'changeForgotpassword']);
+        $this->Auth->allow(['signin', 'signout', 'signup', 'verify', 'forgotPassword', 'createAccount', 'pinCode', 'pinCodepassword', 'registersendpin', 'forgotsendpin', 'changeForgotpassword', 'reautorize']);
     }
     }
 
 
+
     public function index() {
     public function index() {
         return $this->redirect(['controller' => 'Users', 'action' => 'signin']);
         return $this->redirect(['controller' => 'Users', 'action' => 'signin']);
     }
     }

www/src/Locale/en_EN/default.po

@@ -43,6 +43,10 @@ msgstr "Gender"
 msgid "blood group"
 msgid "blood group"
 msgstr "Blood group"
 msgstr "Blood group"
 
 
+#: Controller/ProfilesController.php/index.ctp:199
+msgid "Show QR Code to get permission"
+msgstr "Show QR Code to get permission"
+
 #: Controller/ProfilesController.php/index.ctp:122,123
 #: Controller/ProfilesController.php/index.ctp:122,123
 msgid "mobile"
 msgid "mobile"
 msgstr "Mobile"
 msgstr "Mobile"
@@ -137,4 +141,180 @@ msgstr "Email address format wrong Please enter the correct."
 
 
 #: Controller/UsersController.php/forgot_password.ctp:3
 #: Controller/UsersController.php/forgot_password.ctp:3
 msgid "Forgot password"
 msgid "Forgot password"
-msgstr "Forgot password"
+msgstr "Forgot password"
\ No newline at end of file
+
+#: Controller/UsersController.php/pin_codepassword.ctp:3
+msgid "Verify PIN"
+msgstr "Verify PIN"
+
+#: Controller/UsersController.php/pin_codepassword.ctp:18
+msgid "4 digit PIN in the email address specified for access"
+msgstr "4 digit PIN in the email address specified for access"
+
+#: Controller/UsersController.php/pin_codepassword.ctp:40
+msgid "Re-send pin code"
+msgstr "Re-send pin code"
+
+#: Controller/UsersController.php/change_forgotpassword.ctp:14
+msgid "new password"
+msgstr "New password"
+
+#: Controller/UsersController.php/change_forgotpassword.ctp:22
+msgid "confirm password"
+msgstr "confirm password"
+
+#: Controller/UsersController.php/change_forgotpassword.ctp:32
+#: Controller/UsersController.php/forgot_password.ctp:21
+msgid "submit"
+msgstr "Submit"
+
+#: Controller/UsersController.php/change_forgotpassword.ctp:49
+#: Controller/UsersController.php/change_forgotpassword.ctp:58
+msgid "Please enter only English letters and numbers."
+msgstr "Please enter only English letters and numbers."
+
+#: Controller/UsersController.php/change_forgotpassword.ctp:67
+msgid "Please enter a new password."
+msgstr "Please enter a new password."
+
+#: Controller/UsersController.php/change_forgotpassword.ctp:72
+msgid "Please enter a new password at least 8 characters."
+msgstr "Please enter a new password at least 8 characters."
+
+#: Controller/UsersController.php/change_forgotpassword.ctp:77
+msgid "Please enter your password."
+msgstr "Please enter your password."
+
+#: Controller/UsersController.php/change_forgotpassword.ctp:82
+msgid "Please enter at least 8 characters."
+msgstr "Please enter at least 8 characters."
+
+#: Controller/UsersController.php/change_forgotpassword.ctp:86
+msgid "Please provide the same password."
+msgstr "Please provide the same password."
+
+#: Controller/UsersController.php/change_forgotpassword.ctp:3
+msgid "change password"
+msgstr "change password"
+
+#: Controller/UsersController.php:444
+msgid "You are now logged out."
+msgstr "You are now logged out."
+
+#: Controller/UsersController.php:391
+msgid "Pin Completed."
+msgstr "Pin Completed."
+
+#: Controller/UsersController.php:394
+msgid "Pin Invalid."
+msgstr "Pin Invalid."
+
+#: Controller/UsersController.php:369
+msgid "send password to email success."
+msgstr "Send password to email success."
+
+#: Controller/UsersController.php:374
+msgid "Invalid Email."
+msgstr "Invalid Email."
+
+
+
+#: Controller/UserCardsController.php/view_card.ctp:21
+msgid "id"
+msgstr "Id"
+
+#: Controller/UserCardsController.php/view_card.ctp:27
+msgid "Name"
+msgstr "Name"
+
+#: Controller/UserCardsController.php/view_card.ctp:37
+#: Controller/UserCardsController.php/view_card.ctp:105
+msgid "Position"
+msgstr "Position"
+
+#: Controller/UserCardsController.php/view_card.ctp:60
+#: Controller/UserCardsController.php/view_card.ctp:111
+msgid "Card issue"
+msgstr "Card issue"
+
+#: Controller/UserCardsController.php/view_card.ctp:63
+#: Controller/UserCardsController.php/view_card.ctp:121
+msgid "Old age"
+msgstr "Old age"
+
+#: Controller/UserCardsController.php/view_card.ctp:76
+msgid "Company Information"
+msgstr "Company Information"
+
+#: Controller/UserCardsController.php/view_card.ctp:81
+msgid "Firstname"
+msgstr "Firstname"
+
+#: Controller/UserCardsController.php/view_card.ctp:87
+msgid "Lastname"
+msgstr "Lastname"
+
+#: Controller/UserCardsController.php/view_card.ctp:93
+msgid "Company Name"
+msgstr "Company Name"
+
+#: Controller/UserCardsController.php/view_card.ctp:99
+msgid "Department"
+msgstr "Department"
+
+#: Controller/UserCardsController.php/view_card.ctp:177
+msgid "Ref 2"
+msgstr "Ref 2"
+
+#: Controller/UserCardsController.php/view_card.ctp:185
+msgid "Check"
+msgstr "Check"
+
+#: Controller/UserCardsController.php/view_card.ctp:515
+msgid "Register with"
+msgstr "Register with"
+
+#: Controller/UserCardsController.php/view_card.ctp:516
+msgid "already"
+msgstr "Already"
+
+#: Controller/UserCardsController.php/view_card.ctp:530
+#: Controller/UserCardsController:313 
+msgid "Data not found"
+msgstr "Data not found"
+
+#: Controller/UserCardsController.php/view_card.ctp:550
+msgid "Registered"
+msgstr "Registered"
+
+#: Controller/UserCardsController.php/view_card.ctp:564
+msgid "Did not find the information you need", Please enter the correct information and press the check."
+msgstr "Did not find the information you need", Please enter the correct information and press the check."
+
+#: Controller/UserCardsController.php/view_card.ctp:576
+msgid "Please enter Company Code."
+msgstr "Please enter Company Code."
+
+#: Controller/UserCardsController.php/view_card.ctp:581
+msgid "Please enter Ref1."
+msgstr "Please enter Ref1."
+
+#: Controller/UserCardsController.php/view_card.ctp:586
+msgid "Please enter Ref2."
+msgstr "Please enter Ref2."
+
+#: Controller/UserCardsController.php/view_card.ctp:161
+msgid "ID Active"
+msgstr "ID Active"
+
+#: Controller/UserCardsController.php/view_card.ctp:162
+msgid "Company Code"
+msgstr "Company Code"
+
+#: Controller/UserCardsController:305 
+msgid "Save Complete" 
+msgstr "Save Complete" 
+
+#: Controller/UserCardsController:309 
+msgid "Already registered" 
+msgstr "Already registered" 
\ No newline at end of file

www/src/Locale/th_TH/default.po

@@ -137,4 +137,204 @@ msgstr "กรุณาระบุประเทศ"
 
 
 #: View/Profiles/index:296
 #: View/Profiles/index:296
 msgid "Please specify province"
 msgid "Please specify province"
-msgstr "กรุณาระบุจังหวัด"
+msgstr "กรุณาระบุจังหวัด"
\ No newline at end of file
+
+#: View/UserCards/view_card:21
+msgid "id"
+msgstr "ไอดี"
+
+#: View/UserCards/view_card:27
+msgid "Name"
+msgstr "ชื่อ"
+
+#: View/UserCards/view_card:37
+#: View/UserCards/view_card:105
+msgid "Position"
+msgstr "ตำแหน่ง"
+
+#: View/UserCards/view_card:60
+#: View/UserCards/view_card:111
+msgid "Card issue"
+msgstr "วันออกบัตร"
+
+#: View/UserCards/view_card:63
+#: View/UserCards/view_card:121
+msgid "Old age"
+msgstr "วันหมดอายุ"
+
+#: View/UserCards/view_card:76
+msgid "Company Information"
+msgstr "ข้อมูลบริษัท"
+
+#: View/UserCards/view_card:81
+msgid "Firstname"
+msgstr "ชื่อ"
+
+#: View/UserCards/view_card:87
+msgid "Lastname"
+msgstr "นามสกุล"
+
+#: View/UserCards/view_card:93
+msgid "Company Name"
+msgstr "ชื่อบริษัท"
+
+#: View/UserCards/view_card:99
+msgid "Department"
+msgstr "แผนก"
+
+#: View/UserCards/view_card:161
+msgid "ID Active"
+msgstr "ไอดี ผู้ใช้งาน"
+
+#: View/UserCards/view_card:162
+msgid "Company Code"
+msgstr "รหัสบริษัท"
+
+#: View/UserCards/view_card:169
+msgid "Ref 1"
+msgstr "อ้างอิง 1"
+
+#: View/UserCards/view_card:177
+msgid "Ref 2"
+msgstr "อ้างอิง 2"
+
+#: View/UserCards/view_card:185
+msgid "Check"
+msgstr "ตรวจสอบ"
+
+#: View/UserCards/view_card:515
+msgid "Register with"
+msgstr "ลงทะเบียนกับ"
+
+#: View/UserCards/view_card:516
+msgid "already"
+msgstr "แล้ว"
+
+#: View/UserCards/view_card:550
+msgid "Registered"
+msgstr "ลงทะเบียนแล้ว"
+
+#: View/UserCards/view_card:564
+msgid ""Did not find the information you need", Please enter the correct information and press the check."
+msgstr ""ไม่พบข้อมูลที่คุณต้องการ" โปรดป้อนข้อมูลที่ถูกต้องและกดเช็ค"
+
+#: View/UserCards/view_card:576
+msgid "Please enter Company Code"
+msgstr "กรุณากรอกรหัสบริษัท"
+
+#: View/UserCards/view_card:581
+msgid "Please enter Ref1"
+msgstr "กรุณากรอกอ้างอิง 1"
+
+#: View/UserCards/view_card:586
+msgid "Please enter Ref2"
+msgstr "กรุณากรอกอ้างอิง 2"
+
+#: View/Users/forgot_password:3
+msgid "Forgot password"
+msgstr "ลืมรหัสผ่าน"
+
+#: View/Users/forgot_password:14
+msgid "Email"
+msgstr "อีเมล"
+
+#: View/Users/forgot_password:34
+msgid "Please enter your email."
+msgstr "กรุณากรอกที่อยู่อีเมลของท่าน"
+
+#: View/Users/forgot_password:40
+msgid "Email address format wrong Please enter the correct."
+msgstr "รูปแบบอีเมลไม่ถูกต้อง กรุณากรอกให้ถูกต้อง"
+
+#: View/Users/change_forgotpassword:3
+msgid "change password"
+msgstr "เปลี่ยนรหัสผ่าน"
+
+#: View/Users/change_forgotpassword:14
+msgid "new password"
+msgstr "รหัสผ่านใหม่"
+
+#: View/Users/change_forgotpassword:22
+msgid "confirm password"
+msgstr "ยืนยันรหัสผ่าน"
+
+#: View/Users/change_forgotpassword:49
+#: View/Users/change_forgotpassword:58
+msgid "Please enter only English letters and numbers."
+msgstr "กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น"
+
+#: View/Users/change_forgotpassword:67
+msgid "Please enter a new password."
+msgstr "กรุณากรอก รหัสผ่านใหม่"
+
+#: View/Users/change_forgotpassword:72
+msgid "Please enter a new password at least 8 characters."
+msgstr "กรุณาระบุรหัสผ่านใหม่อย่างน้อย 8 ตัวอักษร่"
+
+#: View/Users/change_forgotpassword:77
+msgid "Please enter your password."
+msgstr "กรุณากรอก ยืนยันรหัสผ่าน"
+
+#: View/Users/change_forgotpassword:82
+msgid "Please enter at least 8 characters."
+msgstr "กรุณาระบุยืนยันรหัสผ่านอย่างน้อย 8 ตัวอักษร"
+
+#: View/Users/change_forgotpassword:86
+msgid "Please provide the same password."
+msgstr "กรุณาระบุรหัสผ่านให้ตรงกัน"
+
+#: View/Users/pin_codepassword:3
+msgid "Verify PIN"
+msgstr "ยืนยัน PIN"
+
+#: View/Users/pin_codepassword:18
+msgid "4 digit PIN in the email address specified for access"
+msgstr "กรุณาใส่ PIN 4 หลัก ที่ถูกส่งไปยังอีเมลของท่าน"
+
+#: View/Users/pin_codepassword:40
+msgid "Re-send pin code"
+msgstr "ส่ง PIN ใหม่อีกครั้ง"
+
+#: Controller/UsersController:369
+msgid "send password to email success"
+msgstr "ส่งรหัสผ่านไปยังอีเมลเรียบร้อย"
+
+#: Controller/UsersController:372
+msgid "Invalid Email."
+msgstr "อีเมลไม่ถูกต้อง"
+
+#: Controller/UsersController:391
+msgid "Pin Completed."
+msgstr "PIN ถูกต้อง"
+
+#: Controller/UsersController:394
+msgid "Pin Invalid"
+msgstr "PIN ไม่ถูกต้อง"
+
+#: Controller/UsersController:444
+msgid "You are now logged out."
+msgstr "ตอนนี้คุณออกจะระบบแล้ว"
+
+#: Controller/ProfilesController:119
+msgid "Update Complete."
+msgstr "อัปเดตสำเร็จ"
+
+#: Controller/ProfilesController:123
+msgid "Email Address already used by others."
+msgstr "ที่อยู่อีเมลนี้มีผู้ใช้งานแล้ว"
+
+#: Controller/ProfilesController:125
+msgid "Not update. Please, try again."
+msgstr "ไม่สามารถอัปเดตได้ กรุณาลองใหม่อีกครั้ง"
+
+#: Controller/UserCardsController:305
+msgid "Save Complete"
+msgstr "บันทึกสำเร็จ"
+
+#: Controller/UserCardsController:309
+msgid "Already registered"
+msgstr "ลงทะเบียนอยู่แล้ว"
+
+#: Controller/UserCardsController:313
+msgid "Data not found"
+msgstr "ไม่พบข้อมูล"
\ No newline at end of file

www/src/Template/Users/change_forgotpassword.ctp

 <div class="row">
 <div class="row">
     <div class="center">
     <div class="center">
-        <div class="title_header" style="padding-top: 20px;"><a href="javascript:history.go(-1)"><?php echo $this->Html->image('/img/core/img/back-icon@3x.png', ['style' => 'float: left;padding-left: 15px;padding-top: 5px;']); ?></a><?php echo __('เปลี่ยนรหัสผ่าน');?></div>
+        <div class="title_header" style="padding-top: 20px;"><a href="javascript:history.go(-1)"><?php echo $this->Html->image('/img/core/img/back-icon@3x.png', ['style' => 'float: left;padding-left: 15px;padding-top: 5px;']); ?></a><?php echo __('change password');?></div>
     </div>
     </div>
     <div class="col-md-12">
     <div class="col-md-12">
 <!--        <div class="alert alert-warning" role="alert" style="margin: 10px 0px 10px 0px;font-size: 17px;text-align: center;">
 <!--        <div class="alert alert-warning" role="alert" style="margin: 10px 0px 10px 0px;font-size: 17px;text-align: center;">
@@ -11,7 +11,7 @@
             <div>
             <div>
                 <div class="form-group has-feedback">
                 <div class="form-group has-feedback">
                     <div class="col-md-12">
                     <div class="col-md-12">
-                        <label class="label-text-sub"><?php echo __('new password');//รหัสผ่านใหม่?></label>
+                        <label class="label-text-sub"><?php echo __('new password');?></label>
                         <input data-toggle="password" data-placement="before" onkeyup="check();" type="password" name="password" id="password" value=""  placeholder="********" class="form-control input-lg color-button-border border-bottom-from" style="padding:0px 0px !important;">
                         <input data-toggle="password" data-placement="before" onkeyup="check();" type="password" name="password" id="password" value=""  placeholder="********" class="form-control input-lg color-button-border border-bottom-from" style="padding:0px 0px !important;">
                     </div>
                     </div>
                 </div>
                 </div>
@@ -19,7 +19,7 @@
             <div>
             <div>
                 <div class="form-group has-feedback">
                 <div class="form-group has-feedback">
                     <div class="col-md-12">
                     <div class="col-md-12">
-                        <label class="label-text-sub"><?php echo __('confirm password');//ยืนยันรหัสผ่าน?></label>
+                        <label class="label-text-sub"><?php echo __('confirm password');?></label>
                         <input data-toggle="password" data-placement="before" onkeyup="check();" type="password" name="confirm_password" id="confirm_password" value=""  placeholder="********" class="form-control input-lg color-button-border border-bottom-from" style="padding:0px 0px !important;">
                         <input data-toggle="password" data-placement="before" onkeyup="check();" type="password" name="confirm_password" id="confirm_password" value=""  placeholder="********" class="form-control input-lg color-button-border border-bottom-from" style="padding:0px 0px !important;">
                     </div>
                     </div>
                 </div>
                 </div>
@@ -46,7 +46,7 @@
             var elem = document.getElementById('password').value;
             var elem = document.getElementById('password').value;
             // console.log(elem);
             // console.log(elem);
             if(!elem.match(/^([A-Za-z0-9])+$/i)){
             if(!elem.match(/^([A-Za-z0-9])+$/i)){
-                alert("Please enter only English letters and numbers.");//กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น
+                alert(<?php echo __('Please enter only English letters and numbers.');?>);
                 return false;
                 return false;
             }
             }
         })
         })
@@ -55,7 +55,7 @@
             var elem = document.getElementById('confirm_password').value;
             var elem = document.getElementById('confirm_password').value;
             // console.log(elem);
             // console.log(elem);
             if(!elem.match(/^([A-Za-z0-9])+$/i)){
             if(!elem.match(/^([A-Za-z0-9])+$/i)){
-                alert("Please enter only English letters and numbers.");//กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น
+                alert(<?php echo __('Please enter only English letters and numbers.');?>);
                 return false;
                 return false;
             }
             }
         })
         })
@@ -64,26 +64,26 @@
 
 
         var password = document.forms["changePressword"]["password"].value;
         var password = document.forms["changePressword"]["password"].value;
         if (password == null || password == "") {
         if (password == null || password == "") {
-            alert("Please enter a new password.");//กรุณากรอก รหัสผ่านใหม่
+            alert(<?php echo __('Please enter a new password.');?>);
             return false;
             return false;
         }
         }
             if(document.forms["changePressword"]["password"].value.length < 8)
             if(document.forms["changePressword"]["password"].value.length < 8)
                 {
                 {
-                       alert('Please enter a new password at least 8 characters.');//กรุณาระบุรหัสผ่านใหม่อย่างน้อย 8 ตัวอักษร
+                       alert(<?php echo __('Please enter a new password at least 8 characters.');?>);
                        return false;
                        return false;
                 }
                 }
         var confirm_password = document.forms["changePressword"][["confirm_password"]].value;
         var confirm_password = document.forms["changePressword"][["confirm_password"]].value;
         if (confirm_password == null || confirm_password == "") {
         if (confirm_password == null || confirm_password == "") {
-            alert("Please enter your password.");//กรุณากรอก ยืนยันรหัสผ่าน
+            alert(<?php echo __('Please enter your password.');?>);
             return false;
             return false;
         }
         }
             if(document.forms["changePressword"]["confirm_password"].value.length < 8)
             if(document.forms["changePressword"]["confirm_password"].value.length < 8)
                 {
                 {
-                       alert('Please enter at least 8 characters.');//กรุณาระบุยืนยันรหัสผ่านอย่างน้อย 8 ตัวอักษร
+                       alert(<?php echo __('Please enter at least 8 characters.');?>);
                        return false;
                        return false;
                 }
                 }
             if(document.forms["changePressword"]["password"].value != document.forms["changePressword"]["confirm_password"].value){
             if(document.forms["changePressword"]["password"].value != document.forms["changePressword"]["confirm_password"].value){
-                alert('Please provide the same password.');//กรุณาระบุรหัสผ่านให้ตรงกัน
+                alert(<?php echo __('Please provide the same password.');?>);
                 //document.createAccount.confirm_password.focus();     
                 //document.createAccount.confirm_password.focus();     
                 return false;
                 return false;
             }
             }

www/src/Template/Users/forgot_password.ctp

 <div class="row">
 <div class="row">
     <div class="center">
     <div class="center">
-        <div class="title_header"><a href="javascript:history.go(-1)"><?php echo $this->Html->image('/img/core/img/back-icon@3x.png', ['style' => 'float: left;padding-left: 15px;padding-top: 5px;']); ?></a><?php echo __('Forgot password');//ลืมรหัสผ่าน?></div>
+        <div class="title_header"><a href="javascript:history.go(-1)"><?php echo $this->Html->image('/img/core/img/back-icon@3x.png', ['style' => 'float: left;padding-left: 15px;padding-top: 5px;']); ?></a><?php echo __('Forgot password');?></div>
     </div>
     </div>
     <div class="col-md-12">
     <div class="col-md-12">
 
 
@@ -11,14 +11,14 @@
             <div>
             <div>
                 <div class="form-group has-feedback">
                 <div class="form-group has-feedback">
                     <div class="col-md-12">
                     <div class="col-md-12">
-                        <label class="label-text-sub"><?php echo __('Email');//อีเมล?><em>* </em></label>
+                        <label class="label-text-sub"><?php echo __('Email');?><em>* </em></label>
                         <input type="text" value="" name="email" placeholder="mail@xxx.com" class="form-control-reg border-bottom-from" id="fremail">
                         <input type="text" value="" name="email" placeholder="mail@xxx.com" class="form-control-reg border-bottom-from" id="fremail">
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
             <div>
             <div>
                 <?php
                 <?php
-                    echo $this->Form->submit('ตรวจสอบ', array('div' => false, 'class' => 'btn btn-quaternary mr-xs mb-sm button-text',
+                    echo $this->Form->submit('submit', array('div' => false, 'class' => 'btn btn-quaternary mr-xs mb-sm button-text',
                     'name' => 'btn', 'id' => '', 'title' => 'Title'));
                     'name' => 'btn', 'id' => '', 'title' => 'Title'));
                 ?>
                 ?>
             </div>
             </div>
@@ -31,13 +31,13 @@
     function validateForm() {
     function validateForm() {
         var email = document.forms["forgotPressword"]["email"].value;
         var email = document.forms["forgotPressword"]["email"].value;
         if (email == null || email == "") {
         if (email == null || email == "") {
-            alert("Please enter your email.");//กรุณากรอกอีเมลล์
+            alert(<?php echo __('Please enter your email.');?>);
             return false;
             return false;
         }
         }
             // Validate Email
             // Validate Email
             var email = $("#fremail").val();
             var email = $("#fremail").val();
             if ((/(.+)@(.+){2,}\.(.+){2,}/.test(email)) || email=="" || email==null) { } else {
             if ((/(.+)@(.+){2,}\.(.+){2,}/.test(email)) || email=="" || email==null) { } else {
-                alert("Email address format wrong Please enter the correct.");//รูปแบบที่อยู่อีเมลล์ผิด กรุณากรอกให้ถูกต้อง
+                alert(<?php echo __('Email address format wrong Please enter the correct.');?>);
                 return false;
                 return false;
             }
             }
     }
     }

www/src/Template/Users/pin_codepassword.ctp

 <div>
 <div>
     <div class=" row center">
     <div class=" row center">
-        <div class="title_header"><?php echo __('Verify PIN');//ยืนยันตัวตนด้วยรหัส PIN?></div>
+        <div class="title_header"><?php echo __('Verify PIN');?></div>
     </div>
     </div>
     <div style="padding-top: 20px;"></div>
     <div style="padding-top: 20px;"></div>
 
 
@@ -15,7 +15,7 @@
             <div class="form-group has-feedback">
             <div class="form-group has-feedback">
                 <div class="col-md-12">
                 <div class="col-md-12">
                     <div class=" row center">
                     <div class=" row center">
-                    <?php echo __('4 digit PIN in the email address specified for access');//รหัส PIN 4 หลัก ในอีเมลล์ที่ระบุเพื่อเข้าใช้งาน?>
+                    <?php echo __('4 digit PIN in the email address specified for access');?>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
@@ -37,7 +37,7 @@
                 <div class="col-md-12">
                 <div class="col-md-12">
                     <div class=" row center">
                     <div class=" row center">
                         <?php
                         <?php
-                            echo $this->Html->link('Re-send pin code', ['controller' => 'Users', 'action' => 'forgotsendpin/'.$token]);//ส่ง pin ใหม่อีกครั้ง
+                            echo $this->Html->link('Re-send pin code', ['controller' => 'Users', 'action' => 'forgotsendpin/'.$token]);
                         ?>
                         ?>
                     </div>
                     </div>
                 </div>
                 </div>