Merge branch 'integration' into prasong

www/src/Controller/UserCardsController.php

@@ -316,7 +316,6 @@ class UserCardsController extends AppController
                             ]
                         ])->first();
                         if(empty($UserEntities)){
-                            // pr('sdsd');die;
                             $UserEntities = $this->UserEntities->newEntity();
                             $UserEntities['entity_code'] = $TempUserCards['organize_id'];
                             $UserEntities['user_id'] = $this->Auth->user('id');

www/src/Template/Profiles/index.ctp

@@ -140,11 +140,12 @@
                         'id' => 'master_country_id',
                         'label' => false,
                         'type' => 'select',
+                        'require'=>'require',
                         'options' => $Country,
                         'value' => $responseUserPersonal['master_country_id'],
                         'empty' => '---Select---',
                         'default' => !empty($responseUserPersonal['master_country_id'])? $responseUserPersonal['master_country_id']:'',
-                        'class' => 'form-control border-bottom-from label-text-sub',
+                        'class' => 'form-control border-bottom-from label-text-sub require',
                         'style' => 'width:100%'
                         )); 
                     ?>
@@ -158,11 +159,12 @@
                         'id' => 'master_province_id',
                         'label' => false,
                         'type' => 'select',
+                        'require'=>'require',
                         'options' => $Province,
                         'value' => $responseUserPersonal['master_province_id'],
                         'empty' => '---Select---',
                         'default' => !empty($responseUserPersonal['master_province_id'])? $responseUserPersonal['master_province_id']:'',
-                        'class' => 'form-control border-bottom-from label-text-sub',
+                        'class' => 'form-control border-bottom-from label-text-sub require',
                         'style' => 'width:100%'
                         )); 
                     ?>
@@ -270,6 +272,16 @@
         //         return false;
         //     }
         // });
+        var master_country_id = document.getElementById("master_country_id").value;
+        if (master_country_id == null || master_country_id == "") {
+            alert("กรุณาระบุประเทศ");
+            return false;
+        }
+        var master_province_id = document.getElementById("master_province_id").value;
+        if (master_province_id == null || master_province_id == "") {
+            alert("กรุณาระบุจังหวัด");
+            return false;
+        }
         
         $("body").delegate(".is_active", "click", function () {
             $('.is_active').not(this).prop('checked', false);