Changeset 906 for pro-violet-viettel/sourcecode/application/modules/frontend

Timestamp:

Apr 23, 2015 12:00:06 PM (10 years ago)

Author:

namnd

Message:

 

Location:

pro-violet-viettel/sourcecode/application/modules/frontend

Files:

• controllers/home.php (modified) (1 diff)
• controllers/lecture.php (modified) (1 diff)
• controllers/user.php (modified) (1 diff)
• models/user_model.php (modified) (1 diff)
• views/lecture_editor.php (modified) (1 diff)
• views/user_infor.php (modified) (3 diffs)
• views/user_profile.php (modified) (1 diff)

pro-violet-viettel/sourcecode/application/modules/frontend/controllers/home.php

@@ -136 +136 @@
         
         public function test(){
-                $aryMatch = array();
-                $phoneNumber = '987133325';
-                $regex = '/^[1,9][0-9]{8,9}$/';
-                if (preg_match('/^[1,9]([0-9]{8,9})$/', $phoneNumber, $aryMatch)){
-                        $phoneNumber = "0".$phoneNumber;
-                        echo $phoneNumber;
-                }else{
-                        echo "Not match";
-                }
+                $this->load->model('collaborator/collaborator_model');
+                $province = ' Hà nội';
+                //$str = trim(ucwords($str));
+                $district = 'Quận Hai bà trưng';
+                $str = $this->collaborator_model->getProvinceAndDistict($province, $district);
+                var_dump($str);
+                //echo "Result: ".$str;
         }
 }

pro-violet-viettel/sourcecode/application/modules/frontend/controllers/lecture.php

@@ -53 +53 @@
             }
                         
