Merge branch 'integration' into wittaya

8a013889 · Wittaya-PIM · 70397ecd · be93e3d9 · 8a013889 · 8a013889
Commit 8a013889 authored May 24, 2018 by Wittaya-PIM
Hide whitespace changes
Inline Side-by-side

Showing with 58 additions and 34 deletions

www/src/Controller/UsersController.php
+5 -21

www/src/Template/Profiles/index.ctp
+12 -8

www/src/Template/Users/signup.ctp
+41 -5

No files found.
--- a/www/src/Controller/UsersController.php
+++ b/www/src/Controller/UsersController.php
@@ -315,26 +315,7 @@ class UsersController extends AppController {
 		$this->loadModel('UserPersonals');
 		if ($this->request->is('post')) {
 			$hasher = new DefaultPasswordHasher();
-			$email = $this->request->data['email'];
+			$email = $this->request->data['email'];			
-		//-------------------RandomPassword---------------------------------------------------------
-			// $alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-			// $pass = array();
-			// $alphaLength = strlen($alphabet) - 1;
-			// for ($i = 0; $i < 8; $i++) {
-			// 	$n = rand(0, $alphaLength);
-			// 	$pass[] = $alphabet[$n];
-			// }
-			// $password = implode($pass);
-			//--------------------ตัวส่ง Email --------------------------------------
-			 //pr($user_personals);die;
-				// $data_notification = [];
-				// $data_notification['email'] = $this->request->data['email'];
-				// $data_notification['password'] = $password;
-				// $this->notification($data_notification);
-		//------------------------------------------------------------------------------------------
 			$user_personals = $this->UserPersonals->find('all',[
 				'conditions' => [
 					'UserPersonals.email' => $email
@@ -438,9 +419,12 @@ class UsersController extends AppController {
 			$this->request->data['password'] = $hasher->hash($this->request->data['password']);			
 			//------- เทียบ password ที่เข้ารหัส ---------------password_verify($password,hashed_password)---------------------------
 				$users = $this->Users->patchEntity($users, $this->request->getData());
-				$this->Users->save($users);
+			if($this->Users->save($users)){
 				$this->Flash->success(__('change password success'));
 				return $this->redirect(['action' => 'signin']);
+			}
+			$this->Flash->error(__('Invalid password.'));
+			return $this->redirect(['action' => 'change_forgotpassword']);
 		}
 		$this->set(array('token' => $token, '_serialize' => array('token'))); 
 	}

--- a/www/src/Template/Profiles/index.ctp
+++ b/www/src/Template/Profiles/index.ctp
@@ -63,19 +63,22 @@
        <?php // debug($userProfiles); exit;?>
            <div class="form-group has-feedback">
                <div class="col-xs-12 col-sm-12 col-md-12">
-                    <?php echo $this->Form->input('UserPersonals.firstname_th', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $responseUserPersonal['firstname_th'], 'id' => 'firstname_th', 'type' => 'text', 'label' => __('ชื่อ'), 'placeholder' => 'ชื่อ']); ?>
+                <?php echo __('ชื่อ');?><em>* </em>
+                    <?php echo $this->Form->input('UserPersonals.firstname_th', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $responseUserPersonal['firstname_th'], 'id' => 'firstname_th', 'type' => 'text', 'label' => false, 'placeholder' => 'ชื่อ']); ?>
                    <?php // echo $this->Form->input('fullname', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $userProfiles->firstname_th . ' ' . $userProfiles->lastname_th, 'id' => 'fullName', 'type' => 'text', 'label' => __('ชื่อ - นามสกุล'), 'placeholder' => 'ชื่อ - นามสกุล']); ?>
                </div>
            </div>
            <div class="form-group has-feedback">
                <div class="col-xs-12 col-sm-12 col-md-12">
-                    <?php echo $this->Form->input('UserPersonals.lastname_th', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $responseUserPersonal['lastname_th'], 'id' => 'lastname_th', 'type' => 'text', 'label' => __('นามสกุล'), 'placeholder' => 'นามสกุล']); ?>
+                <?php echo __('สกุล');?><em>* </em>
+                    <?php echo $this->Form->input('UserPersonals.lastname_th', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $responseUserPersonal['lastname_th'], 'id' => 'lastname_th', 'type' => 'text', 'label' => false, 'placeholder' => 'นามสกุล']); ?>
                    <?php // echo $this->Form->input('fullname', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $userProfiles->firstname_th . ' ' . $userProfiles->lastname_th, 'id' => 'fullName', 'type' => 'text', 'label' => __('ชื่อ - นามสกุล'), 'placeholder' => 'ชื่อ - นามสกุล']); ?>
                </div>
            </div>
            <div class="form-group has-feedback">
                <div class="col-xs-12 col-sm-12 col-md-12">
