Skip to content

smart_core_connect / core-connect

Go to a project
Commit ac0f9b93 by Wittaya-PIM
Options

Merge branch 'integration' into wittaya

parents efc22db5 8b1dcc6c
Showing with 192 additions and 55 deletions
www/src/Controller/ProfilesController.php
......@@ -38,7 +38,7 @@ class ProfilesController extends AppController
'valueField' => 'country_name_th'
]);
if(!empty($Country)) $Country = $Country->toArray();
asort($Country);
//********DropdownProvince********
$this->loadModel('MasterProvinces');
$Province = $this->MasterProvinces->find('list', [
......@@ -51,7 +51,7 @@ class ProfilesController extends AppController
->order(['province_name_th']);
// pr($Province);die;
if(!empty($Province)) $Province = $Province->toArray();
asort($Province);
$res = $responseUserPersonal['birthdate'];
if($res){
$dateNow = @$res->i18nFormat('dd/MM/yyyy');
......
www/src/Controller/ProvincesController.php
......@@ -23,6 +23,7 @@ public function initialize() {
))->toArray();
$arr = array();
if(!empty($states)){
asort($states);
echo '<option value=""> ---Select--- </option>';
foreach($states as $key => $val){
echo '<option value="' . $key . '">' . $val. '</option>';
......
www/src/Controller/UsersController.php
......@@ -145,7 +145,7 @@ class UsersController extends AppController {
]
);
if(!empty($countries)) $countries = $countries->toArray();
asort($countries);
$provinces = $this->MasterProvinces->find('list',
[
'conditions' => ['is_used' => true],
......@@ -154,6 +154,7 @@ class UsersController extends AppController {
]
);
if(!empty($provinces)) $provinces = $provinces->toArray();
asort($provinces);
$this->set(compact('provinces','countries'));
$this->viewBuilder()->layout('blank');
......
www/src/Locale/en_EN/default.po
......@@ -435,3 +435,11 @@ msgstr "Verify Completed."
#: View/Users:325
msgid "Pin Code Invalid"
msgstr "Pin Code Invalid"
#: View/Users/changge_password:94
msgid "Please enter a old password."
msgstr "Please enter a old password."
#: View/Users/changge_password:99
msgid "Please enter a old password at least 8 characters."
msgstr "Please enter a old password at least 8 characters."
\ No newline at end of file
www/src/Locale/th_TH/default.po
......@@ -455,3 +455,11 @@ msgstr "สมัครสมาชิกสำเร็จ"
#: View/Users:325
msgid "Pin Code Invalid"
msgstr "Pin Code ผิด"
#: View/Users/changge_password:94
msgid "Please enter a old password."
msgstr "กรุณากรอก รหัสผ่านเก่า"
#: View/Users/changge_password:99
msgid "Please enter a old password at least 8 characters."
msgstr "กรุณาระบุรหัสผ่านเก่าอย่างน้อย 8 ตัวอักษร"
\ No newline at end of file
www/src/Template/Element/card_from/from_0.ctp
......@@ -82,25 +82,29 @@ use Cake\I18n\Time;
<!--/row modal card-->
<style>
.form_1 {
width: 100%;
height: 100%;
margin: auto;
padding: auto;
}
.form_1-card-img {
position: absolute;
width: 100%;
margin: auto;
padding: auto;
}
.form_1-card-img img {
position: relative;
width: 100%;
}
/* iPads (landscape) ----------- */
@media screen and (min-width: 1024px) {
.rotate270 .row {
font-size: 28px !important;
}
.form_1 .date-name {
width: 500px;
margin: 55% 0% 0% -40%;
......@@ -109,27 +113,135 @@ use Cake\I18n\Time;
z-index: 9999;
display: block;
}
.date-name div div {
height: 35px;
}
.form_1 .date-position {
width: 500px;
margin: 70% 0% 0% -15%;
position: absolute;
border-bottom: 0px solid #000;
display: block;
}
.form_1 .date-time {
width: 500px;
margin: 70% 0% 0% 10%;
margin: 70% 0% 0% 12%;
border-bottom: 0px solid #000;
}
.form_1 .date-label {
width: 500px;
margin: 70% 0% 0% 20%;
border-bottom: 0px solid #000;
}
}
/* Add your styles for devices with a maximum width of 768 */
@media screen and (max-width: 768px){
.rotate270 .row {
font-size: 25px !important;
}
.form_1 .date-name {
width: 500px;
margin: 55% 0% 0% -40%;
border-bottom: 0px solid red;
position: absolute;
z-index: 9999;
display: block;
}
.date-name div div {
height: 35px;
}
.form_1 .date-position {
width: 500px;
margin: 70% 0% 0% -15%;
position: absolute;
border-bottom: 0px solid #000;
display: block;
}
.form_1 .date-time {
width: 500px;
margin: 70% 0% 0% 12%;
border-bottom: 0px solid #000;
}
.form_1 .date-label {
width: 500px;
margin: 70% 0% 0% 20%;
border-bottom: 0px solid #000;
}
}
/* Add your styles for devices with a maximum width of 480 */
@media screen and (max-width: 480px){
.rotate270 .row {
font-size: 22px !important;
}
.form_1 .date-name {
width: 450px;
margin: 55% 0% 0% -45%;
border-bottom: 0px solid red;
position: absolute;
z-index: 9999;
display: block;
}
.date-name div div {
height: 35px;
}
.form_1 .date-position {
width: 450px;
margin: 70% 0% 0% -18%;
position: absolute;
border-bottom: 0px solid #000;
display: block;
}
.form_1 .date-time {
width: 450px;
margin: 70% 0% 0% 5%;
border-bottom: 0px solid #000;
}
.form_1 .date-label {
width: 450px;
margin: 70% 0% 0% 15%;
border-bottom: 0px solid #000;
}
}
/* Add your styles for devices with a maximum width of 320 */
@media screen and (max-width: 320px) {
.rotate270 .row {
font-size: 20px !important;
}
.form_1 .date-name {
width: 400px;
margin: 50% 0% 0% -40%;
border-bottom: 0px solid red;
position: absolute;
z-index: 9999;
display: block;
}
.date-name div div {
height: 35px;
}
.form_1 .date-position {
width: 400px;
margin: 68% 0% 0% -12%;
border-bottom: 0px solid #000;
}
.form_1 .date-time {
width: 400px;
margin: 70% 0% 0% 5%;
border-bottom: 0px solid #000;
}
.form_1 .date-label {
width: 400px;
margin: 70% 0% 0% 15%;
border-bottom: 0px solid #000;
}
}
</style>
\ No newline at end of file
www/src/Template/Profiles/index.ctp
......@@ -351,14 +351,14 @@ use Cake\I18n\Time;
<!--- *************** model list ******************* -->
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12">
<div class="col-xs-12 col-sm-12 col-md-12" >
<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-labelledby="defaultModalLabel" aria-hidden="true">
<div class="modal-dialog box-ads">
<a class="close-modal" data-dismiss="modal">X </a>
<div class="container login-container">
<div class="owl-carousel owl-theme" data-plugin-options="{'items': 1}">
<div>
<img src="/img/core/img/connect-card-v2.png" class="img-responsive" id="img-upload" alt="Profile picture">
<img src="/img/core/img/connect-card-v2.png" class="img-responsive" id="img-upload" alt="Profile picture" >
</div>
<div>
<div class="qrcode-profile"><br>
......@@ -542,8 +542,7 @@ use Cake\I18n\Time;
}
.box-ads {
width: 1%;
display: table;
margin: auto;
padding: auto;
position: relative;
......@@ -582,6 +581,11 @@ use Cake\I18n\Time;
display:block;
z-index:3999;
}
@media screen and (min-width: 1024px) {
.box-ads .close-modal {
margin-right: 100px;
}
}
</style>
......
www/src/Template/Users/change_forgotpassword.ctp
......@@ -46,7 +46,7 @@
var elem = document.getElementById('password').value;
// console.log(elem);
if(!elem.match(/^([A-Za-z0-9])+$/i)){
alert(<?php echo __('Please enter only English letters and numbers.');?>);
alert("<?php echo __('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(<?php echo __('Please enter only English letters and numbers.');?>);
alert("<?php echo __('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(<?php echo __('Please enter a new password.');?>);
alert("<?php echo __('Please enter a new password.');?>");
return false;
}
if(document.forms["changePressword"]["password"].value.length < 8)
{
alert(<?php echo __('Please enter a new password at least 8 characters.');?>);
alert("<?php echo __('Please enter a new password at least 8 characters.');?>");
return false;
}
var confirm_password = document.forms["changePressword"][["confirm_password"]].value;
if (confirm_password == null || confirm_password == "") {
alert(<?php echo __('Please enter your password.');?>);
alert("<?php echo __('Please enter your password.');?>");
return false;
}
if(document.forms["changePressword"]["confirm_password"].value.length < 8)
{
alert(<?php echo __('Please enter at least 8 characters.');?>);
alert("<?php echo __('Please enter at least 8 characters.');?>");
return false;
}
if(document.forms["changePressword"]["password"].value != document.forms["changePressword"]["confirm_password"].value){
alert(<?php echo __('Please provide the same password.');?>);
alert("<?php echo __('Please provide the same password.');?>");
//document.createAccount.confirm_password.focus();
return false;
}
......
www/src/Template/Users/change_password.ctp
......@@ -81,36 +81,36 @@
var password = document.forms["changePressword"]["oldpassword"].value;
if (password == null || password == "") {
alert("กรุณากรอก รหัสผ่านเก่า");
alert("<?php echo __('Please enter a old password.');?>");
return false;
}
if(document.forms["changePressword"]["oldpassword"].value.length < 8)
{
alert('กรุณาระบุรหัสผ่านเก่าอย่างน้อย 8 ตัวอักษร');
alert("<?php echo __('Please enter a old password at least 8 characters.');?>");
return false;
}
var password = document.forms["changePressword"]["password"].value;
if (password == null || password == "") {
alert("กรุณากรอก รหัสผ่านใหม่");
alert("<?php echo __('Please enter a new password.');?>");
return false;
}
if(document.forms["changePressword"]["password"].value.length < 8)
{
alert('กรุณาระบุรหัสผ่านใหม่อย่างน้อย 8 ตัวอักษร');
alert("<?php echo __('Please enter a new password at least 8 characters.');?>");
return false;
}
var confirm_password = document.forms["changePressword"][["confirm_password"]].value;
if (confirm_password == null || confirm_password == "") {
alert("กรุณากรอก ยืนยันรหัสผ่าน");
alert("<?php echo __('Please enter your password.');?>");
return false;
}
if(document.forms["changePressword"]["confirm_password"].value.length < 8)
{
alert('กรุณาระบุยืนยันรหัสผ่านอย่างน้อย 8 ตัวอักษร');
alert("<?php echo __('Please enter at least 8 characters.');?>");
return false;
}
if(document.forms["changePressword"]["password"].value != document.forms["changePressword"]["confirm_password"].value){
alert('กรุณาระบุรหัสผ่านให้ตรงกัน');
alert("<?php echo __('Please provide the same password.');?>");
//document.createAccount.confirm_password.focus();
return false;
}
......
www/src/Template/Users/forgot_password.ctp
......@@ -31,13 +31,13 @@
function validateForm() {
var email = document.forms["forgotPressword"]["email"].value;
if (email == null || email == "") {
alert(<?php echo __('Please enter your email.');?>);
alert("<?php echo __('Please enter your email.');?>");
return false;
}
// Validate Email
var email = $("#fremail").val();
if ((/(.+)@(.+){2,}\.(.+){2,}/.test(email)) || email=="" || email==null) { } else {
alert(<?php echo __('Email address format wrong Please enter the correct.');?>);
alert("<?php echo __('Email address format wrong Please enter the correct.');?>");
return false;
}
}
......
www/src/Template/Users/signup.ctp
......@@ -172,7 +172,7 @@
var elem = document.getElementById('username').value;
// console.log(elem);
if(!elem.match(/^([A-Za-z0-9])+$/i)){
alert(<?php echo __("Please enter only text in English or numbers.");?>);
alert("<?php echo __('Please enter only text in English or numbers.');?>");
return false;
}
})
......@@ -181,7 +181,7 @@
var elem = document.getElementById('firstname').value;
// console.log(elem);
if(!elem.match(/^([A-Za-z0-9ก-๙])+$/i)){
alert(<?php echo __("Please enter text in English, Thai or only.");?>);
alert("<?php echo __('Please enter text in English, Thai or only.');?>");
return false;
}
})
......@@ -190,7 +190,7 @@
var elem = document.getElementById('lastname').value;
// console.log(elem);
if(!elem.match(/^([A-Za-z0-9ก-๙])+$/i)){
alert(<?php echo __("Please enter text in English, Thai or only.");?>);
alert("<?php echo __('Please enter text in English, Thai or only.');?>");
return false;
}
})
......@@ -199,7 +199,7 @@
var elem = document.getElementById('password').value;
// console.log(elem);
if(!elem.match(/^([A-Za-z0-9])+$/i)){
alert(<?php echo __("Please enter only text in English or numbers.");?>);
alert("<?php echo __('Please enter only text in English or numbers.');?>");
return false;
}
})
......@@ -208,7 +208,7 @@
var elem = document.getElementById('confirm_password').value;
// console.log(elem);
if(!elem.match(/^([A-Za-z0-9])+$/i)){
alert(<?php echo __("Please enter only text in English or numbers.");?>);
alert("<?php echo __('Please enter only text in English or numbers.');?>");
return false;
}
})
......@@ -219,7 +219,7 @@
// console.log(data);
data = jQuery.parseJSON(data);
if(data['chk'] == 'false'){
alert(<?php echo __("This email is already in the system.");?>);
alert("<?php echo __('This email is already in the system.');?>");
return false;
}
});
......@@ -231,14 +231,14 @@
// if (((e_k < 48) || (e_k > 57)) && e_k != 46 ) {
if (e_k = 10 && (e_k < 48) || (e_k > 59)) {
event.returnValue = false;
alert("Please enter the phone number. Only numbers.");
alert("<?php echo __('Please enter the phone number. Only numbers.');?>");
}
}
function check_notnum() {
var letters = /^[A-Za-zก-๙]+$/;
if(letters.test( event.key )==false){
alert("Please enter the correct Thai or English text.");
alert("<?php echo __('Please enter the correct Thai or English text.');?>");
return false;
}
......@@ -251,96 +251,96 @@
e_k = true;
}else{
e_k = false;
alert("Please enter only English letters and numbers.");
alert("<?php echo __('Please enter only English letters and numbers.');?>");
}
}
function validateForm() {
var firstname = document.getElementById("firstname").value;
if (firstname == null || firstname == "") {
alert("Please enter your firstname.");
alert("<?php echo __('Please enter your firstname.');?>");
return false;
}
var lastname = document.getElementById("lastname").value;
if (lastname == null || lastname == "") {
alert("Please enter your lastname.");
alert("<?php echo __('Please enter your lastname.');?>");
return false;
}
var username = document.getElementById("username").value;
if (username == null || username == "") {
alert("Please enter your username.");
alert("<?php echo __('Please enter your username.');?>");
return false;
}
if(document.getElementById("username").value.length < 4 || document.getElementById("username").value.length > 10)
{
alert('Please enter a 4-10 character username.');
alert("<?php echo __('Please enter a 4-10 character username.');?>");
return false;
}
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;
}
var birthdate = document.getElementById("date").value;
if (birthdate == null || birthdate == "") {
alert("Please enter the date of your birth.");
alert("<?php echo __('Please enter the date of your birth.');?>");
return false;
}
var moblie_no = document.getElementById("moblie_no").value;
if (moblie_no == null || moblie_no == "") {
alert("Please enter your phone number.");
alert("<?php echo __('Please enter your phone number.');?>");
return false;
}
if(document.getElementById("moblie_no").value.length != 10)
{
alert('Please enter a 10 digit phone number.');
alert("<?php echo __('Please enter a 10 digit phone number.');?>");
return false;
}
var email = document.getElementById("fremail").value;
if (email == null || email == "") {
alert("Please enter your email.");
alert("<?php echo __('Please enter your email.');?>");
return false;
}
// Validate Email
var email = $("#fremail").val();
if (/(.+)@(.+){2,}\.(.+){2,}/.test(email)) { } else {
alert("Wrong email address format Please enter the correct number.");
alert("<?php echo __('Wrong email address format Please enter the correct number.');?>");
return false;
}
var password = document.getElementById("password").value;
if (password == null || password == "") {
alert("Please enter your password.");
alert("<?php echo __('Please enter your password.');?>");
return false;
}
if(document.forms["createAccount"]["password"].value.length < 8)
{
alert('Please enter at least 8 characters.');
alert("<?php echo __('Please enter at least 8 characters.');?>");
return false;
}
var confirm_password = document.getElementById("confirm_password").value;
if (confirm_password == null || confirm_password == "") {
alert("Please verify your password.");
alert("<?php echo __('Please verify your password.');?>");
return false;
}
if(confirm_password = document.getElementById("password").value != document.getElementById("confirm_password").value){
alert('Please provide your password.');
alert("<?php echo __('Please provide your password.');?>");
//document.createAccount.confirm_password.focus();
return false;
}
if($("#accept:checked").length==0){
alert("Please accept the Terms of Use.");
alert("<?php echo __('Please accept the Terms of Use.');?>");
return false;
}
......@@ -463,7 +463,7 @@
code span {
color:green;
}
.from-control-reg {
.form-control-reg {
padding: 5px;
vertical-align: middle;
font-family: 'cordia new' !important;
......
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