branch status issue fixed

Apollo/api/application/controllers/Branch_Controller.php

@@ -49,7 +49,8 @@ class Branch_Controller extends REST_Controller {
 
     public function addBranchDetails_post()
     {
-
+        $now = new DateTime();
+        $now->setTimezone(new DateTimezone('Asia/Kolkata'));
         $details['BranchCode'] = $this->post('branchCode');
         $details['BranchName'] = $this->post('branchName');
         // $details['LogoPath'] = $this->post('logo');
@@ -59,7 +60,8 @@ class Branch_Controller extends REST_Controller {
         $details['Address'] = $this->post('address');
         $details['EmailID'] = $this->post('email');
         $details['CreatedBy'] = $this->post('createdBy');
-        $details['IsActive'] = $this->post('status');
+        $details['IsActive'] = $this->post('status') == "true" ? 1 : 0;
+        $details['CreatedOn'] = $now->format('Y-m-d H:i:s');
         
         $imageStat = $this->post('imageStatus');
         
@@ -117,6 +119,8 @@ class Branch_Controller extends REST_Controller {
      * */
     public function updateBranchDetails_post()
     {
+        $now = new DateTime();
+        $now->setTimezone(new DateTimezone('Asia/Kolkata'));
         $branchCode = $this->post('branchCode');
         $details['BranchName'] = $this->post('branchName');
         $details['LogoPath'] = $this->post('logo');
@@ -125,10 +129,9 @@ class Branch_Controller extends REST_Controller {
         $details['LandlineNumber'] = $this->post('landLine');
         $details['Address'] = $this->post('address');
         $details['EmailID'] = $this->post('email');
-        $details['IsActive'] = $this->post('status');
+        $details['IsActive'] = $this->post('status') == "true" ? 1 : 0;
         $details['UpdatedBy'] = $this->post('createdBy');
-          $date = date('Y-m-d H:i:s');
+        $details['UpdatedOn'] = $now->format("Y-m-d H:i:s");
-        $details['UpdatedOn'] = $date;
 
         $imageStat = $this->post('imageStatus');
         

Apollo/assets/views/status-update/updateFeesStatus.html

@@ -358,7 +358,7 @@
                                           ng-if="Form.trackStatus.$dirty && Form.trackStatus.$invalid">Status is required</span>
                                 </div>-->
 
-                                <div class="col-md-4 form-group"
+                                <div class="col-md-6 form-group"
                                      ng-class="{'has-error':Form.studcomments.$dirty && Form.studcomments.$invalid,'has-success':Form.studcomments.$valid}">
                                     <label>
                                         Comments For Student <span class="symbol required"></span>
@@ -371,7 +371,7 @@
                                     <!--<span class="success text-small"-->
                                     <!--ng-if="Form.address.$valid">Thank You!</span>-->
                                 </div>
-                                <div class="col-md-4 form-group"
+                                <div class="col-md-6 form-group"
                                      ng-class="{'has-error':Form.internalcomments.$dirty && Form.internalcomments.$invalid,'has-success':Form.internalcomments.$valid}">
                                     <label>
                                         Comments For Internal <span class="symbol required"></span>
@@ -476,10 +476,10 @@
                                                         <td style="width: 136px; height: 23px; text-align: center; border-bottom-style: hidden; color: white; background-color: black; font-size: 16px;" colspan="3">(A Group of SVE Trust)</td>
                                                     </tr>
                                                     <tr style="height: 36px;">
-                                                        <td style="width: 136px; height: 36px; text-align: center; color: white; background-color: black; font-size: 15px;" colspan="3">10/1, First Floor, Old Airport Road, Domlur, Bangalore - 560071. karnataka Land Mark - Opp to Domlur Bus Stop Ph:&nbsp;9620214554</td>
+                                                        <td style="width: 136px; height: 36px; text-align: center; color: white; background-color: black; font-size: 15px;" colspan="3">10/1, First Floor, Old Airport Road, Domlur, Bangalore - 560071. karnataka<br> Land Mark - Opp to Domlur Bus Stop Ph:&nbsp;9620214554</td>
                                                     </tr>
                                                     <tr style="height: 50px;">
-                                                        <td style="width: 136px; height: 50px; text-align: center; border-bottom-style: hidden;" colspan="3">
+                                                        <td style="width: 136px; height: 50px; text-align: center; border-bottom-style: hidden;padding-left:25%;" colspan="3">
                                                             <span style="border: 2px solid black; padding: 10px; border-radius: 15px; font-size: 14px; color: #fff; background-color: black;">FEES RECEIPT</span>
                                                         </td>
                                                         <td style="width: 137px; height: 50px; border-left-style: hidden; border-bottom-style: hidden;"><strong>DOM:</strong>&nbsp;{{billNo}}</td>
@@ -498,7 +498,7 @@
                                                     </tr>
                                                     <tr style="height: 24px;">
                                                         <td style="width: 136px; height: 24px;"><strong>Course:</strong>&nbsp;{{items.CourseName}}</td>
-                                                        <td style="width: 136px; height: 24px;"><strong>Sem:</strong>&nbsp;{{items.FeesName}}</td>
+                                                        <td style="width: 136px; height: 24px;"><strong>Fees Type:</strong>&nbsp;{{items.FeesName}}</td>
                                                         <td style="width: 137px; height: 24px;"><strong>Exam Cycle:</strong>&nbsp;{{items.SessionName}}</td>
                                                         <td style="width: 137px; height: 24px;"><strong>Univ:</strong>&nbsp;{{items.UniversityName}}</td>
                                                     </tr>
@@ -563,6 +563,3 @@
     </div>
 </form>
 <!--  class="editRowTd" -->
-
-
-