Merge branch 'integration' into teeradone

www/src/Controller/ProfilesController.php

@@ -28,6 +28,7 @@ class ProfilesController extends AppController
                 
                 
                 'user_id' => $id ]
                 'user_id' => $id ]
             ])->first();
             ])->first();
+
         //********DropdownCountry********
         //********DropdownCountry********
         $this->loadModel('MasterCountries');
         $this->loadModel('MasterCountries');
         $Country = $this->MasterCountries->find('list', [
         $Country = $this->MasterCountries->find('list', [
@@ -55,8 +56,6 @@ class ProfilesController extends AppController
         $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'])) {
-            // pr($this->request->data['email']);die;
-
             $data = $this->request->data;
             $data = $this->request->data;
 
 
             // pr($this->request->data);die;
             // pr($this->request->data);die;
@@ -98,7 +97,7 @@ class ProfilesController extends AppController
             $birthdate = explode("/", $this->request->data['UserPersonals']['birthdate']);
             $birthdate = explode("/", $this->request->data['UserPersonals']['birthdate']);
             $birthdate = $birthdate[2].'-'.$birthdate[1].'-'.$birthdate[0];
             $birthdate = $birthdate[2].'-'.$birthdate[1].'-'.$birthdate[0];
             // pr($userPersonals);die;
             // pr($userPersonals);die;
-            // $userPersonals = $this->UserPersonals->patchEntity($userPersonals, $data['UserPersonals']);
+            $userPersonals = $this->UserPersonals->patchEntity($userPersonals, $data['UserPersonals']);
             $userPersonals['firstname_th'] = $this->request->data['UserPersonals']['firstname_th'];
             $userPersonals['firstname_th'] = $this->request->data['UserPersonals']['firstname_th'];
             $userPersonals['lastname_th'] = $this->request->data['UserPersonals']['lastname_th'];
             $userPersonals['lastname_th'] = $this->request->data['UserPersonals']['lastname_th'];
             $userPersonals['email'] = $this->request->data['email'];
             $userPersonals['email'] = $this->request->data['email'];
@@ -107,8 +106,6 @@ class ProfilesController extends AppController
             $userPersonals['master_country_id'] = $this->request->data['master_country_id'];
             $userPersonals['master_country_id'] = $this->request->data['master_country_id'];
             $userPersonals['master_province_id'] = $this->request->data['master_province_id'];
             $userPersonals['master_province_id'] = $this->request->data['master_province_id'];
             $userPersonals['modified_by'] = $id;
             $userPersonals['modified_by'] = $id;
-            // $userPersonals = $this->UserPersonals->patchEntity($userPersonals, $data['UserPersonals']);
-            $userPersonals = $this->Users->patchEntity($userPersonals, $this->request->getData());
             // pr($userPersonals);die;
             // pr($userPersonals);die;
             
             
             if ($this->UserPersonals->save($userPersonals)) {
             if ($this->UserPersonals->save($userPersonals)) {

www/src/Controller/UserCardsController.php

@@ -306,7 +306,6 @@ class UserCardsController extends AppController
                     $userCard['user_id'] = $this->Auth->user('id');
                     $userCard['user_id'] = $this->Auth->user('id');
                     // pr($userCard);die;
                     // pr($userCard);die;
                     if ($this->UserCards->save($userCard)) {
                     if ($this->UserCards->save($userCard)) {
-                        // pr('sdsd');die;
                         $TempUserCards['is_used'] = 0;
                         $TempUserCards['is_used'] = 0;
                         $this->TempUserCards->save($TempUserCards);
                         $this->TempUserCards->save($TempUserCards);
                         $this->loadModel('UserEntities');
                         $this->loadModel('UserEntities');

www/src/Controller/UsersController.php

@@ -123,6 +123,7 @@ class UsersController extends AppController {
 
 
         $this->viewBuilder()->layout('blank');
         $this->viewBuilder()->layout('blank');
     }
     }
+
     #---------------------------------------------------------------------------------------------------
     #---------------------------------------------------------------------------------------------------
 
 
     #Signup
     #Signup
@@ -414,13 +415,23 @@ class UsersController extends AppController {
 
 
     #---------------------------------------------------------------------------------------------------        
     #---------------------------------------------------------------------------------------------------        
     
     
-    public function signout()
-    {
-	$this->checkToken();
-    
+    /**
+     * 
+     * Function user logout / signout
+     * @author sarawutt.b
+     * @since  2018/05/22 16:44:20
+     * @license PAKGON
+     * @return void
+     */
+    public function signout() {
+        $http = new Client();
+        $result = $http->delete(Configure::read('OAUTH2_PROVIDER.TOKEN_DETETE') . '/' . $this->Auth->user('id'))->body();
+        $this->Flash->success(__('You are now logged out.'));
+        return $this->redirect($this->Auth->logout());
     }
     }
 
 
 	
 	
 	
 	
    
    
+	 
 }
 }