t : booking issue fixing

application/controllers/Api.php

@@ -325,7 +325,7 @@ class Api extends CI_Controller {
     }  
   }
 
-  public function payNow($reqData){
+  public function payNow($reqData=''){
     $settings   = getSettings();
     $redUrl     = $settings['web_base_url'];
 
@@ -394,7 +394,8 @@ class Api extends CI_Controller {
 
     $saveCard  = 1;
     $savedCard = 0;
-    $cvv = $token = $cardNo = $holder = $cardType = $expMonth = $expYear = $cardMode = '';
+    $cardMode = 'DD';
+    $cvv = $token = $cardNo = $holder = $cardType = $expMonth = $expYear = '';
 
     if (isset($cardData['cvv']) && !empty($cardData['cvv']) && 
         isset($cardData['token']) && !empty($cardData['token'])){

application/models/Webservice_model.php

@@ -389,7 +389,8 @@ class Webservice_model extends CI_Model {
 					if($count > $page_limit) {
 						$this->db->query("SET SESSION group_concat_max_len = 200000");
 						$result = $this->db->query("
-							SELECT events.seat_pricing,events.custom_seat_layout,event_category.cat_id,venue.id AS venue_id,venue.location_lat AS latitude,venue.location_lng AS longitude,venue.layout,venue.layout_details,events.event_id AS event_id,event_gallery.media_url AS image, (SELECT SUM(booking.no_of_ticket) FROM booking WHERE booking.event_id = events.event_id AND booking.status IN (1,2)) AS attendees,CAST(AVG (review.rate) AS DECIMAL (12,1)) AS rating,venue.location, IF(events.avg_price = 0, '100','150') AS rate, IF(events.provider_id = 1,'true','false') AS is_editors_choice, IF(favourite.is_favorite = 1, 'true','false') AS is_favorite, GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time 
+							SELECT events.seat_pricing,events.custom_seat_layout,event_category.cat_id,venue.id AS venue_id,venue.location_lat AS latitude,venue.location_lng AS longitude,venue.layout,venue.layout_details,events.event_id AS event_id,event_gallery.media_url AS image, (SELECT SUM(booking.no_of_ticket) FROM booking WHERE booking.event_id = events.event_id AND booking.status IN (1,2)) AS attendees,CAST(AVG (review.rate) AS DECIMAL (12,1)) AS rating,venue.location, IF(events.avg_price = 0, '100','150') AS rate, IF(events.provider_id = 1,'true','false') AS is_editors_choice, IF(favourite.is_favorite = 1, 'true','false') AS is_favorite, GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time,
+								events.has_payment
 							FROM events 
 							INNER JOIN venue ON venue.id = events.venue_id 
 							INNER JOIN event_date_time ON events.event_id = event_date_time.event_id 
@@ -453,6 +454,7 @@ class Webservice_model extends CI_Model {
 								'is_favorite'=>$rs->is_favorite === 'true'? true: false,
 								'latitude'=>$rs->latitude,
 								'longitude'=>$rs->longitude,
+								'has_payment'=>$rs->has_payment,
 								'currency_symbol'=>$countryData['currency_symbol']
 							);
 							array_push($response, $resData);

application/views/Booking/viewBooking.php

@@ -78,7 +78,9 @@
                           <i class="fa fa-fw fa-eye"></i>View
                         </a> <br>
                         <?php 
-                          if($this->session->userdata('user_type')==2 && $booking->book_status == '6'){
+                          if(($this->session->userdata('user_type')==1 && $booking->provider_id==1 && 
+                              $booking->book_status=='6') || 
+                             ($this->session->userdata('user_type')==2 && $booking->book_status=='6')){
                             $msg = "Are you sure to Aprove this booking ?";
                             $bookId = encode_param($booking->booking_id);
                             $param = "{'booking_id':'$bookId','alertMsg':'$msg'}"; ?>

application/views/Staff/staffForm.php

@@ -59,12 +59,12 @@
                       <div class="col-md-3">
                         <input type="radio" class="required padLeft10" data-parsley-trigger="change" 
                         required value="4" name="user_type" checked>
-                        <label class="padLeft10">Staff User</label>
+                        <label class="padLeft10">Staff</label>
                       </div>
                       <div class="col-md-5">
                         <input type="radio" class="required padLeft10" data-parsley-trigger="change" 
                         required value="5" name="user_type">
-                        <label class="padLeft10">Customer User</label>
+                        <label class="padLeft10">Customer</label>
                       </div>
                     </div> 
                   </div>