Merge branch 'integration' into wittaya

www/src/Controller/ProvincesController.php

+<?php
+namespace App\Controller;
+use App\Controller\AppController;
+
+class ProvincesController extends AppController
+{	
+	public function getProvince() {
+
+		$this->autoRender = false;
+		$this->loadModel('MasterProvinces');
+		$states = array();
+	 $id = $this->request->data('id');
+	  $states = $this->MasterProvinces->find('list', array(
+				'keyField' => 'id',
+				'valueField' => 'province_name_th',
+	   'conditions' => array(
+		'master_country_id' =>$id
+	   )
+			))->toArray();
+		$arr = array();
+	   if(!empty($states)){
+	 echo '<option value=""> ---Select--- </option>';
+	 foreach($states as $key => $val){
+	  echo '<option value="' . $key . '">' . $val. '</option>';
+	 }
+	}else{
+	 return false;
+	}
+   }
+	 
+}

www/src/Controller/UsersController.php

@@ -414,29 +414,4 @@ class UsersController extends AppController
 	$this->checkToken();
     
 	}
-	
-	public function getProvince() {
-
-		$this->autoRender = false;
-		$this->loadModel('MasterProvinces');
-		$states = array();
-	 $id = $this->request->data('id');
-	  $states = $this->MasterProvinces->find('list', array(
-				'keyField' => 'id',
-				'valueField' => 'province_name_th',
-	   'conditions' => array(
-		'master_country_id' =>$id
-	   )
-			))->toArray();
-		$arr = array();
-	   if(!empty($states)){
-	 echo '<option value=""> ---Select--- </option>';
-	 foreach($states as $key => $val){
-	  echo '<option value="' . $key . '">' . $val. '</option>';
-	 }
-	}else{
-	 return false;
-	}
-   }
-	 
 }

www/src/Template/Profiles/index.ctp

@@ -33,7 +33,7 @@ public function generate(){
 
     <div class="col-xs-10 col-sm-10 col-md-10">
         <div data-toggle="modal" data-target="#defaultModal" style="text-align: center; cursor: pointer;">
-            <img src="/img/core/img/card-bg-front@3x-V2.png" class="img-responsive" id="img-upload" alt="Profile picture">                
+            <img src="/img/core/img/connect-card-v3.png" class="img-responsive" id="img-upload" alt="Profile picture">                
         </div>
     </div>
 
@@ -180,17 +180,16 @@ public function generate(){
         <div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-labelledby="defaultModalLabel" aria-hidden="true">
             <div class="modal-dialog box-ads">
             <a class="close-modal" data-dismiss="modal">X </a>  
-                
                 <div class="container login-container">
                     <div class="owl-carousel owl-theme" data-plugin-options="{'items': 1}">
                         <div> 
-                                    <img src="/img/core/img/card-bg-front@3x.png" class="img-responsive" id="img-upload" alt="Profile picture">
+                            <img src="/img/core/img/connect-card-v2.png" class="img-responsive" id="img-upload" alt="Profile picture">
                         </div>  
                         <div>
                             <div class="qrcode-profile"><br>
                                 <?php echo __('แสดง QR Code เพื่อรับสิทธิ์');?>
                             </div>
-                                    <img src="/img/core/img/card-bg-back@3x.png" class="img-responsive" id="img-upload" alt="Profile picture">
+                            <img src="/img/core/img/connect-card-back.png" class="img-responsive" id="img-upload" alt="Profile picture">
                             <div class="qrcode-name">
                                 <?php
                                 $ex1 = new QRGenerator(); 
@@ -227,7 +226,7 @@ public function generate(){
                 var dataString = 'id=' + id;
                 $.ajax({
                     type: "POST",
-                    url: '/users/getProvince',
+                    url: '/provinces/getProvince',
                     data: dataString,
                     cache: false,
                     success: function (html) {

www/src/Template/Users/signup.ctp

@@ -440,7 +440,7 @@
                 $("#master_province_id").html('');
                 $.ajax({
                     type: "POST",
-                    url: '/users/getProvince',
+                    url: '/provinces/getProvince',
                     data: dataString,
                     cache: false,
                     success: function (html) {