-                        if ($u['province'] == '' && $u['p_id'] != ''){
+                        if ((!$u['province'] || !$u['district']) && $u['p_id'] != ''){
                                 $update_user_info=1;
                         }

pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php

@@ -286 +286 @@
                                 if (strlen($input['province']) == 0) {
                     $result['errors'][] = array("content"=>lang('_SBG_PROVINCE_REQUIRED_MSG'),"field"=>"province");
+                }
+                                if (strlen($input['district']) == 0) {
+                    $result['errors'][] = array("content"=>lang('_SBG_DISTRICT_REQUIRED_MSG'),"field"=>"district");
                 }
                 $input['password'] = '';

pro-violet-viettel/sourcecode/application/modules/frontend/models/user_model.php

@@ -100 +100 @@
                                 $this->db->insert ( 'tbluser', $user );
                                 //write_file('./log/test.log', date("H:i:s m-d-Y").": ". var_export($user, TRUE)."\n" , FOPEN_WRITE_CREATE);
-                                $aryPatterns = array ('/:trialdays:/', '/:username:/', '/:password:/');
+                                //$aryPatterns = array ('/:trialdays:/', '/:username:/', '/:password:/');
+                                $aryPatterns = array ('/:username:/', '/:password:/');
                                 $trialdays = $this->config->item('trial_period');
                                 $trialdays = strlen($trialdays) < 2 ? '0'. $trialdays : $trialdays;
                                 if ($this->isViettel($username)){
-                                        $sms = preg_replace($aryPatterns, array($trialdays. ' ngay', $username, $password), lang('_SBG_MO_USER_VIETTEL_REGISTER_SUCCESS_MSG'));
+                                        $sms = preg_replace($aryPatterns, array($username, $password), lang('_SBG_MO_USER_VIETTEL_REGISTER_SUCCESS_MSG'));
                                 }else{
-                                        $aryPatterns = array ('/:username:/', '/:password:/');
+                                        //$aryPatterns = array ('/:username:/', '/:password:/');
                                         $sms = preg_replace($aryPatterns, array($username, $password), lang('_SBG_MO_USER_NOT_VIETTEL_REGISTER_SUCCESS_MSG'));
                                 }

pro-violet-viettel/sourcecode/application/modules/frontend/views/lecture_editor.php

@@ -93 +93 @@
                                                 </div>
                                                 <div class="form-group">
-                                                        <label for="form-field-username" class="col-sm-4 control-label no-padding-right">Quận / Huyện</label>
+                                                        <label for="form-field-district" class="col-sm-4 control-label no-padding-right">Quận / Huyện</label>
                                                         <div class="col-sm-8">
                                                                 <select name="district" id="form-field-district" class="input-large"></select>
+                                                                <label class="block clearfix has-error">
+                                                                        <div id="district" class="help-block error"></div>
+                                </label> 
                                                         </div>
+                                                        
                                                 </div>
 

pro-violet-viettel/sourcecode/application/modules/frontend/views/user_infor.php

@@ -26 +26 @@
             <label for="form-field-username" class="col-sm-4 control-label no-padding-right">Tỉnh / Thà nh phố</label>
             <div class="col-sm-8">
-                <select name="province" id="form-field-province" class="form-field-province col-xs-12 col-sm-10">
+                <select name="province" id="form-field-province" class="form-field-province-user col-xs-12 col-sm-10">
+                                        <option></option>
                     <?php foreach ($provinces as $key => $pro): ?>
                         <option value="<?php echo $key; ?>" <?php if ($user['province'] == $key) echo "selected"; ?>><?php echo $pro; ?></option>
@@ -38 +39 @@
                         <label for="form-field-username" class="col-sm-4 control-label no-padding-right">Quận / Huyện</label>
                         <div class="col-sm-8">
-                                <select name="district" id="form-field-district" class="form-field-district col-xs-12 col-sm-10">
+                                <select name="district" id="form-field-district" class="form-field-district-user col-xs-12 col-sm-10">
 
                                 </select>
@@ -60 +61 @@
 var district_id = "<?php echo $user['district']; ?>";
 var province_id = "<?php echo $user['province']; ?>";
+
 $(document).ready(function(){
-        $(".form-field-province").change(function(){
+        $(".form-field-province-user").change(function(){
                 changeEventProvince(province_id);
         });
-        if ($(".form-field-province").val() !== 'undefined'){
+        if ($(".form-field-province-user").val() !== 'undefined'){
                 checkSelectedDistrict(province_id);
         }
 });
+
+function changeEventProvince(provinceId){
+        $(".form-field-district-user").html("");
+        $.ajax({
+        url: '/frontend/user/getDistrict/' + provinceId,
+        type: 'POST',
+        success: function (data, textStatus, jqXHR)
+        {
+            result = jQuery.parseJSON(data);
+                        content = "<option></option>";
+                        if (result != null){
+                                for (var i in result){                  
+                                        content = content + '<option value="' + result[i].district_id + '">'+ result[i].type + " "  + result[i].district_name + '</option>'
+                                }
+                        }
+                        $(".form-field-district-user").html(content);
+        }
+    });
+}
+
+function checkSelectedDistrict(provinceId){
+        $.ajax({
+        url: '/frontend/user/getDistrict/' + provinceId,
+        type: 'POST',
+        success: function (data, textStatus, jqXHR)
+        {
+            result = jQuery.parseJSON(data);    
+                        content = "<option></option>";
+                        if (result != null){
+                                for (var i in result){
+                                        if (result[i].district_id === district_id){
+                                                content = content + '<option value="' + result[i].district_id + '" selected >' + result[i].type + " " + result[i].district_name + '</option>';
+                                        }else{
+                                                content = content + '<option value="' + result[i].district_id + '">' + result[i].type + " "  + result[i].district_name + '</option>';
+                                        }
+                                }
+                                
+                        }
+                        $(".form-field-district-user").html(content);
+        }
+    });
+}
 </script>

pro-violet-viettel/sourcecode/application/modules/frontend/views/user_profile.php

@@ -302 +302 @@
                                         <div class="alert alert-block alert-success">                                           
                                             <p>
-                                                QuÃœ vị cÅ©ng có thể sá»­ dụng số điện thoại&nbsp;<strong><?php echo $username;?></strong> và  soạn tin theo cú pháp: <strong>SBG VIP 1</strong> (hay VIP 3, VIP 6, VIP 12) <strong>gá»­i tới 8062</strong> (Hệ thống sẜ trừ tiền trên tà i khoản chính của số điện thoại&nbsp;<strong><?php echo $username;?></strong>)
+                                                QuÃœ vị cÅ©ng có thể sá»­ dụng số điện thoại&nbsp;<strong><?php echo $username;?></strong> và  soạn tin theo cú pháp: <strong>SBG VIP 1</strong> (hay VIP 3) <strong>gá»­i tới 8062</strong> (Hệ thống sẜ trừ tiền trên tà i khoản chính của số điện thoại&nbsp;<strong><?php echo $username;?></strong>)
                                         </p>
                                         </div>