Merge branch 'master' into 'dev_production'

application/models/Webservice_model.php

@@ -128,7 +128,6 @@ class Webservice_model extends CI_Model {
 				'is_phone_available'=>$is_phone_available === 'true'? true: false
 			);
 			$res = array('status'=>1,'data'=>$data);
-
 		} catch(Exception $e) {
 			$res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
 		} 

application/views/Booking/viewBooking.php

@@ -68,9 +68,9 @@
                             case 3: echo 'Pending'; break;
                             case 4: echo 'Deleted'; break;
                             case 5: echo 'Payment Failed'; break;
-                            case 6: if($booking->has_payment == 0){ echo 'Waiting for Aproval'; break; } 
+                            case 6: if($booking->has_payment == 0){ echo 'Waiting for Approval'; break; } 
                                     else { 
-                                      if ($booking->trans_status ==  '1') { echo 'Waiting for Aproval'; break; }
+                                      if ($booking->trans_status ==  '1') { echo 'Waiting for Approval';break; }
                                       else { echo 'Pending'; break; }
                                     }
                           }