Commit 78746068 by Alen Jose

Merge branch 'alen' into 'master'

latlng db See merge request alen/CMC_revamp!14
parents cc157949 c554e3dc
...@@ -27,7 +27,7 @@ export class ConfirmridePage { ...@@ -27,7 +27,7 @@ export class ConfirmridePage {
this.book = this.data.getbookingData() this.book = this.data.getbookingData()
console.log(this.book) console.log(this.book)
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': 'later', 'drivers': [], 'discount': this.book.discount ? this.book.discount : 0 } 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': 'later', '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}
this.myservice.load_post(bdata, 'book_cab').subscribe(response => { this.myservice.load_post(bdata, 'book_cab').subscribe(response => {
this.myservice.hide_loader() this.myservice.hide_loader()
......
...@@ -101,7 +101,7 @@ export class RidedetailPage { ...@@ -101,7 +101,7 @@ export class RidedetailPage {
This.myservice.show_alert('', 'No drivers found') This.myservice.show_alert('', 'No drivers found')
} }
else { 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 } 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;
......
...@@ -19,6 +19,8 @@ export class RidepopPage { ...@@ -19,6 +19,8 @@ export class RidepopPage {
} }
ionViewDidEnter() { ionViewDidEnter() {
this.locData = this.data.getbookingData()
console.log(this.locData)
this.myservice.show_loader() this.myservice.show_loader()
this.myservice.load_post({},'getCabDetails').subscribe(response=>{ this.myservice.load_post({},'getCabDetails').subscribe(response=>{
this.myservice.hide_loader() this.myservice.hide_loader()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment