Merge branch 'integration' into teeradone

www/src/Controller/UserCardsController.php

@@ -208,33 +208,33 @@ class UserCardsController extends AppController
     }
     public function viewCard($user_id = null){
         $this->viewBuilder()->layout('blank');
-        $user_id = $this->Auth->user('id');
-        $this->loadModel('UserCards');
-        $UserCards = $this->UserCards->find('all')
-         ->select($this->UserCards)
-        ->select(
-            'morg.org_name_th'
-        )
-        ->join([             
-            'morg' => [
-                'table' => 'master.master_organizations',
-                'type' => 'INNER',
-                'conditions' => [
-                    'morg.id = userCards.organize_id'
-                ],
-            ]
-        ])
-        ->where([
-            'userCards.user_id' => $user_id   
-        ])
-        ->order(['userCards.id' => 'ASC'])
-        ->toArray();
+        // $user_id = $this->Auth->user('id');
+        // $this->loadModel('UserCards');
+        // $UserCards = $this->UserCards->find('all')
+        //  ->select($this->UserCards)
+        // ->select(
+        //     'morg.org_name_th'
+        // )
+        // ->join([             
+        //     'morg' => [
+        //         'table' => 'master.master_organizations',
+        //         'type' => 'INNER',
+        //         'conditions' => [
+        //             'morg.id = userCards.organize_id'
+        //         ],
+        //     ]
+        // ])
+        // ->where([
+        //     'userCards.user_id' => $user_id   
+        // ])
+        // ->order(['userCards.id' => 'ASC'])
+        // ->toArray();
 
-        // pr($UserCards);die;
-        $this->set(compact('UserCards'));
+        // // pr($UserCards);die;
+        // $this->set(compact('UserCards'));
 
         // -----------------------------ในส่วนของการ add-------------------------
-
+        $this->autoRender = false;
         $this->loadModel('TempUserCards');
         $this->loadModel('MasterOrganizations');
         if($this->request->is('post')) {
@@ -306,12 +306,14 @@ class UserCardsController extends AppController
                         return $this->redirect(['controller' => 'Profiles', 'action' => 'index']);
                     }
                 }else{
-                    $this->Flash->error(__('Already registered'));
-                    return $this->redirect(['controller' => 'UserCards', 'action' => 'viewCard']);
+                    $this->Flash->error(__('ลงทะเบียนไว้อยู่แล้ว'));
+                   // return $this->redirect(['controller' => 'UserCards', 'action' => 'viewCard']);
+                   return $this->redirect(['controller' => 'Profiles', 'action' => 'index#box-add-card']);
                 }
             }else{
-                $this->Flash->error(__('Data not found'));
-                return $this->redirect(['controller' => 'UserCards', 'action' => 'viewCard']);
+                $this->Flash->error(__('ไม่พบข้อมูล'));
+               // return $this->redirect(['controller' => 'UserCards', 'action' => 'viewCard']);
+               return $this->redirect(['controller' => 'Profiles', 'action' => 'index#box-add-card']);
             }
         }
     }

www/src/Template/Element/card_from/from_0.ctp

@@ -3,15 +3,16 @@ use Cake\I18n\Time;
 ?>
 <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-12">
-        <div class="modal " id="card_<?php echo $i;?>"  tabindex="-1" role="dialog" aria-labelledby=""
-            aria-hidden="true">
+        <div class="modal fade" id="card_<?php echo $i;?>" 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="">
                         <div class="owl-carousel owl-theme" data-plugin-options="{'items': 1}">
                             <div class="row rotate270 form_1">
-                                <?php echo $this->Html->image('/img/core/img/card-bg-front@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => 'position: absolute;')); ?>
+                                <div class="form_1-card-img">
+                                    <?php echo $this->Html->image('/img/core/img/card-bg-front@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => '')); ?>
+                                </div>
                                 <div class="row date-name">
                                     <div class="col-xs-8 ">
                                         <br>
@@ -63,7 +64,7 @@ use Cake\I18n\Time;
                             </div>
                             <!--/ .font-card-->
                             <div>
-                                <?php  echo $this->Html->image('/img/core/img/card-bg-back@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => '3position: absolute;')); ?>
+                                <?php  echo $this->Html->image('/img/core/img/card-bg-back@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => '')); ?>
                             </div>
                             <!--/ .back-card-->
                         </div>
@@ -76,4 +77,59 @@ use Cake\I18n\Time;
         </div>
         <!--/.defaultModal -->
     </div>
+    <!--/.col-xs-12 -->
 </div>
+<!--/row modal card-->
+
+<style>
+ .form_1 {
+     width: 100%;
+     height: 100%;
+     margin: auto;
+     padding: auto;
+ }
+
+ .form_1-card-img {
+     position: absolute;
+     width: 100%;
+     margin: auto;
+     padding: auto;
+ }
+
+ .form_1-card-img img {
+     position: relative;
+     width: 100%;
+ }
+
+ .form_1 .date-name {
+     width: 500px;
+     margin: 55% 0% 0% -40%;
+     border-bottom: 0px solid red;
+     position: absolute;
+     z-index: 9999;
+     display: block;
+ }
+
+ .date-name div div {
+     height: 35px;
+ }
+
+ .form_1 .date-position {
+     width: 500px;
+     margin: 70% 0% 0% -15%;
+     border-bottom: 0px solid #000;
+ }
+
+ .form_1 .date-time {
+     width: 500px;
+     margin: 70% 0% 0% 10%;
+     border-bottom: 0px solid #000;
+ }
+
+ .form_1 .date-label {
+     width: 500px;
+     margin: 70% 0% 0% 20%;
+     border-bottom: 0px solid #000;
+ }
+
+</style>
\ No newline at end of file