Merge branch 'alen' into 'master'

src/pages/map/map.ts

@@ -93,7 +93,7 @@ export class MapPage {
           var heading = google.maps.geometry.spherical.computeHeading(lastPosn, cur)
           dimage.rotation = heading;
           marker.setIcon(dimage);
-          ////
+        ////
 
 
           This.calculateAndDisplayRoute(directionsService, This.directionsDisplay, pickLoc, driverLoc);
@@ -113,9 +113,9 @@ export class MapPage {
       zoom: 15,
       mapTypeId: google.maps.MapTypeId.ROADMAP
     }
-
+    
     this.map = new google.maps.Map(this.mapElement.nativeElement, mapOptions);
-
+    
     this.directionsDisplay = new google.maps.DirectionsRenderer({
       map: this.map,
       preserveViewport: true

src/pages/ridedetail/ridedetail.html

@@ -8,7 +8,6 @@
   </style>
 
 
-
 <ion-header class="theme_dark_bg">
     <button ion-button class="nav_btn theme_color floatLeft" (click)="back()">
        <ion-icon name="ios-arrow-back"></ion-icon>

src/pages/ridedetail/ridedetail.ts

@@ -21,8 +21,9 @@ export class RidedetailPage {
   count: number = 0;
   loader: any;
   driver: any;
-  bkid: any =38;
+  bkid: any;
   drivers = []
+  temp:boolean = false;
 
   constructor(public navCtrl: NavController, public navParams: NavParams, private data: dataService, private zone: NgZone, private myservice: Myservice, private storage: Storage, public platform: Platform, public loadingCtrl: LoadingController, private alertCtrl: AlertController) {
   }
@@ -100,26 +101,26 @@ export class RidedetailPage {
             This.loader.dismissAll();
             This.myservice.show_alert('', 'No drivers found')
           }
-          else {
-            // var bdata = { 'book_date': This.book.date, 'drop_area': This.book.dropArea, 'pickup_area': This.book.pickArea, 'taxi_type': This.book.carDetails.car_type, 'amount': '', 'km': '', 'promocode': This.book.promocode, 'token': This.local.token, 'userid': This.local.id, 'type': 'now', 'drivers': [], 'discount': This.book.discount ? This.book.discount : 0, 'pickup_latlng': this.book.pickLat + ',' + this.book.pickLng, 'drop_latlng': this.book.dropLat + ',' + this.book.dropLng }
-
+          else if (This.temp == false) {
+            var bdata = { 'book_date': This.book.date, 'drop_area': This.book.dropArea, 'pickup_area': This.book.pickArea, 'taxi_type': This.book.carDetails.car_type, 'amount': '', 'km': '', 'promocode': This.book.promocode, 'token': This.local.token, 'userid': This.local.id, 'type': 'now', 'drivers': [], 'discount': This.book.discount ? This.book.discount : 0, 'pickup_latlng': this.book.pickLat + ',' + this.book.pickLng, 'drop_latlng': this.book.dropLat + ',' + this.book.dropLng }
 
-            // bdata.drivers = This.drivers;
+            bdata.drivers = This.drivers;
 
-            // console.log(bdata)
+            console.log(bdata)
 
-            // This.myservice.load_post(bdata, 'book_cab').subscribe(response => {
-            //   if (response.status == 'success') {
-            //     This.bkid = response.data
-             //   This.book.bookingId = This.bkid
-            //     This.data.setbookingData(This.book);
+            This.myservice.load_post(bdata, 'book_cab').subscribe(response => {
+              if (response.status == 'success') {
+                This.bkid = response.data
+                This.book.bookingId = This.bkid
+                This.data.setbookingData(This.book);
                 This.checkResp();
-            //   }
-            //   else {
-            //     This.myservice.show_alert('Failed', 'Please try again')
-            //     This.navCtrl.pop()
-            //   }
-            // })
+                This.temp = true
+              }
+              else {
+                This.myservice.show_alert('Failed', 'Please try again')
+                This.navCtrl.pop()
+              }
+            })
 
           }
         }
@@ -129,7 +130,7 @@ export class RidedetailPage {
 
   showAlert() {
     let alert = this.alertCtrl.create({
-      title: 'No drivers found',
+      title: 'No drivers are available',
       message: 'Please search again.',
       buttons: [
         {
@@ -149,7 +150,7 @@ export class RidedetailPage {
             this.findDrivers()
             var This = this;
             setTimeout(() => {
-              This.myservice.load_post({ taxiType: This.book.carDetails.car_type, type: 'now', driversid: This.drivers }, 'driverPush').subscribe(data => {
+              This.myservice.load_post({ taxiType: This.book.carDetails.car_type, driversid: This.drivers, bookid: This.bkid }, 'driverPush').subscribe(data => {
                 if (data.status == 'success')
                   This.checkResp();
               })