Skip to content

smart_core_connect / core-connect

Go to a project
Commit 46764a3e by Prasong Putichanchai
Options

Merge branch 'integration' into prasong

parents fa599bc6 a13642d4
Showing with 279 additions and 39 deletions
www/src/Locale/en_EN/default.po
......@@ -8,13 +8,133 @@ msgstr ""
"PO-Revision-Date: 2018-05-07 13:13+0700\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
"Language: th_TH\n"
"Language: en_EN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 2.0.7\n"
#: Controller/AppController.php:318
#: Controller/ProfilesController.php/index.ctp:56
msgid "user profile"
msgstr "User Profile"
\ No newline at end of file
msgstr "User profile"
#: Controller/ProfilesController.php/index.ctp:62
msgid "username"
msgstr "Username"
#: Controller/ProfilesController.php/index.ctp:68,69
msgid "firstname"
msgstr "Firstname"
#: Controller/ProfilesController.php/index.ctp:75,76
msgid "lastname"
msgstr "lastname"
#: Controller/ProfilesController.php/index.ctp:82
msgid "birthdate"
msgstr "Birth date"
#: Controller/ProfilesController.php/index.ctp:90
msgid "gender"
msgstr "Gender"
#: Controller/ProfilesController.php/index.ctp:103
msgid "blood group"
msgstr "Blood group"
#: Controller/ProfilesController.php/index.ctp:122,123
msgid "mobile"
msgstr "Mobile"
#: Controller/ProfilesController.php/index.ctp:129
msgid "email"
msgstr "Email"
#: Controller/ProfilesController.php/index.ctp:137
msgid "address"
msgstr "Address"
#: Controller/ProfilesController.php/index.ctp:143
msgid "country"
msgstr "Country"
#: Controller/ProfilesController.php/index.ctp:162
msgid "province"
msgstr "Province"
#: Controller/ProfilesController.php/index.ctp:181
msgid "SAVE"
msgstr "SAVE"
#: Controller/ProfilesController.php/index.ctp:226
msgid "This email is already in the system."
msgstr "This email is already in the system."
#: Controller/ProfilesController.php/index.ctp:235
msgid "only numbers"
msgstr "Please enter only numbers"
#: Controller/ProfilesController.php/index.ctp:244
msgid "Please enter your firstname."
msgstr "Please enter your firstname."
#: Controller/ProfilesController.php/index.ctp:249
msgid "Please enter your lastname."
msgstr "Please enter your lastname."
#: Controller/ProfilesController.php/index.ctp:255
msgid "Please enter your birthdate."
msgstr "Please enter your birthdate."
#: Controller/ProfilesController.php/index.ctp:261
msgid "Please enter your mobile."
msgstr "Please enter your mobile."
#: Controller/ProfilesController.php/index.ctp:266
msgid "Please enter a 10 digit mobile number."
msgstr "Please enter a 10 digit mobile number."
#: Controller/ProfilesController.php/index.ctp:272
msgid "Please enter your email address."
msgstr "Please enter your email address."
#: Controller/ProfilesController.php/index.ctp:278
msgid "Email address format wrong, Please enter the correct number."
msgstr "Email address format wrong, Please enter the correct number."
#: Controller/ProfilesController.php/index.ctp:291
msgid "Please specify country"
msgstr "Please select country"
#: Controller/ProfilesController.php/index.ctp:296
msgid "Please specify province"
msgstr "Please select province"
#: Controller/ProfilesController.php:119
msgid "Update Complete."
msgstr "Update Complete."
#: Controller/ProfilesController.php:123
msgid "Email Address already used by others."
msgstr "Email Address already used by others."
#: Controller/ProfilesController.php:125
msgid "Not update. Please, try again."
msgstr "Not update. Please, try again."
#: Controller/UsersController.php/forgot_password.ctp:14
msgid "Email"
msgstr "Email"
#: Controller/UsersController.php/forgot_password.ctp:34
msgid "Please enter your email."
msgstr "Please enter your email."
#: Controller/UsersController.php/forgot_password.ctp:40
msgid "Email address format wrong Please enter the correct."
msgstr "Email address format wrong Please enter the correct."
#: Controller/UsersController.php/forgot_password.ctp:3
msgid "Forgot password"
msgstr "Forgot password"
\ No newline at end of file
www/src/Locale/th_TH/default.po
......@@ -15,6 +15,126 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 2.0.7\n"
#: Controller/AppController.php:318
#: View/Profiles/index:56
msgid "user profile"
msgstr "User Profile"
\ No newline at end of file
msgstr "ข้อมูลสมาชิก"
#: View/Profiles/index:61,62
msgid "username"
msgstr "ชื่อผู้ใช้งาน"
#: View/Profiles/index:68
msgid "firstname"
msgstr "ชื่อ"
#: View/Profiles/index:75
msgid "lastname"
msgstr "นามสกุล"
#: View/Profiles/index:82
msgid "birthdate"
msgstr "วันเดือนปีเกิด"
#: View/Profiles/index:90
msgid "gender"
msgstr "เพศ"
#: View/Profiles/index:93
msgid "male"
msgstr "ชาย"
#: View/Profiles/index:96
msgid "female"
msgstr "หญิง"
#: View/Profiles/index:103
msgid "blood group"
msgstr "กรุ๊ปเลือด"
#: View/Profiles/index:106
msgid "A"
msgstr "เอ"
#: View/Profiles/index:109
msgid "B"
msgstr "บี"
#: View/Profiles/index:112
msgid "AB"
msgstr "เอบี"
#: View/Profiles/index:115
msgid "O"
msgstr "โอ"
#: View/Profiles/index:122
msgid "mobile"
msgstr "หมายเลขโทรศัพท์(มือถือ)"
#: View/Profiles/index:129
msgid "email"
msgstr "ที่อยู่อีเมล"
#: View/Profiles/index:137
msgid "address"
msgstr "ที่อยู่"
#: View/Profiles/index:143
msgid "country"
msgstr "ประเทศ"
#: View/Profiles/index:162
msgid "province"
msgstr "จังหวัด"
#: View/Profiles/index:181
msgid "SAVE"
msgstr "บันทึก"
#: View/Profiles/index:199
msgid "Show QR Code to get permission"
msgstr "แสดงคิวอาร์โค้ดเพื่อรับสิทธิ์"
#: View/Profiles/index:226
msgid "This email is already in the system."
msgstr "อีเมลนี้มีอยู่ในระบบอยู่แล้ว"
#: View/Profiles/index:235
msgid "only numbers"
msgstr "กรอกเฉพาะหมายเลข"
#: View/Profiles/index:244
msgid "Please enter your firstname."
msgstr "กรุณากรอกชื่อของท่าน"
#: View/Profiles/index:249
msgid "Please enter your lastname."
msgstr "กรุณากรอกนามสกุลของท่าน"
#: View/Profiles/index:255
msgid "Please enter your birthdate."
msgstr "กรุณากรอกวันเดือนปีเกิดของท่าน"
#: View/Profiles/index:261
msgid "Please enter your mobile."
msgstr "กรุณากรอกหมายเลขโทรศัพท์(มือถือ)ของท่าน"
#: View/Profiles/index:266
msgid "Please enter a 10 digit mobile number."
msgstr "กรุณากรอกหมายเลขโทรศัพท์ให้ครบ 10 หลัก"
#: View/Profiles/index:272
msgid "Please enter your email address."
msgstr "กรุณากรอกที่อยู่อีเมล"
#: View/Profiles/index:278
msgid "Email address format wrong, Please enter the correct number."
msgstr "รูปแบบของที่อยู่อีเมลผิด กรุณากรอกให้ถูกต้อง"
#: View/Profiles/index:291
msgid "Please specify country"
msgstr "กรุณาระบุประเทศ"
#: View/Profiles/index:296
msgid "Please specify province"
msgstr "กรุณาระบุจังหวัด"
\ No newline at end of file
www/src/Template/Profiles/index.ctp
......@@ -119,8 +119,8 @@
</div>
<div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12">
<?php echo __('moblie');?><em>* </em>
<?php echo $this->Form->input('UserPersonals.moblie_no', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $responseUserPersonal['moblie_no'], 'id' => 'moblieNo', 'type' => 'text', 'label' => false, 'maxlength' => '10', 'placeholder' => 'moblie']); ?>
<?php echo __('mobile');?><em>* </em>
<?php echo $this->Form->input('UserPersonals.moblie_no', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $responseUserPersonal['moblie_no'], 'id' => 'moblieNo', 'type' => 'text', 'label' => false, 'maxlength' => '10', 'placeholder' => 'mobile']); ?>
<?php // echo $this->Form->input('moblie_no', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $userProfiles->moblie_no, 'id' => 'moblieNo', 'type' => 'text', 'label' => __('เบอร์โทรศัพท์'), 'placeholder' => '000-000-0000']); ?>
</div>
</div>
......@@ -196,7 +196,7 @@
</div>
<div>
<div class="qrcode-profile"><br>
<?php echo __('แสดง QR Code เพื่อรับสิทธิ์');?>
<?php echo __('Show QR Code to get permission');?>
</div>
<img src="/img/core/img/connect-card-back.png" class="img-responsive" id="img-upload" alt="Profile picture">
<div class="qrcode-name">
......@@ -223,7 +223,7 @@
// console.log(data);
data = jQuery.parseJSON(data);
if(data['chk'] == 'false'){
alert("This email is already in the system.");
alert(<?php echo __('This email is already in the system.') ?>);
return false;
}
});
......@@ -232,7 +232,7 @@
var elem = document.getElementById('moblieNo').value;
// console.log(elem);
if(!elem.match(/^([A-Za-zก-๙])+$/i)){
alert("only numbers");
alert(<?php echo __('only numbers') ?>);
return false;
}
})
......@@ -241,41 +241,41 @@
function validateForm() {
var firstname_th = document.getElementById("firstname_th").value;
if (firstname_th == null || firstname_th == "") {
alert("Please enter your firstname.");
alert(<?php echo __('Please enter your firstname.') ?>);
return false;
}
var lastname_th = document.getElementById("lastname_th").value;
if (lastname_th == null || lastname_th == "") {
alert("Please enter your lastname.");
alert(<?php echo __('Please enter your lastname.') ?>);
return false;
}
var birthdate = document.getElementById("datepicker").value;
if (birthdate == null || birthdate == "") {
alert("Please enter your birthdate.");
alert(<?php echo __('Please enter your birthdate.') ?>);
return false;
}
var moblieNo = document.getElementById("moblieNo").value;
if (moblieNo == null || moblieNo == "") {
alert("Please enter your mobile.");
alert(<?php echo __('Please enter your mobile.') ?>);
return false;
}
if(document.getElementById("moblieNo").value.length != 10)
{
alert('Please enter a 10 digit mobile number.');
alert(<?php echo __('Please enter a 10 digit mobile number.') ?>);
return false;
}
var email = document.getElementById("email").value;
if (email == null || email == "") {
alert("Please enter your email address.");
alert(<?php echo __('Please enter your email address.') ?>);
return false;
}
var email = $("#email").val();
if (/(.+)@(.+){2,}\.(.+){2,}/.test(email)) { } else {
alert("Email address format wrong, Please enter the correct number.");
alert(<?php echo __('Email address format wrong, Please enter the correct number.') ?>);
return false;
}
// var email = document.getElementById("email").value;
......@@ -288,12 +288,12 @@
// });
var master_country_id = document.getElementById("master_country_id").value;
if (master_country_id == null || master_country_id == "") {
alert("Please specify country");
alert(<?php echo __('Please specify country') ?>);
return false;
}
var master_province_id = document.getElementById("master_province_id").value;
if (master_province_id == null || master_province_id == "") {
alert("Please specify province");
alert(<?php echo __('Please specify province') ?>);
return false;
}
......
www/src/Template/Users/change_forgotpassword.ctp
......@@ -11,7 +11,7 @@
<div>
<div class="form-group has-feedback">
<div class="col-md-12">
<label class="label-text-sub"><?php echo __('รหัสผ่านใหม่');?></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;">
</div>
</div>
......@@ -19,7 +19,7 @@
<div>
<div class="form-group has-feedback">
<div class="col-md-12">
<label class="label-text-sub"><?php echo __('ยืนยันรหัสผ่าน');?></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;">
</div>
</div>
......@@ -29,8 +29,8 @@
<div>
<?php
echo $this->Form->submit('ตรวจสอบ', array('div' => false, 'class' => 'btn btn-quaternary mr-xs mb-sm button-text',
'name' => 'btn', 'id' => '', 'title' => 'Title'));
echo $this->Form->submit('submit', array('div' => false, 'class' => 'btn btn-quaternary mr-xs mb-sm button-text',
'name' => 'btn', 'id' => '', 'title' => 'Title'));//ตกลง
?>
</div>
......@@ -46,7 +46,7 @@
var elem = document.getElementById('password').value;
// console.log(elem);
if(!elem.match(/^([A-Za-z0-9])+$/i)){
alert("กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น");
alert("Please enter only English letters and numbers.");//กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น
return false;
}
})
......@@ -55,7 +55,7 @@
var elem = document.getElementById('confirm_password').value;
// console.log(elem);
if(!elem.match(/^([A-Za-z0-9])+$/i)){
alert("กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น");
alert("Please enter only English letters and numbers.");//กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาอังกฤษและตัวเลขเท่านั้น
return false;
}
})
......@@ -64,26 +64,26 @@
var password = document.forms["changePressword"]["password"].value;
if (password == null || password == "") {
alert("กรุณากรอก รหัสผ่านใหม่");
alert("Please enter a new password.");//กรุณากรอก รหัสผ่านใหม่
return false;
}
if(document.forms["changePressword"]["password"].value.length < 8)
{
alert('กรุณาระบุรหัสผ่านใหม่อย่างน้อย 8 ตัวอักษร');
alert('Please enter a new password at least 8 characters.');//กรุณาระบุรหัสผ่านใหม่อย่างน้อย 8 ตัวอักษร
return false;
}
var confirm_password = document.forms["changePressword"][["confirm_password"]].value;
if (confirm_password == null || confirm_password == "") {
alert("กรุณากรอก ยืนยันรหัสผ่าน");
alert("Please enter your password.");//กรุณากรอก ยืนยันรหัสผ่าน
return false;
}
if(document.forms["changePressword"]["confirm_password"].value.length < 8)
{
alert('กรุณาระบุยืนยันรหัสผ่านอย่างน้อย 8 ตัวอักษร');
alert('Please enter at least 8 characters.');//กรุณาระบุยืนยันรหัสผ่านอย่างน้อย 8 ตัวอักษร
return false;
}
if(document.forms["changePressword"]["password"].value != document.forms["changePressword"]["confirm_password"].value){
alert('กรุณาระบุรหัสผ่านให้ตรงกัน');
alert('Please provide the same password.');//กรุณาระบุรหัสผ่านให้ตรงกัน
//document.createAccount.confirm_password.focus();
return false;
}
......
www/src/Template/Users/forgot_password.ctp
<div class="row">
<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 __('ลืมรหัสผ่าน');?></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 class="col-md-12">
......@@ -11,7 +11,7 @@
<div>
<div class="form-group has-feedback">
<div class="col-md-12">
<label class="label-text-sub"><?php echo __('อีเมล');?><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">
</div>
</div>
......@@ -31,13 +31,13 @@
function validateForm() {
var email = document.forms["forgotPressword"]["email"].value;
if (email == null || email == "") {
alert("กรุณากรอกอีเมลล์");
alert("Please enter your email.");//กรุณากรอกอีเมลล์
return false;
}
// Validate Email
var email = $("#fremail").val();
if ((/(.+)@(.+){2,}\.(.+){2,}/.test(email)) || email=="" || email==null) { } else {
alert("รูปแบบที่อยู่อีเมลล์ผิด กรุณากรอกให้ถูกต้อง");
alert("Email address format wrong Please enter the correct.");//รูปแบบที่อยู่อีเมลล์ผิด กรุณากรอกให้ถูกต้อง
return false;
}
}
......
www/src/Template/Users/pin_codepassword.ctp
<div>
<div class=" row center">
<div class="title_header"><?php echo __('ยืนยันตัวตนด้วยรหัส PIN');?></div>
<div class="title_header"><?php echo __('Verify PIN');//ยืนยันตัวตนด้วยรหัส PIN?></div>
</div>
<div style="padding-top: 20px;"></div>
......@@ -15,7 +15,7 @@
<div class="form-group has-feedback">
<div class="col-md-12">
<div class=" row center">
<?php echo __('รหัส PIN 4 หลัก ในอีเมลล์ที่ระบุเพื่อเข้าใช้งาน');?>
<?php echo __('4 digit PIN in the email address specified for access');//รหัส PIN 4 หลัก ในอีเมลล์ที่ระบุเพื่อเข้าใช้งาน?>
</div>
</div>
</div>
......@@ -37,7 +37,7 @@
<div class="col-md-12">
<div class=" row center">
<?php
echo $this->Html->link('ส่ง pin ใหม่อีกครั้ง', ['controller' => 'Users', 'action' => 'forgotsendpin/'.$token]);
echo $this->Html->link('Re-send pin code', ['controller' => 'Users', 'action' => 'forgotsendpin/'.$token]);//ส่ง pin ใหม่อีกครั้ง
?>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment