Skip to content

smart_core_connect / core-connect

Go to a project
Commit 868107e4 by Wittaya-PIM
Options

Merge branch 'integration' into wittaya

parents 304670a3 46092de0
Showing with 138 additions and 113 deletions
www/src/Controller/ProfilesController.php
...@@ -20,6 +20,11 @@ class ProfilesController extends AppController ...@@ -20,6 +20,11 @@ class ProfilesController extends AppController
]); ]);
$username = $responseUserProfile['username']; $username = $responseUserProfile['username'];
$this->loadModel('UserPersonals');
$responseUserPersonal = $this->UserPersonals->get($id, [
'contain' => []
]);
//********DropdownCountry******** //********DropdownCountry********
$this->loadModel('MasterCountries'); $this->loadModel('MasterCountries');
$Country = $this->MasterCountries->find('list', [ $Country = $this->MasterCountries->find('list', [
...@@ -28,6 +33,7 @@ class ProfilesController extends AppController ...@@ -28,6 +33,7 @@ class ProfilesController extends AppController
'keyField' => 'id', 'keyField' => 'id',
'valueField' => 'country_name_th' 'valueField' => 'country_name_th'
]); ]);
// pr($responseUserPersonal['master_country_id']);die;
if(!empty($Country)) $Country = $Country->toArray(); if(!empty($Country)) $Country = $Country->toArray();
//********DropdownProvince******** //********DropdownProvince********
...@@ -37,14 +43,11 @@ class ProfilesController extends AppController ...@@ -37,14 +43,11 @@ class ProfilesController extends AppController
'is_used' => true], 'is_used' => true],
'keyField' => 'id', 'keyField' => 'id',
'valueField' => 'province_name_th' 'valueField' => 'province_name_th'
]); ])->where(['master_country_id =' => $responseUserPersonal['master_country_id']]);
// pr($Province);die;
if(!empty($Province)) $Province = $Province->toArray(); if(!empty($Province)) $Province = $Province->toArray();
$this->loadModel('UserPersonals'); $res = $responseUserPersonal['birthdate'];
$responseUserProfile = $this->UserPersonals->get($id, [
'contain' => []
]);
$res = $responseUserProfile['birthdate'];
$dateNow = $res->i18nFormat('dd/MM/yyyy'); $dateNow = $res->i18nFormat('dd/MM/yyyy');
if ($this->request->is(['patch', 'post', 'put'])) { if ($this->request->is(['patch', 'post', 'put'])) {
...@@ -104,7 +107,7 @@ class ProfilesController extends AppController ...@@ -104,7 +107,7 @@ class ProfilesController extends AppController
} }
$this->Flash->error(__('Not update. Please, try again.')); $this->Flash->error(__('Not update. Please, try again.'));
} }
$this->set(compact('userPersonals', 'responseUserProfile', 'dateNow', 'username', 'Country', 'Province')); $this->set(compact('userPersonals', 'responseUserProfile', 'dateNow', 'username', 'Country', 'Province', 'responseUserPersonal'));
$this->set('_serialize', ['userPersonals', 'responseUserProfile', 'dateNow', 'username', 'Country', 'Province']); $this->set('_serialize', ['userPersonals', 'responseUserProfile', 'dateNow', 'username', 'Country', 'Province']);
} }
......
www/src/Controller/UsersController.php
...@@ -114,26 +114,6 @@ class UsersController extends AppController ...@@ -114,26 +114,6 @@ class UsersController extends AppController
$this->viewBuilder()->layout('blank'); $this->viewBuilder()->layout('blank');
} }
// public function getProvince() {
// $this->autoRender = false;
// $this->loadModel('MasterProvinces');
// $states = array();
// pr($this->request->$data);die;
// if (isset($this->request['data']['id'])) {
// $states = $this->MasterProvinces->find('list', array(
// 'keyField' => 'id',
// 'valueField' => ['country_name_th'],
// 'conditions' => array(
// 'State.countries_id' => $this->request['data']['id']
// )
// ));
// }
// header('Content-Type: application/json');
// pr($states);die;
// echo json_encode($states);
// exit();
// }
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
...@@ -220,7 +200,7 @@ class UsersController extends AppController ...@@ -220,7 +200,7 @@ class UsersController extends AppController
// $this->Flash->success(__('The register success.')); // $this->Flash->success(__('The register success.'));
return $this->redirect(['controller' => 'Users', 'action' => 'pinCode/'.$users['token']]); 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.')); $this->Flash->error(__('Username or Email Address already used by others.'));
return $this->redirect(['action' => 'signup']); return $this->redirect(['action' => 'signup']);
...@@ -289,7 +269,7 @@ class UsersController extends AppController ...@@ -289,7 +269,7 @@ class UsersController extends AppController
public function pinCode($token=null) public function pinCode($token=null)
{ {
if(empty($token)) die; if(empty($token))
$this->viewBuilder()->layout('blank'); $this->viewBuilder()->layout('blank');
...@@ -300,8 +280,8 @@ class UsersController extends AppController ...@@ -300,8 +280,8 @@ class UsersController extends AppController
$http = new Client(); $http = new Client();
#$response = json_decode($http->post($api_core_verify_pin_code,$data)->body(),'_full'); #$response = json_decode($http->post($api_core_verify_pin_code,$data)->body(),'_full');
$response = $http->post($api_core_verify_pin_code,$data)->body(); $response = $http->post($api_core_verify_pin_code,$data)->body();
$response = json_decode($response,'_full'); $response = json_decode($response,'_full');
if(!empty($response)){ if(!empty($response)){
if(trim($response['status']) == 'Success'){ if(trim($response['status']) == 'Success'){
$this->Flash->success(__('Verify Completed.')); $this->Flash->success(__('Verify Completed.'));
...@@ -316,43 +296,11 @@ class UsersController extends AppController ...@@ -316,43 +296,11 @@ class UsersController extends AppController
} }
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
#Forgot Password
// public function forgotPassword()
// {
// $this->viewBuilder()->layout('blank');
// $data = $this->request->data();
// #$data['data']['ip'] = $this->request->clientIp();
// if(!empty($data)){
// if(!empty($data['data']['username'])){ #---------------------------------------------------------------------------------------------------
// $data['data']['ip'] = $this->request->clientIp();#prr($data);
// $api_core_forgotPassword = Configure::read('Config.apiCore.forgotPassword');
// $http = new Client();
// $response = $http->post($api_core_forgotPassword,$data['data'])->body();
// $response = json_decode($response,'_full');#debug($response);
// if(!empty($response)){
// if(trim($response['status']) == 'Success'){
// $this->Flash->success(__('Completed.'));
// return $this->redirect(['controller' => 'Users', 'action' => 'signin']);
// }else{
// $this->Flash->error(__('Forgot Password Fail'));
// return $this->redirect(['controller' => 'Users', 'action' => 'forgotPassword']);
// }
// }else{
// $this->Flash->error(__('Forgot Password Fail'));
// return $this->redirect(['controller' => 'Users', 'action' => 'forgotPassword']);
// }
// }else{
// $this->Flash->error(__('Data Empty'));
// return $this->redirect(['controller' => 'Users', 'action' => 'forgotPassword']);
// }
// }
// }
public function forgotPassword() public function forgotPassword()
{ {
...@@ -361,41 +309,46 @@ class UsersController extends AppController ...@@ -361,41 +309,46 @@ class UsersController extends AppController
if ($this->request->is('post')) { if ($this->request->is('post')) {
$hasher = new DefaultPasswordHasher(); $hasher = new DefaultPasswordHasher();
$email = $this->request->data['email']; $email = $this->request->data['email'];
//-------------------Random--------------------------------------------------------------- //-------------------RandomPassword---------------------------------------------------------
$alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'; // $alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
$pass = array(); // $pass = array();
$alphaLength = strlen($alphabet) - 1; // $alphaLength = strlen($alphabet) - 1;
for ($i = 0; $i < 8; $i++) { // for ($i = 0; $i < 8; $i++) {
$n = rand(0, $alphaLength); // $n = rand(0, $alphaLength);
$pass[] = $alphabet[$n]; // $pass[] = $alphabet[$n];
} // }
$password = implode($pass); // $password = implode($pass);
//------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------
$users['password'] = $hasher->hash($password);
// $users['password'] = $hasher->hash($password);
$user_personals = $this->UserPersonals->find('all',[ $user_personals = $this->UserPersonals->find('all',[
'conditions' => [ 'conditions' => [
'UserPersonals.email' => $email 'UserPersonals.email' => $email
] ]
])->first(); ])->first();
pr($password);
if(!empty($user_personals)){ if(!empty($user_personals)){
//--------------------ตัวส่ง Email --------------------------------------------------------- //--------------------ตัวส่ง Email ---------------------------------------------------------
// pr($user_personals);die; // pr($user_personals);die;
// $data_notification = []; // $data_notification = [];
// $data_notification['email'] = $this->request->data['email']; // $data_notification['email'] = $this->request->data['email'];
// $data_notification['pin_code'] = $password; // $data_notification['pin_code'] = $users['pin_pass'];
// $this->notification($data_notification); // $this->notification($data_notification);
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
$users = $this->Users->find('all',[ $users = $this->Users->find('all',[
'conditions' => [ 'conditions' => [
'Users.id' => $user_personals['user_id'] 'Users.id' => $user_personals['user_id']
] ]
])->first(); ])->first();
pr($users);die; $digits = 4;
$users = $this->Users->patchEntity($users, $this->request->getData()); $users['pin_pass'] = str_pad(rand(0, pow(10, $digits)-1), $digits, '0', STR_PAD_LEFT);
$token = $users['token'];
// pr($users);die;
// $users = $this->Users->patchEntity($users, $this->request->getData());
$this->Users->save($users); $this->Users->save($users);
// pr($users);die;
$this->Flash->success(__('send password to email success')); $this->Flash->success(__('send password to email success'));
return $this->redirect(['action' => 'signin']); return $this->redirect(['action' => 'pinCodepassword/'.$token]);
}else{ }else{
$this->Flash->error(__('Invalid Email.')); $this->Flash->error(__('Invalid Email.'));
return $this->redirect(['action' => 'forgot-password']); return $this->redirect(['action' => 'forgot-password']);
...@@ -403,38 +356,57 @@ class UsersController extends AppController ...@@ -403,38 +356,57 @@ class UsersController extends AppController
} }
} }
public function pinCodepassword($token=null)
#---------------------------------------------------------------------------------------------------
public function changePassword()
{ {
$this->viewBuilder()->layout('blank'); $this->viewBuilder()->layout('blank');
if ($this->request->is('post')) { $users = $this->Users->find('all',[
$hasher = new DefaultPasswordHasher(); 'conditions'=>[
$password = $this->request->data['password']; 'Users.token'=>$token
$confirm_password = $this->request->data['confirm_password']; ]
$oldpassword = $this->request->data['oldpassword']; ])->first();
$this->request->data['password'] = $hasher->hash($this->request->data['password']);
$userid = 59445; if($this->request->is('post')){
$data = $this->request->data();
$data['pin_pass'] = $data['pin_code_1'].$data['pin_code_2'].$data['pin_code_3'].$data['pin_code_4'];
if($data['pin_pass']==$users['pin_pass']){
$this->Flash->success(__('Pin Completed.'));
return $this->redirect(['controller' => 'Users', 'action' => 'changePassword/'.$token]);
}
$this->Flash->error(__('Pin Invalid'));
return $this->redirect(['controller' => 'Users', 'action' => 'pinCodepassword/'.$token]);
}
$this->set(array('token' => $token, '_serialize' => array('token')));
}
public function changePassword($token=null)
{
$this->viewBuilder()->layout('blank');
$users = $this->Users->find('all',[ $users = $this->Users->find('all',[
'conditions' => [ 'conditions' => [
'Users.id' => $userid 'Users.token' => $token
] ]
])->first(); ])->first();
if ($this->request->is('post')) {
$hasher = new DefaultPasswordHasher();
$password = $this->request->data['password'];
$confirm_password = $this->request->data['confirm_password'];
$oldpassword = $this->request->data['oldpassword'];
$this->request->data['password'] = $hasher->hash($this->request->data['password']);
//------- เทียบ password ที่เข้ารหัส ---------------password_verify($password,hashed_password)--------------------------- //------- เทียบ password ที่เข้ารหัส ---------------password_verify($password,hashed_password)---------------------------
if (password_verify($oldpassword, $users['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); $this->Flash->success(__('change password success'));
$this->Flash->success(__('change password success')); return $this->redirect(['action' => 'signin']);
return $this->redirect(['action' => 'signin']);
}
} else { } else {
$this->Flash->error(__('Invalid password.')); $this->Flash->error(__('Invalid password.'));
return $this->redirect(['action' => 'change-password']); return $this->redirect(['action' => 'change-password/'.$token]);
} }
} }
$this->set(array('token' => $token, '_serialize' => array('token')));
} }
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
public function signout() public function signout()
......
www/src/Template/Users/change_password.ctp
...@@ -6,9 +6,8 @@ ...@@ -6,9 +6,8 @@
<!-- <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;">
<strong><?php echo __('กรุณา! ตรวจสอบอีเมลล์ของท่าน');?></strong> <strong><?php echo __('กรุณา! ตรวจสอบอีเมลล์ของท่าน');?></strong>
</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/'.$token],'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">
...@@ -22,7 +21,7 @@ ...@@ -22,7 +21,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="text" value="" name="password" placeholder="********" class="form-control-reg border-bottom-from" id="password" onkeyup='check();'> <input type="password" 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>
...@@ -44,7 +43,6 @@ ...@@ -44,7 +43,6 @@
echo $this->Form->submit('ตรวจสอบ', array('div' => false, 'class' => 'btn btn-quaternary mr-xs mb-sm button-text', echo $this->Form->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>
<?php echo $this->Form->end(); ?> <?php echo $this->Form->end(); ?>
...@@ -200,3 +198,57 @@ ...@@ -200,3 +198,57 @@
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>
www/src/Template/Users/forgot_password.ctp
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
</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('ตรวจสอบ', array('div' => false, 'class' => 'btn btn-quaternary mr-xs mb-sm button-text',
......
www/src/Template/Users/signup.ctp
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
<?php <?php
echo $this->Form->input( 'master_province_id', [ echo $this->Form->input( 'master_province_id', [
'name'=>'master_province_id', 'name'=>'master_province_id',
// 'id'=>'master_province_id', 'id'=>'master_province_id',
'label' => false, 'label' => false,
'type' => 'select', 'type' => 'select',
'options' => $provinces, // 'options' => $provinces,
'empty' => '---Select---', 'empty' => '---Select---',
'default' => '', 'default' => '',
'class' => 'form-control border-bottom-from label-text-sub required', 'class' => 'form-control border-bottom-from label-text-sub required',
...@@ -437,6 +437,7 @@ ...@@ -437,6 +437,7 @@
var id = $(this).val(); var id = $(this).val();
if (id) { if (id) {
var dataString = 'id=' + id; var dataString = 'id=' + id;
$("#master_province_id").html('');
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: '/users/getProvince', url: '/users/getProvince',
......
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