Merge branch 'integration' into teeradone

www/src/Controller/UserCardsController.php

@@ -231,7 +231,7 @@ class UserCardsController extends AppController
     }
     }
     public function viewCard($user_id = null){
     public function viewCard($user_id = null){
         $this->viewBuilder()->layout('blank');
         $this->viewBuilder()->layout('blank');
-        // $user = $this->Auth();
+        $user_id = $this->Auth->user('id');
         $this->loadModel('UserCards');
         $this->loadModel('UserCards');
         $UserCards = $this->UserCards->find('all')
         $UserCards = $this->UserCards->find('all')
          ->select($this->UserCards)
          ->select($this->UserCards)
@@ -302,8 +302,8 @@ class UserCardsController extends AppController
                     $userCard['date_expiry'] = $TempUserCards['date_expiry'];
                     $userCard['date_expiry'] = $TempUserCards['date_expiry'];
                     $userCard['signature'] = $TempUserCards['signature'];
                     $userCard['signature'] = $TempUserCards['signature'];
                     $userCard['is_used'] = $TempUserCards['is_used'];
                     $userCard['is_used'] = $TempUserCards['is_used'];
-                    $userCard['created_by'] = 1;
-                    $userCard['user_id'] = 1;
+                    $userCard['created_by'] = $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;
                         // pr('sdsd');die;