Skip to content

smart_core_connect / core-connect

Go to a project
Commit c5581a40 by Zen-PC\Zen
Options

Merge branch 'integration' into kraikrit 

# Conflicts:
#	www/src/Controller/UsersController.php
parents 4f81c251 ab409676
Showing with 329 additions and 325 deletions
www/src/Controller/UserCardsController.php
...@@ -229,4 +229,30 @@ class UserCardsController extends AppController ...@@ -229,4 +229,30 @@ class UserCardsController extends AppController
} }
} }
} }
public function viewCard($user_id = null){
$this->viewBuilder()->layout('blank');
$this->loadModel('UserCards');
$UserCards = $this->UserCards->find('all')
->select($this->UserCards)
->select(
'morg.org_name_th'
)
->join([
'morg' => [
'table' => 'master.master_organizations',
'type' => 'INNER',
'conditions' => [
'morg.id = userCards.organize_id'
],
]
])
->where([
'userCards.user_id' => $user_id
])
->order(['userCards.id' => 'ASC'])
->toArray();
// pr($UserCards);die;
$this->set(compact('UserCards'));
}
} }
\ No newline at end of file
www/src/Controller/UsersController.php
...@@ -8,6 +8,7 @@ use Cake\Routing\Router; ...@@ -8,6 +8,7 @@ use Cake\Routing\Router;
use Cake\I18n\Time; use Cake\I18n\Time;
use Cake\Mailer\Email; use Cake\Mailer\Email;
use Cake\Utility\Security; use Cake\Utility\Security;
use Cake\Auth\AbstractPasswordHasher;
class UsersController extends AppController class UsersController extends AppController
{ {
...@@ -317,113 +318,102 @@ class UsersController extends AppController ...@@ -317,113 +318,102 @@ class UsersController extends AppController
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
#Forgot Password #Forgot Password
public function forgotPassword() // public function forgotPassword()
{ // {
$this->viewBuilder()->layout('blank'); // $this->viewBuilder()->layout('blank');
$data = $this->request->data(); // $data = $this->request->data();
#$data['data']['ip'] = $this->request->clientIp(); // #$data['data']['ip'] = $this->request->clientIp();
if(!empty($data)){ // if(!empty($data)){
if(!empty($data['data']['username'])){ // if(!empty($data['data']['username'])){
$data['data']['ip'] = $this->request->clientIp();#prr($data); // $data['data']['ip'] = $this->request->clientIp();#prr($data);
$api_core_forgotPassword = Configure::read('Config.apiCore.forgotPassword'); // $api_core_forgotPassword = Configure::read('Config.apiCore.forgotPassword');
$http = new Client(); // $http = new Client();
$response = $http->post($api_core_forgotPassword,$data['data'])->body(); // $response = $http->post($api_core_forgotPassword,$data['data'])->body();
$response = json_decode($response,'_full');#debug($response); // $response = json_decode($response,'_full');#debug($response);
if(!empty($response)){ // if(!empty($response)){
if(trim($response['status']) == 'Success'){ // if(trim($response['status']) == 'Success'){
$this->Flash->success(__('Completed.')); // $this->Flash->success(__('Completed.'));
return $this->redirect(['controller' => 'Users', 'action' => 'signin']); // return $this->redirect(['controller' => 'Users', 'action' => 'signin']);
}else{ // }else{
$this->Flash->error(__('Forgot Password Fail')); // $this->Flash->error(__('Forgot Password Fail'));
return $this->redirect(['controller' => 'Users', 'action' => 'forgotPassword']); // return $this->redirect(['controller' => 'Users', 'action' => 'forgotPassword']);
} // }
}else{ // }else{
$this->Flash->error(__('Forgot Password Fail')); // $this->Flash->error(__('Forgot Password Fail'));
return $this->redirect(['controller' => 'Users', 'action' => 'forgotPassword']); // return $this->redirect(['controller' => 'Users', 'action' => 'forgotPassword']);
} // }
// }else{
// $this->Flash->error(__('Data Empty'));
// return $this->redirect(['controller' => 'Users', 'action' => 'forgotPassword']);
// }
// }
// }
public function forgotPassword()
{
$this->viewBuilder()->layout('blank');
$this->loadModel('UserPersonals');
if ($this->request->is('post')) {
$hasher = new DefaultPasswordHasher();
$email = $this->request->data['email'];
//-------------------Random---------------------------------------------------------------
$alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
$pass = array();
$alphaLength = strlen($alphabet) - 1;
for ($i = 0; $i < 8; $i++) {
$n = rand(0, $alphaLength);
$pass[] = $alphabet[$n];
}
$password = implode($pass);
//------------------------------------------------------------------------------------------
$users['password'] = $hasher->hash($password);
$user_personals = $this->UserPersonals->find('all',[
'conditions' => [
'UserPersonals.email' => $email
]
])->first();
pr($password);
if(!empty($user_personals)){
//--------------------ตัวส่ง Email ---------------------------------------------------------
// pr($user_personals);die;
// $data_notification = [];
// $data_notification['email'] = $this->request->data['email'];
// $data_notification['pin_code'] = $password;
// $this->notification($data_notification);
//----------------------------------------------------------------------------------------
$users = $this->Users->find('all',[
'conditions' => [
'Users.id' => $user_personals['user_id']
]
])->first();
pr($users);die;
$users = $this->Users->patchEntity($users, $this->request->getData());
$this->Users->save($users);
$this->Flash->success(__('send password to email success'));
return $this->redirect(['action' => 'signin']);
}else{ }else{
$this->Flash->error(__('Data Empty')); $this->Flash->error(__('Invalid Email.'));
return $this->redirect(['controller' => 'Users', 'action' => 'forgotPassword']); return $this->redirect(['action' => 'forgot-password']);
} }
} }
} }
#---------------------------------------------------------------------------------------------------
#Change Password #---------------------------------------------------------------------------------------------------
// public function changePassword()
// {
// $users = $this->Users->newEntity();
// // $this->viewBuilder()->layout('blank');
// $data = $this->request->data();#debug($data);exit();
// // pr($data);die;
// // if(!empty($data)){
// // if($this->validateAccount($data)){
// if ($this->request->is('post')) {
// $data['ip'] = $this->request->clientIp();#debug($data);exit();
// $hasher = new DefaultPasswordHasher();
// $data['id'] = 59445;
// $users = $this->Users->find('all',[
// 'conditions'=>[
// 'Users.id' => $data['id'],
// ]
// ])->first();
// // pr($data['password']);
// // pr($users['password']);die;
// // $sss = check( $data['password'] , $users['password'] );
// $user['password'] = $hasher->hash($data['password']);
// // pr($user);die;
// $users = $this->Users->patchEntity($users, $this->request->getData());
// $this->Users->save($users);
// $this->Flash->error(__('Change Password Success'));
// // return $this->redirect(['controller' => 'Users', 'action' => 'signin']);
// // $response = json_decode($users['password'],'_full');
// // pr($response);die;
// #debug($response);exit();
// // pr($data);die;
// // if(!empty($response)){
// // // pr($response);die;
// // #if(trim($response['status']) == 'Success' && !empty($response['result']['type'])){
// // if(trim($response['status']) == 'Success'){
// // #$this->response->withHeader('Authorization', 'Bearer '.$response['result']['token']);
// // #$url = $this->Url->build(['controller' => 'Homes', 'action' => 'index'], true);
// // $url = Router::url(['controller' => 'Users', 'action' => 'signup'], true);
// // #echo "<script>Login.onLogin('".$response['result']['token']."','".$url."');</script>";die;
// // $this->Flash->success(__('change Password completed.'));
// // return $this->redirect(['controller' => 'Users', 'action' => 'signin']);
// // }else{
// // $this->Flash->error(__('change Password Fail'));
// // return $this->redirect(['controller' => 'Users', 'action' => 'signup']);
// // }
// // }
// }else{
// $this->Flash->error(__('Data Empty'));
// return $this->redirect(['controller' => 'Users', 'action' => 'signin']);
// }
// // }
// }
public function changePassword() public function changePassword()
{ {
// $users = $this->Users->newEntity(); $this->viewBuilder()->layout('blank');
if ($this->request->is('post')) { if ($this->request->is('post')) {
$hasher = new DefaultPasswordHasher(); $hasher = new DefaultPasswordHasher();
$password = $this->request->data['password'];
$confirm_password = $this->request->data['confirm_password']; $confirm_password = $this->request->data['confirm_password'];
$oldpassword = $this->request->data['oldpassword'];
$this->request->data['password'] = $hasher->hash($this->request->data['password']); $this->request->data['password'] = $hasher->hash($this->request->data['password']);
$userid = 59445; $userid = 59445;
$users = $this->Users->find('all',[ $users = $this->Users->find('all',[
...@@ -431,17 +421,18 @@ class UsersController extends AppController ...@@ -431,17 +421,18 @@ class UsersController extends AppController
'Users.id' => $userid 'Users.id' => $userid
] ]
])->first(); ])->first();
// if($this->request->data['old']!=$users['password']) //------- เทียบ password ที่เข้ารหัส ---------------password_verify($password,hashed_password)---------------------------
if (password_verify($oldpassword, $users['password'])) {
if($password==$confirm_password){
$users = $this->Users->patchEntity($users, $this->request->getData()); $users = $this->Users->patchEntity($users, $this->request->getData());
$this->Users->save($users); $this->Users->save($users);
pr($users);die; $this->Flash->success(__('change password success'));
// return $this->redirect(['controller' => 'Users', 'action' => 'pinCode/'.$users['token']]);
return $this->redirect(['action' => 'signin']); return $this->redirect(['action' => 'signin']);
// } }
// $this->Flash->error(__('Username or Email Address already used by others.')); } else {
// return $this->redirect(['action' => 'signup']); $this->Flash->error(__('Invalid password.'));
return $this->redirect(['action' => 'change-password']);
// $this->Flash->error(__('The article could not be saved. Please, try again.')); }
} }
} }
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
......
www/src/Model/Table/UserCardsTable.php
...@@ -158,4 +158,15 @@ class UserCardsTable extends Table ...@@ -158,4 +158,15 @@ class UserCardsTable extends Table
return $rules; return $rules;
} }
/**
* Returns the database connection name to use by default.
*
* @return string
*/
public static function defaultConnectionName()
{
return 'core';
}
} }
www/src/Template/UserCards/create_cards.ctp
<div class="row"> <div class="row">
<div class="col-xs-1 col-sm-1 col-md-1">
<
</div>
<div class="col-xs-10 col-sm-10 col-md-10">
<img src="/img/core/img/bloc-plus@3x.png" class="img-responsive" style="width: 100%">
</div>
</div>
<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">
<?php echo $this->Form->create('UserCrads', ['id' => 'frmSignIn', 'type' => 'file', 'onsubmit' => 'return check();']); ?> <?php echo $this->Form->create('UserCards', ['id' => 'frmSignIn', 'type' => 'file', 'onsubmit' => 'return check();']); ?>
<div style="position: absolute;z-index: 2;"> <!-- <div style="position: absolute;z-index: 2;">
<a href="profile_setting"><img src="/img/core/img/setting-icon@3x.png"/></a> <a href="profile_setting"><img src="/img/core/img/setting-icon@3x.png"/></a>
</div> </div> -->
<div class="bg-profile"></div>
<?php echo $this->Flash->render() ?> <!-- <div class="bg-profile"></div> -->
<!--<div class="col-xs-12 col-sm-12 col-md-12" style="padding-top: 20px;">-->
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
<?php echo $this->Form->hidden('UserCards.user_id', ['class' => 'form-control-reg border-bottom-from label-text-sub required', 'id' => 'userId', 'type' => 'text', 'placeholder' => 'USERNAME']); ?> <?php echo $this->Form->hidden('UserCards.user_id', ['class' => 'form-control-reg border-bottom-from label-text-sub required', 'id' => 'userId', 'type' => 'text', 'placeholder' => 'USERNAME']); ?>
...@@ -23,12 +33,12 @@ ...@@ -23,12 +33,12 @@
<div class="form-group has-feedback bootstrap-iso"> <div class="form-group has-feedback bootstrap-iso">
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
<label class="label-text-sub"><?php echo __('วันเกิด');?></label> <label class="label-text-sub"><?php echo __('วันเกิด');?></label>
<input type="text" name="UserCards[birthdate]" id="date" placeholder="กรุณาระบุวันเดือนปีเกิด" value="" placeholder="DD-MM-YYYY" data-date-format="mm/dd/yyyy" class="form-control-reg border-bottom-from"> <input type="text" name="UserCards[birthdate]" id="date" placeholder="กรุณาระบุวันเดือนปีเกิด" value="" placeholder="DD-MM-YYYY" data-date-format="mm/dd/yyyy" class="form-control-reg border-bottom-from" disabled>
<span class="glyphicon glyphicon-calendar form-control-feedback"></span> <span class="glyphicon glyphicon-calendar form-control-feedback"></span>
</div> </div>
</div> </div>
<div> <div>
<button type="submit" class="btn btn-quaternary mr-xs mb-sm button-text-profile">บันทึก</button> <button type="submit" class="btn btn-quaternary mr-xs mb-sm button-text-profile">ตรวจสอบ</button>
</div> </div>
<?php echo $this->Form->end(); ?> <?php echo $this->Form->end(); ?>
</div> </div>
...@@ -45,11 +55,21 @@ ...@@ -45,11 +55,21 @@
if(data!='false'){ if(data!='false'){
data = jQuery.parseJSON(data); data = jQuery.parseJSON(data);
console.log(data); console.log(data);
if(data['chkuser'] == true){
$("#noorg_th").text('ลงทะเบียนกับ '+data[0]['org_name_th']+' แล้ว');
$("#nameorg_th").text('');
$('#employee').attr("disabled",true);
$('#date').attr("disabled",true);
organize_id.value = '';
employee.value = '';
date.value = '';
}else if(data['chkuser'] == false){
$("#nameorg_th").text(data[0]['org_name_th']); $("#nameorg_th").text(data[0]['org_name_th']);
$("#noorg_th").text(''); $("#noorg_th").text('');
$("#employee").removeAttr("disabled"); $("#employee").removeAttr("disabled");
$("#date").removeAttr("disabled"); $("#date").removeAttr("disabled");
organize_id.value = data[0]['id']; organize_id.value = data[0]['id'];
}
}else{ }else{
$("#noorg_th").text('ไม่พบข้อมูล'); $("#noorg_th").text('ไม่พบข้อมูล');
$("#nameorg_th").text(''); $("#nameorg_th").text('');
...@@ -70,8 +90,8 @@ ...@@ -70,8 +90,8 @@
} }
if (date.value == '') { if (date.value == '') {
alert("วันเกิด"); alert("วันเกิด");
date.focus();
return false; return false;
date.focus();
} }
} }
</script> </script>
......
www/src/Template/UserCards/view_card.ctp 0 → 100644
<div class="owl-carousel owl-theme" data-plugin-options="{'items': 1}">
<?php foreach ($UserCards as $value) { #pr($value);die;?>
<div class="row">
<div class="col-xs-1 col-sm-1 col-md-1" style="font-size:36px; height: 200px; padding-top:20%;">
<div>
<i class = "fa fa-angle-left" >
</i>
</div>
</div>
<div class="col-xs-9 col-sm-9 col-md-9" style=" border: 1px solid red; height: 200px; margin-top: 10px;">
<div class="row">
<div class="col-xs-1">
</div>
<div class="col-xs-6">
<div style="font-size: 17px">
<br>
<label>id<label>
</div>
<div>
<?php echo $value['card_code'] ?>
</div>
<div>
<label style="font-size: 17px">ชื่อ</label> <?php echo $value['prefix_name_th'].$value['firstname_th'].' '.$value['lastname_th'] ?>
</div>
</div>
<div class="col-xs-4">
<img src="/img/core/img/user-profile@3x.png" class="img-responsive">
</div>
</div>
<div class="row">
<div class="col-xs-1">
</div>
<div class="col-xs-10">
<label style="font-size: 17px">ตำแหน่ง</label> <?php echo $value['position_name'] ?>
</div>
</div>
<div class="row">
<div class="col-xs-1">
</div>
<div class="col-xs-5">
<?php echo $value['date_issued'] ?>
</div>
<div class="col-xs-5">
<?php echo $value['date_expiry'] ?>
</div>
</div>
<div class="row">
<div class="col-xs-1">
</div>
<div class="col-xs-5">
<label style="font-size: 17px">วันออกบัตร</label>
</div>
<div class="col-xs-5">
<label style="font-size: 17px">วันหมดออายุ</label>
</div>
</div>
</div>
<div class="col-xs-1 col-sm-1 col-md-1" style="font-size:36px; height: 200px; padding-top:20%;">
<div>
<i class = "fa fa-angle-right" >
</i>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-12">
<div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12">
<h4>ข้อมูลบริษัท</h4>
</div>
</div>
<div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12">
<label style="font-size: 17px" class="col-xs-4 col-sm-4 col-md-4">ชื่อ</label>
<?php echo $value['prefix_name_th'].$value['firstname_th'] ?>
</div>
</div>
<div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12">
<label style="font-size: 17px" class="col-xs-4 col-sm-4 col-md-4">นามสกุล</label>
<?php echo $value['lastname_th'] ?>
</div>
</div>
<div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12">
<label style="font-size: 17px" class="col-xs-4 col-sm-4 col-md-4">ชื่อบริษัท</label>
<?php echo $value['morg']['org_name_th'] ?>
</div>
</div>
<div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12">
<label style="font-size: 17px" class="col-xs-4 col-sm-4 col-md-4">แผนก</label>
<?php echo $value['section_name'] ?>
</div>
</div>
<div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12">
<label style="font-size: 17px" class="col-xs-4 col-sm-4 col-md-4">ตำแหน่ง</label>
<?php echo $value['position_name'] ?>
</div>
</div>
<div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12">
<label style="font-size: 17px" class="col-xs-4 col-sm-4 col-md-4">วันที่ออกบัตร</label>
<?php echo $value['date_issued'] ?>
</div>
</div>
<div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12">
<label style="font-size: 17px" class="col-xs-4 col-sm-4 col-md-4">วันที่หมดอายุ</label>
<?php echo $value['date_expiry'] ?>
</div>
</div>
</div>
</div>
<?php } ?>
</div>
\ No newline at end of file
www/src/Template/Users/change_password.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 __('เปลี่ยนรหัสผ่าน');?></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;">
...@@ -8,20 +8,21 @@ ...@@ -8,20 +8,21 @@
</div>--> </div>-->
<?php echo $this->Form->create(null, ['url' => ['controller' => 'Users','action' => 'changePassword'],'class' => 'form-horizontal','id' => '','name' => 'changePressword','role' => 'form', 'onsubmit' => 'return validateForm()']);?> <?php echo $this->Form->create(null, ['url' => ['controller' => 'Users','action' => 'changePassword'],'class' => 'form-horizontal','id' => '','name' => 'changePressword','role' => 'form', 'onsubmit' => 'return validateForm()']);?>
<?php echo $this->Flash->render(); ?> <?php echo $this->Flash->render(); ?>
<!-- <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 __('ยืนยันรหัส จากอีเมลล์');?></label> <label class="label-text-sub"><?php echo __('รหัสผ่านเก่า');?></label>
<input type="text" value="" name="data[confirm_email]" maxlength="4" pattern="\d{4}" placeholder="********" class="form-control-reg border-bottom-from" id="inputSuccess"> <input type="password" value="" name="oldpassword" placeholder="********" class="form-control-reg border-bottom-from" id="oldpassword" onkeyup='check();'>
<span class="glyphicon glyphicon-lock form-control-feedback"></span> <span class="glyphicon glyphicon-eye-close form-control-feedback" id='message'></span>
</div>
</div> </div>
</div> </div>
</div>-->
<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 __('รหัสผ่านใหม่');?></label> <label class="label-text-sub"><?php echo __('รหัสผ่านใหม่');?></label>
<input type="text" value="" name="data[password]" placeholder="********" class="form-control-reg border-bottom-from" id="password" onkeyup='check();'> <input type="text" value="" name="password" placeholder="********" class="form-control-reg border-bottom-from" id="password" onkeyup='check();'>
<span class="glyphicon glyphicon-eye-open form-control-feedback"></span> <span class="glyphicon glyphicon-eye-open form-control-feedback"></span>
</div> </div>
</div> </div>
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
<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 __('ยืนยันรหัสผ่าน');?></label> <label class="label-text-sub"><?php echo __('ยืนยันรหัสผ่าน');?></label>
<input type="password" value="" name="data[confirm_password]" placeholder="********" class="form-control-reg border-bottom-from" id="confirm_password" onkeyup='check();'> <input type="password" value="" name="confirm_password" placeholder="********" class="form-control-reg border-bottom-from" id="confirm_password" onkeyup='check();'>
<span class="glyphicon glyphicon-eye-close form-control-feedback" id='message'></span> <span class="glyphicon glyphicon-eye-close form-control-feedback" id='message'></span>
</div> </div>
</div> </div>
...@@ -51,24 +52,46 @@ ...@@ -51,24 +52,46 @@
</div> </div>
<!--------------------------------- popup -------------------------------------> <!-- ------------------------------- popup ----------------------------------- -->
<script> <script>
function validateForm() { function validateForm() {
var confirm_email = document.forms["changePressword"]["data[confirm_email]"].value;
if (confirm_email == null || confirm_email == "") { var password = document.forms["changePressword"]["oldpassword"].value;
alert("กรุณากรอกรหัสจากอีเมลล์ของท่าน 4 หลัก"); if (password == null || password == "") {
alert("กรุณากรอก รหัสผ่านเก่า");
return false; return false;
} }
var password = document.forms["changePressword"]["data[password]"].value; if(document.forms["changePressword"]["oldpassword"].value.length < 8)
{
alert('กรุณาระบุรหัสผ่านเก่าอย่างน้อย 8 ตัวอักษร');
return false;
}
var password = document.forms["changePressword"]["password"].value;
if (password == null || password == "") { if (password == null || password == "") {
alert("กรุณากรอก password"); alert("กรุณากรอก รหัสผ่านใหม่");
return false;
}
if(document.forms["changePressword"]["password"].value.length < 8)
{
alert('กรุณาระบุรหัสผ่านใหม่อย่างน้อย 8 ตัวอักษร');
return false; return false;
} }
var confirm_password = document.forms["changePressword"]["data[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("กรุณากรอก confirm_password"); alert("กรุณากรอก ยืนยันรหัสผ่าน");
return false;
}
if(document.forms["changePressword"]["confirm_password"].value.length < 8)
{
alert('กรุณาระบุยืนยันรหัสผ่านอย่างน้อย 8 ตัวอักษร');
return false;
}
if(document.forms["changePressword"]["password"].value != document.forms["changePressword"]["confirm_password"].value){
alert('กรุณาระบุรหัสผ่านให้ตรงกัน');
//document.createAccount.confirm_password.focus();
return false; return false;
} }
} }
</script> </script>
<style> <style>
...@@ -177,72 +200,3 @@ ...@@ -177,72 +200,3 @@
color:green; color:green;
} }
</style> </style>
<script>
var ALERT_TITLE = "";
var ALERT_BUTTON_TEXT = "Ok";
if (document.getElementById) {
window.alert = function (txt) {
createCustomAlert(txt);
}
}
function createCustomAlert(txt) {
d = document;
if (d.getElementById("modalContainer"))
return;
mObj = d.getElementsByTagName("body")[0].appendChild(d.createElement("div"));
mObj.id = "modalContainer";
mObj.style.height = d.documentElement.scrollHeight + "px";
alertObj = mObj.appendChild(d.createElement("div"));
alertObj.id = "alertBox";
if (d.all && !window.opera)
alertObj.style.top = document.documentElement.scrollTop + "px";
alertObj.style.left = (d.documentElement.scrollWidth - alertObj.offsetWidth) / 2 + "px";
alertObj.style.visiblity = "visible";
h1 = alertObj.appendChild(d.createElement("h1"));
h1.appendChild(d.createTextNode(ALERT_TITLE));
msg = alertObj.appendChild(d.createElement("p"));
//msg.appendChild(d.createTextNode(txt));
msg.innerHTML = txt;
btn = alertObj.appendChild(d.createElement("a"));
btn.id = "closeBtn";
btn.appendChild(d.createTextNode(ALERT_BUTTON_TEXT));
btn.href = "#";
btn.focus();
btn.onclick = function () {
removeCustomAlert();
return false;
}
alertObj.style.display = "block";
}
function removeCustomAlert() {
document.getElementsByTagName("body")[0].removeChild(document.getElementById("modalContainer"));
}
function ful() {
alert('Alert this pages');
}
</script>
<!--------------------------------- confirm password -------------------------------->
<script>
var check = function() {
if (document.getElementById('password').value ==
document.getElementById('confirm_password').value) {
document.getElementById('message').style.color = 'green';
document.getElementById('message').innerHTML = '';
} else {
document.getElementById('message').style.color = 'red';
document.getElementById('message').innerHTML = '';
}
}
</script>
\ No newline at end of file
www/src/Template/Users/forgot_password.ctp
...@@ -11,27 +11,8 @@ ...@@ -11,27 +11,8 @@
<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 __('ชื่อผู้ใช้งาน');?><em>* </em></label>
<input type="text" value="" name="data[username]" placeholder="USERNAME" class="form-control-reg border-bottom-from" id="inputSuccess">
</div>
</div>
</div>
<div>
<div class="form-group has-feedback">
<div class="col-md-12">
<label class="label-text-sub"><?php echo __('วันเกิด');?><em>* </em></label>
<input type="text" value="" name="data[birthdate]" placeholder="กรุณาระบุวันเดือนปีเกิด" class="form-control-reg border-bottom-from" id="date">
<span class="glyphicon glyphicon-calendar form-control-feedback"></span>
</div>
</div>
</div>
<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 __('อีเมลล์');?><em>* </em></label>
<input type="text" value="" name="data[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>
...@@ -49,26 +30,10 @@ ...@@ -49,26 +30,10 @@
<?php echo $this->Form->end(); ?> <?php echo $this->Form->end(); ?>
</div> </div>
</div> </div>
<!--------------------------------- popup -------------------------------------> <!-- ------------------------------- popup ----------------------------------- -->
<script> <script>
function validateForm() { function validateForm() {
var username = document.forms["forgotPressword"]["data[username]"].value; var email = document.forms["forgotPressword"]["email"].value;
if (username == null || username == "") {
alert("กรุณากรอกชื่อผู้ใช้งานของท่าน");
return false;
}
if(document.forms["forgotPressword"]["data[username]"].value.length < 5)
{
alert('กรุณาระบุชื่อผู้ใช้งานอย่างน้อย 5 ตัวอักษร');
return false;
}
var birthdate = document.forms["forgotPressword"]["data[birthdate]"].value;
if (birthdate == null || birthdate == "") {
alert("กรุณากรอก วันเดือนปีเกิดของท่าน");
return false;
}
var email = document.forms["forgotPressword"]["data[email]"].value;
if (email == null || email == "") { if (email == null || email == "") {
alert("กรุณากรอกอีเมลล์"); alert("กรุณากรอกอีเมลล์");
return false; return false;
...@@ -188,61 +153,6 @@ ...@@ -188,61 +153,6 @@
} }
</style> </style>
<script>
var ALERT_TITLE = "";
var ALERT_BUTTON_TEXT = "Ok";
if (document.getElementById) {
window.alert = function (txt) {
createCustomAlert(txt);
}
}
function createCustomAlert(txt) {
d = document;
if (d.getElementById("modalContainer"))
return;
mObj = d.getElementsByTagName("body")[0].appendChild(d.createElement("div"));
mObj.id = "modalContainer";
mObj.style.height = d.documentElement.scrollHeight + "px";
alertObj = mObj.appendChild(d.createElement("div"));
alertObj.id = "alertBox";
if (d.all && !window.opera)
alertObj.style.top = document.documentElement.scrollTop + "px";
alertObj.style.left = (d.documentElement.scrollWidth - alertObj.offsetWidth) / 2 + "px";
alertObj.style.visiblity = "visible";
h1 = alertObj.appendChild(d.createElement("h1"));
h1.appendChild(d.createTextNode(ALERT_TITLE));
msg = alertObj.appendChild(d.createElement("p"));
//msg.appendChild(d.createTextNode(txt));
msg.innerHTML = txt;
btn = alertObj.appendChild(d.createElement("a"));
btn.id = "closeBtn";
btn.appendChild(d.createTextNode(ALERT_BUTTON_TEXT));
btn.href = "#";
btn.focus();
btn.onclick = function () {
removeCustomAlert();
return false;
}
alertObj.style.display = "block";
}
function removeCustomAlert() {
document.getElementsByTagName("body")[0].removeChild(document.getElementById("modalContainer"));
}
function ful() {
alert('Alert this pages');
}
</script>
<!--------------------------------- date -------------------------------------> <!--------------------------------- date ------------------------------------->
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
......
www/src/Template/Users/pin_code.ctp
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,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 __('รหัส PIN 4 หลัก เพื่อเข้าใช้งาน Connect App');?> <?php echo __('รหัส PIN 4 หลัก ในอีเมลล์ที่ระบุเพื่อเข้าใช้งาน');?>
</div> </div>
</div> </div>
</div> </div>
......
www/src/Template/Users/signup.ctp
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,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 __('เบอร์โทรศัพท์');?></label> <label class="label-text-sub"><?php echo __('เบอร์โทรศัพท์');?><em>* </em></label>
<input type="text" name="phone_no" onkeypress="check_phone();" value="" maxlength="10" placeholder="0000000000" class="mask form-control-reg border-bottom-from" id="inputSuccess"> <input type="text" name="phone_no" onkeypress="check_phone();" value="" maxlength="10" placeholder="0000000000" class="mask form-control-reg border-bottom-from" id="inputSuccess">
</div> </div>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,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 __('รหัสผ่าน');?></label> <label class="label-text-sub"><?php echo __('รหัสผ่าน');?><em>* </em></label>
<input data-toggle="password" data-placement="before" type="password" name="password" value="" placeholder="********" class="form-control input-lg color-button-border border-bottom-from" id="FALSE" style="padding:0px 0px !important;"> <input data-toggle="password" data-placement="before" type="password" name="password" value="" placeholder="********" class="form-control input-lg color-button-border border-bottom-from" id="FALSE" style="padding:0px 0px !important;">
<!--<input type="password" name="data[password]" id="password" value="" placeholder="********" class="form-control-reg border-bottom-from" onkeyup='check();'>--> <!--<input type="password" name="data[password]" id="password" value="" placeholder="********" class="form-control-reg border-bottom-from" onkeyup='check();'>-->
<!--<span class="glyphicon glyphicon-eye-close form-control-feedback"></span>--> <!--<span class="glyphicon glyphicon-eye-close form-control-feedback"></span>-->
...@@ -190,11 +190,11 @@ ...@@ -190,11 +190,11 @@
var birthdate = document.forms["createAccount"]["birthdate"].value; // var birthdate = document.forms["createAccount"]["birthdate"].value;
if (birthdate == null || birthdate == "") { // if (birthdate == null || birthdate == "") {
alert("กรุณากรอก วันเดือนปีเกิดของท่าน"); // alert("กรุณากรอก วันเดือนปีเกิดของท่าน");
return false; // return false;
} // }
// var person_card_no = document.forms["createAccount"]["person_card_no"].value; // var person_card_no = document.forms["createAccount"]["person_card_no"].value;
// if (person_card_no == null || person_card_no == "") { // if (person_card_no == null || person_card_no == "") {
// alert("กรุณากรอกเลขบัตรประชาชน"); // alert("กรุณากรอกเลขบัตรประชาชน");
...@@ -431,53 +431,29 @@ ...@@ -431,53 +431,29 @@
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function () {
$(document).ready(function() { $("#master_country_id").on('change', function () {
$("#loding1").hide();
$("#loding2").hide();
$("#master_country_id").on('change',function() {
var id = $(this).val(); var id = $(this).val();
$("#loding1").show();
$("#master_province_id").find('option').remove();
// alert('dddd');
if (id) { if (id) {
var dataString = 'id='+ id; var dataString = 'id=' + id;
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: 'users/getStates' , url: '/users/getProvince',
data: dataString, data: dataString,
cache: false, cache: false,
success: function(html) { success: function (html) {
$("#loding1").hide(); $("#master_province_id").html(html);
$.each(html, function(key, value) {
$('<option>').val('').text('---Select---');
$('<option>').val(key).text(value).appendTo($("#master_province_id"));
});
} }
}); });
} }
}); });
}); });
}); </script>
</script>
<!--------------------------------- confirm password ------------------------------ --> <!--------------------------------- confirm password ------------------------------ -->
<script> <script>
function check_number() {
e_k=event.keyCode
//if (((e_k < 48) || (e_k > 57)) && e_k != 46 ) {
if (e_k = 13 && (e_k < 48) || (e_k > 57)) {
event.returnValue = false;
alert("ขออภัยหมายเลขบัตรประจำตัวประชาชน ต้องเป็นตัวเลขเท่านั้น");
}
}
function check_phone() { function check_phone() {
e_k=event.keyCode e_k=event.keyCode
......
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