From d28df32ade2f69cb6a68b7833d093f7ae9f0b6e2 Mon Sep 17 00:00:00 2001
From: anju <anju@techware.in>
Date: Tue, 28 May 2019 16:01:43 +0530
Subject: [PATCH] newupdate
---
src/pages/service/service.html | 2 +-
src/pages/service/service.ts | 6 +++---
src/pages/success/success.html | 2 +-
src/providers/common/common.ts | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/pages/service/service.html b/src/pages/service/service.html
index f4763cc..562970c 100644
--- a/src/pages/service/service.html
+++ b/src/pages/service/service.html
@@ -21,7 +21,7 @@
{{'common.Choose_your_booking_time' | translate}}
</h5>
<ion-item>
- <ion-datetime hourValues="{{time_list}}" displayFormat="hh:mm A" [(ngModel)]="myTime" placeholder="{{'common.Pick_time' | translate}}" (ionChange)="check_time()"></ion-datetime>
+ <ion-datetime hourValues="{{time_list}}" displayFormat="hh:mm" [(ngModel)]="myTime" placeholder="{{'common.Pick_time' | translate}}" (ionChange)="check_time()"></ion-datetime>
</ion-item>
<br>
<div class="service_list">
diff --git a/src/pages/service/service.ts b/src/pages/service/service.ts
index 4a52aaa..f328ff0 100644
--- a/src/pages/service/service.ts
+++ b/src/pages/service/service.ts
@@ -268,7 +268,7 @@ export class ServicePage {
if(this.user!=null){
var myTime = this.tConvert(this.myTime);
var post_data = {
- "booking_id":"VMig"+this.user.id+this.result.shop.id,
+ "booking_id":"VMIG"+this.user.id+this.result.shop.id,
"user_id":this.user.id,
"shop_id":this.result.shop.id,
"booking_date":this.myDate,
@@ -279,12 +279,12 @@ export class ServicePage {
};
console.log(post_data);
this.service.post_data('booking',post_data).subscribe(data=>{
- console.log(data);
+ console.log('console data'+data);
if(data == '1'){
this.service.presentToast("Sorry, This time is not Available");
return false;
}else{
- this.response = {"booking_date":this.myDate,"booking_time":myTime,"booked_id":data.result};
+ this.response = {"booking_date":this.myDate,"booking_time":myTime,"booked_id":data};
this.navCtrl.push('SuccessPage',{'shop':this.response});
}
diff --git a/src/pages/success/success.html b/src/pages/success/success.html
index acdc4a1..6f23070 100644
--- a/src/pages/success/success.html
+++ b/src/pages/success/success.html
@@ -3,7 +3,7 @@
<ion-icon name="ios-checkmark-circle-outline"></ion-icon>
<h1>{{'common.Success!' | translate}}</h1>
<h5>{{'common.Your_booking_has_been_confirmed' | translate}}</h5>
- <h5>{{'common.Booking_ID_is' | translate}}<strong>{{result.booked_id}}</strong><br> {{'common.on' | translate}} {{result.booking_date}} {{'common.at' | translate}} {{result.booking_time}}
+ <h5>{{'common.Booking_ID_is ' | translate}}<strong> {{result.booked_id}} </strong><br> {{'common.on' | translate}} {{result.booking_date}} {{'common.at' | translate}} {{result.booking_time}}
</h5>
</div>
</ion-content>
diff --git a/src/providers/common/common.ts b/src/providers/common/common.ts
index 5fc7cc3..b2b5dbc 100644
--- a/src/providers/common/common.ts
+++ b/src/providers/common/common.ts
@@ -19,10 +19,10 @@ export class CommonProvider {
public loadingCtrl: LoadingController,
public toastCtrl: ToastController
) {
- this.headers = { 'X-API-KEY': 'mykey' };
- this.site_url = 'http://vmig.kz/vmig/';
+ this.headers = { 'X-API-KEY': 'my_key' };
+ //this.site_url = 'http://vmig.kz/vmig/';
- //this.site_url = 'https://techlabz.in/client/vmig_demo/';//my_key
+ this.site_url = 'https://techlabz.in/client/vmig_demo/';//my_key
this.webservice_url = this.site_url+'admin/index.php/Webservice_App/';
}
--
libgit2 0.27.1