daily commit

application/controllers/Booking.php

@@ -15,11 +15,11 @@ class Booking extends CI_Controller {
 
 	public function viewBookings(){
 		$template['page'] = 'Booking/viewBooking';
-        $template['menu'] = 'Organizer Management';
-        $template['smenu'] = 'View Organizers';
-        $template['pTitle'] = "View Organizers";
-        $template['pDescription'] = "View and Manage Organizers";
-        $template['page_head'] = "Organizer Management";
+        $template['menu'] = 'Booking Management';
+        $template['smenu'] = 'View Bookings';
+        $template['pTitle'] = "View Bookings";
+        $template['pDescription'] = "View and Manage Bookings";
+        $template['page_head'] = "Booking Management";
 
         $provider_id = ($this->session->userdata('user_type')==2)?$this->session->userdata('id'):'';
         $template['booking_data'] = $this->Booking_model->getBookingData('',$provider_id,'0,1,2,3');

application/views/Booking/viewBooking.php

@@ -26,7 +26,7 @@
       <div class="col-xs-12">
         <div class="box box-warning"> 
           <div class="box-header with-border">
-            <div class="col-md-6"><h3 class="box-title">Organizer List</h3></div>
+            <div class="col-md-6"><h3 class="box-title">Booking List</h3></div>
             <div class="col-md-6" align="right">
               <a class="btn btn-sm btn-success" href="<?=base_url('Booking/generateReport')?>">Generate Report</a>
               <a class="btn btn-sm btn-primary" href="<?= base_url() ?>">Back</a>

application/views/Booking/viewBookingDetails.php

@@ -6,7 +6,7 @@
    <div class="view_booking_modal">
      <div class="row">
        <div class="col-md-12 textRight">
-        <img class="qr_code" src="<?= base_url($bookData->qrcode) ?>" onerror="this.src='<?=base_url("assets/images/no_image_text.png")?>';" />
+        <img class="qr_code" src="<?= base_url($bookData->qrcode) ?>" onerror="this.src='<?=base_url("assets/images/qr_default.png")?>';" style="max-width: 100px;max-height: 100px"/>
       </div>
       </div>
       <div class="row">
@@ -50,18 +50,20 @@
                 :
                 </div>
                 <div class="col-md-5">
-                <?php
-                  if(!empty($bookData->ticket_details)){
-                    $tkt = json_decode($bookData->ticket_details,true);
-                    if(isset($tkt['price'],$tkt['no_ticket'],$tkt['total_price']) && 
-                       !empty($tkt['price']) && !empty($tkt['no_ticket']) && 
-                       !empty($tkt['total_price'])){
-                      $pDiv = (isset($tkt['color']) && !empty($tkt['color']))?$tkt['color'].' Block : ':'';
-                      $pDiv .= $tkt['price'].' * '.$tkt['no_ticket'].'(Seats) = '.$tkt['total_price'];
-                      echo $pDiv;
-                    }
-                  }
-                ?>
+                  <p class="truncateText">
+                    <?php
+                      if(!empty($bookData->ticket_details)){
+                        $tkt = json_decode($bookData->ticket_details,true);
+                        if(isset($tkt['price'],$tkt['no_ticket'],$tkt['total_price']) && 
+                           !empty($tkt['price']) && !empty($tkt['no_ticket']) && 
+                           !empty($tkt['total_price'])){
+                          $pDiv = (isset($tkt['color']) && !empty($tkt['color']))?$tkt['color'].' Block : ':'';
+                          $pDiv .= $tkt['price'].' * '.$tkt['no_ticket'].'(Seats) = '.$tkt['total_price'];
+                          echo $pDiv;
+                        }
+                      }
+                    ?>
+                  </p>
                 </div>
               </div>
             </div>
@@ -146,7 +148,7 @@
                 :
                 </div>
                 <div class="col-md-5">
-                <?=  $bookData->event_discription ?>
+                  <p class="truncateText"><?=  $bookData->event_discription ?></p>
                 </div>
               </div>
             </div>
@@ -176,7 +178,7 @@
                 :
                 </div>
                 <div class="col-md-5">
-                <?=  $bookData->category_description ?>
+                  <p class="truncateText"><?=  $bookData->category_description ?></p>
                 </div>
               </div>
             </div>
@@ -300,7 +302,7 @@
                 :
                 </div>
                 <div class="col-md-5">
-                <?=  $bookData->venue_details  ?>
+                  <p class="truncateText"><?=  $bookData->venue_details  ?></p>
                 </div>
               </div>
             </div>
@@ -315,7 +317,7 @@
                 :
                 </div>
                 <div class="col-md-5">
-                <?=  $bookData->location ?>
+                  <p class="truncateText"><?=  $bookData->location ?></p>
                 </div>
               </div>
             </div>