-                    <?php echo $this->Form->input('UserPersonals.birthdate', ['class' => 'form-control-reg border-bottom-from', 'value' => $dateNow, 'id' => 'datepicker', 'type' => 'text', 'label' => __('วันเดือนปีเกิด'), 'placeholder' => 'DD-MM-YYYY']); ?>
+                <?php echo __('วันเดือนปีเกิด');?><em>* </em>
+                    <?php echo $this->Form->input('UserPersonals.birthdate', ['class' => 'form-control-reg border-bottom-from', 'value' => $dateNow, 'id' => 'datepicker', 'type' => 'text', 'label' => false, 'placeholder' => 'DD-MM-YYYY']); ?>
                    <span class="glyphicon glyphicon-calendar form-control-feedback datepicker"></span>
                </div>
            </div>
@@ -114,15 +117,16 @@
            </div>
            <div class="form-group has-feedback">
                <div class="col-xs-12 col-sm-12 col-md-12">
-                    <?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' => __('เบอร์โทรศัพท์'), 'placeholder' => '000-000-0000']); ?>
+                <?php echo __('เบอร์โทรศัพท์');?><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, 'placeholder' => '000-000-0000']); ?>
                    <?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>
            <div class="form-group has-feedback">
                <div class="col-xs-12 col-sm-12 col-md-12">
-                    <!-- <?php echo $this->Form->input('UserPersonals.email', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $responseUserPersonal['email'], 'id' => 'email', 'label' => __('Email'), 'placeholder' => 'mail@xxx.com']); ?> -->
+                <?php echo __('อีเมลล์');?><em>* </em>
+                    <!-- <?php echo $this->Form->input('UserPersonals.email', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $responseUserPersonal['email'], 'id' => 'email', 'label' => false, 'placeholder' => 'mail@xxx.com']); ?> -->
                    <?php // echo $this->Form->input('email', ['class' => 'form-control-reg border-bottom-from label-text-sub', 'value' => $userProfiles->email, 'id' => 'email', 'type' => 'email', 'label' => __('Email'), 'placeholder' => 'mail@xxx.com']); ?>
-                    <label class="label-text-sub" style="font-size: 14px"><?php echo __('อีเมลล์');?></label>
                    <input type="text" name="email" id="email" value="<?php echo $responseUserPersonal['email'] ?>" placeholder="mail@xxx.com" class="form-control-reg border-bottom-from">
                </div>
            </div>
@@ -134,7 +138,7 @@
            </div>
            <div class="form-group has-feedback">
                <div class="col-xs-12 col-sm-12 col-md-12">
