Merge branch 'teeradone' into integration

# Conflicts:
#	www/src/Template/Users/signup.ctp

www/src/Controller/UsersController.php

@@ -231,6 +231,7 @@ class UsersController extends AppController
         }
         }
 	}
 	}
 	
 	
+	
 	public function notification($data = null)
 	public function notification($data = null)
     {
     {
      if(!empty($data)){
      if(!empty($data)){

www/src/Template/Users/signup.ctp

@@ -468,7 +468,17 @@
 
 
 
 
 <!--------------------------------- 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
     //if (((e_k < 48) || (e_k > 57)) && e_k != 46 ) {
     //if (((e_k < 48) || (e_k > 57)) && e_k != 46 ) {