Merge branch 'integration' into teeradone

.gitignore

@@ -3,3 +3,4 @@ www/logs/
 www/tmp/
 www/webroot/img/img/demos/shop/products/shop8/product2.jpg
 www/webroot/img/img/demos/
+www/src/Controller/UsersController.php.bg20180515

www/src/Controller/ProfilesController.php

@@ -24,8 +24,7 @@ class ProfilesController extends AppController
         $this->loadModel('MasterCountries');
         $Country = $this->MasterCountries->find('list', [
             'conditions' => [
-                'is_used' => true,
-                    'MasterCountries.id' => 1],
+                'is_used' => true],
             'keyField' => 'id',
             'valueField' => 'country_name_th'
         ]);
@@ -35,8 +34,7 @@ class ProfilesController extends AppController
         $this->loadModel('MasterProvinces');
         $Province = $this->MasterProvinces->find('list', [
             'conditions' => [
-                'is_used' => true,
-                    'master_country_id' => 1],
+                'is_used' => true],
             'keyField' => 'id',
             'valueField' => 'province_name_th'
         ]);
@@ -86,6 +84,7 @@ class ProfilesController extends AppController
             
             $birthdate = explode("/", $this->request->data['UserPersonals']['birthdate']);
             $birthdate = $birthdate[2].'-'.$birthdate[1].'-'.$birthdate[0];
+            
             $userPersonals = $this->UserPersonals->patchEntity($userPersonals, $data['UserPersonals']);
             $userPersonals['firstname_th'] = $this->request->data['UserPersonals']['firstname_th'];
             $userPersonals['lastname_th'] = $this->request->data['UserPersonals']['lastname_th'];
@@ -110,9 +109,6 @@ class ProfilesController extends AppController
     }
 
     /*****************************************************************************/
-
-
-    /*****************************************************************************/
     public function settingProfile()
     {
     	//prr($this->request->getHeaderLine('Accept-Language'));
@@ -593,30 +589,4 @@ if (!empty($SubjectEnrolls)) {
         $this->viewBuilder()->layout('blank');
 
     }
-
-    // public function getProvince() {
-
-    //     $this->autoRender = false;
-    //     $this->loadModel('MasterProvinces');
-    //     $states = array();
-    //     // pr($this->request->data);die;
-    //     // echo 'jjjj';
-	// 		$states = $this->MasterProvinces->find('list', array(
-    //             'keyField' => 'id',
-    //             'valueField' => 'province_name_th',
-	// 			'conditions' => array(
-	// 				'master_country_id' => 2
-	// 			)
-    //         ))->toArray();
-    //         $arr = array();
-    //     foreach($states as $key => $val){
-    //         $arr[$key] = $val;
-    //     }
-    //      //pr($states);die;
-    //     // $arr['1'] = "ไทยยยย";
-    //     // $arr['2'] = "ไทยยยยยยยยยย";
-    //     echo json_encode($arr);
-    //     // $data = jQuery.parseJSON($f);
-    //     // pr($data);die;
-	// }
 }

www/src/Controller/UserCardsController.php

@@ -231,6 +231,7 @@ class UserCardsController extends AppController
     }
     public function viewCard($user_id = null){
         $this->viewBuilder()->layout('blank');
+        // $user = $this->Auth();
         $this->loadModel('UserCards');
         $UserCards = $this->UserCards->find('all')
          ->select($this->UserCards)

www/src/Template/Layout/blank.ctp

@@ -99,6 +99,6 @@
         <?php echo $this->Html->script('custom'); ?>
         <!-- Theme Initialization Files -->
         <?php echo $this->Html->script('theme.init'); ?>
-        
+        <?php echo $this->fetch('scriptBottom'); ?>
     </body>
 </html>

www/src/Template/UserCards/create_cards.ctp

@@ -49,7 +49,7 @@
     var date = document.getElementById("date");
     $(document).ready(function() {
         $("#organize_code").on('change',function(){
-            var organize_code = document.getElementById("organize_code").value
+            var organize_code = document.getElementById("organize_code").value;
             alert(organize_code);
             $.post("/UserCards/checkOrg", {organize_code: organize_code}, function(data) {
                 if(data!='false'){
@@ -94,8 +94,7 @@
             date.focus();
         }
     }
-</script>
-<script>
+
     $(document).ready(function(){
       var date_input=$('input[id="date"]'); //our date input has the name "date"
       var container=$('.bootstrap-iso form').length>0 ? $('.bootstrap-iso form').parent() : "body";