-                    <?php echo __('ประเทศ'); ?>
+                    <?php echo __('ประเทศ'); ?><em>* </em>
                    <?php
                        echo $this->Form->input( 'master_country_id', array(
                        'id' => 'master_country_id',
@@ -153,7 +157,7 @@
            </div>
            <div class="form-group has-feedback">
                <div class="col-xs-12 col-sm-12 col-md-12">
-                    <?php echo __('จังหวัด'); ?>
+                    <?php echo __('จังหวัด'); ?><em>* </em>
                    <?php 
                        echo $this->Form->input( 'master_province_id', array(
                        'id' => 'master_province_id',

--- a/www/src/Template/Users/signup.ctp
+++ b/www/src/Template/Users/signup.ctp
@@ -29,7 +29,7 @@
                <div class="form-group has-feedback">
                    <div class="col-md-12">
                        <label class="label-text-sub"><?php echo __('ชื่อผู้ใช้งาน');?><em>* </em></label>
-                        <input type="text" name="username" id="username" value="" onkeypress="check_notnum();" placeholder="USERNAME" class="form-control-reg border-bottom-from">
+                        <input type="text" name="username" id="username" value="" onkeypress="checkeng();" placeholder="USERNAME" class="form-control-reg border-bottom-from">
                    </div>
                </div>
@@ -109,7 +109,7 @@
                <div class="form-group has-feedback">
                    <div class="col-md-12">
                        <label class="label-text-sub"><?php echo __('รหัสผ่าน');?><em>* </em></label>
-                        <input data-toggle="password" data-placement="before" 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" onkeypress="checkeng();" 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 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>-->
                    </div>
@@ -119,7 +119,7 @@
                <div class="form-group has-feedback">
                    <div class="col-md-12">
                        <label class="label-text-sub"><?php echo __('ยืนยันรหัสผ่าน');?><em>* </em></label>
-                        <input data-toggle="password" data-placement="before" 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" onkeypress="checkeng();" 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 type="password" id="confirm_password" name="data[confirm_password]" value="" placeholder="********" class="form-control-reg border-bottom-from" onkeyup='check();'>-->
                        <!--<span class="glyphicon glyphicon-eye-close form-control-feedback" id='message'></span>-->
                        <span id='message'></span>
@@ -176,8 +176,34 @@
    });
 </script>
 <script>
+//  function check_key() {
+//         e_k=event.keyCode
+//         alert( 'asdasd')
+//         if ((k>=65 && k<=90) || (k>=97 && k<=122)){ 
+//                     return true;
+//                 }else{
+//                     alert("thai");
+//                     return false;
+//                 }
+//  }
    $(document).ready(function() {
+        // $("#username").on('keyup',function(){
+        //     var $this = $(this);
+        //     if($this.val().length>=4){
+        //        alert(check_key());
+        //     }else{
+        //         //alert("กรุณากรอกชื่อผู้ใช้งานของท่าน");
+        //         // return false; 
+        //     }
+        // });
        $("#fremail").on('change',function(){
            var email = document.getElementById("fremail").value;
            $.post("/Checkemails/checkemail", {email: email}, function(data) {
@@ -205,6 +231,16 @@
        alert("ข้อมูลผิดพลาด กรุณาใส่ข้อมูลที่เป็นตัวอักษรภาษาไทย [ก-ฮ] หรือภาษาอังกฤษให้ถูกต้อง");
        }
    }
+	function checkeng()
+	{
+        e_k=event.keyCode
+        if ((e_k >= 48 && e_k<=57) || (e_k>=97 && e_k<=122) || ((e_k>=65 && e_k<=90))) {
+            e_k = true;
+        }else{
+            e_k = false;
+            alert("กรุณากรอกชือผู้ใช้เป็นเป็นตัวอักษรภาษาอังกฤษตัวเล็กหรือตัวใหญ่และมีหรือไม่มีตัวเลขผสมอยู่");
+        }
+    } 
    function validateForm() {
        var firstname = document.getElementById("firstname").value;
@@ -222,9 +258,9 @@
            alert("กรุณากรอกชื่อผู้ใช้งานของท่าน");
            return false;           
        }
-        if(document.getElementById("username").value.length < 5)
+        if(document.getElementById("username").value.length < 4 || document.getElementById("username").value.length > 10)
 	    {
-		    alert('กรุณาระบุชื่อผู้ใช้งานอย่างน้อย 5 ตัวอักษร');
+		    alert('กรุณาระบุชื่อผู้ใช้งานความยาว 4-10 ตัวอักษร');
            return false;
        }
        var master_country_id = document.getElementById("master_country_id").value;