Skip to content

C
Callmycab-Userapp
Commit 2d3345f3 by Alen Jose
Options

aug-1

parent 0b4bb86a
Showing with 295 additions and 105 deletions
src/app/app.component.ts
import { Component, ViewChild } from '@angular/core'; import { Component, ViewChild } from '@angular/core';
import { Nav, Platform, Events, AlertController } from 'ionic-angular'; import { Nav, Platform, Events, AlertController, PopoverController } from 'ionic-angular';
import { StatusBar } from '@ionic-native/status-bar'; import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen'; import { SplashScreen } from '@ionic-native/splash-screen';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
...@@ -24,7 +24,7 @@ export class MyApp { ...@@ -24,7 +24,7 @@ export class MyApp {
quit: string quit: string
cancel: string cancel: string
constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen, public storage: Storage, public events: Events, private myservice: Myservice, private locationAccuracy: LocationAccuracy, private network: Network, public alertCtrl: AlertController, private oneSignal: OneSignal, private translate: TranslateService) { constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen, public storage: Storage, public events: Events, private myservice: Myservice, private locationAccuracy: LocationAccuracy, private network: Network, public alertCtrl: AlertController, private oneSignal: OneSignal, private translate: TranslateService, public popoverCtrl: PopoverController) {
this.initializeApp(); this.initializeApp();
} }
...@@ -132,11 +132,11 @@ export class MyApp { ...@@ -132,11 +132,11 @@ export class MyApp {
if (data) { if (data) {
this.translate.use(data); this.translate.use(data);
this.lang = data; this.lang = data;
this.lang_trans()
} }
else { else {
this.translate.setDefaultLang('en'); this.translate.setDefaultLang('en');
} }
this.lang_trans()
}) })
} }
...@@ -148,4 +148,9 @@ export class MyApp { ...@@ -148,4 +148,9 @@ export class MyApp {
this.cancel = value["sidemenu.Cancel"] this.cancel = value["sidemenu.Cancel"]
}) })
} }
presentPopover() {
let popover = this.popoverCtrl.create('PopoverPage');
popover.present();
}
} }
\ No newline at end of file
src/app/app.html
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<li menuClose class="trip" (click)="open_page('MytripsPage')">{{'sidemenu.My Trips'|translate}}</li> <li menuClose class="trip" (click)="open_page('MytripsPage')">{{'sidemenu.My Trips'|translate}}</li>
<!-- <li menuClose class="settings" (click)="open_page('SettingsPage')">Settings</li> --> <!-- <li menuClose class="settings" (click)="open_page('SettingsPage')">Settings</li> -->
<li menuClose class="logout" (click)="open_page('LandingPage')">{{'sidemenu.Logout'|translate}}</li> <li menuClose class="logout" (click)="open_page('LandingPage')">{{'sidemenu.Logout'|translate}}</li>
<li menuClose class="langtr" (click)="presentPopover()">{{'sidemenu.Language'|translate}}</li>
</ul> </ul>
</div> </div>
</div> </div>
......
src/app/app.scss
...@@ -24,4 +24,5 @@ ...@@ -24,4 +24,5 @@
.cab_sidemenu_list ul .offer{background: url("../assets/img/offer.png");} .cab_sidemenu_list ul .offer{background: url("../assets/img/offer.png");}
.cab_sidemenu_list ul .settings{background: url("../assets/img/settings.png");} .cab_sidemenu_list ul .settings{background: url("../assets/img/settings.png");}
.cab_sidemenu_list ul .logout{background: url("../assets/img/logout.png");} .cab_sidemenu_list ul .logout{background: url("../assets/img/logout.png");}
.cab_sidemenu_list ul .langtr{background: url("../assets/img/menu6.png");}
// @import "../assets/css/essential.scss"; // @import "../assets/css/essential.scss";
src/assets/i18n/en.json
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
"Network Error": "Network Error", "Network Error": "Network Error",
"No Internet Connection": "No Internet Connection", "No Internet Connection": "No Internet Connection",
"Quit": "Quit", "Quit": "Quit",
"Cancel": "Cancel" "Cancel": "Cancel",
"Language":"Language"
}, },
"forgot": { "forgot": {
"Forgot Password": "Forgot Password", "Forgot Password": "Forgot Password",
...@@ -122,66 +123,105 @@ ...@@ -122,66 +123,105 @@
"Ride time Rate": "Ride time Rate", "Ride time Rate": "Ride time Rate",
"OKAY": "OKAY" "OKAY": "OKAY"
}, },
"coupon" : { "coupon": {
"Add Coupons":"Add Coupons", "Add Coupons": "Add Coupons",
"Enter Coupon Code" : "Enter Coupon Code", "Enter Coupon Code": "Enter Coupon Code",
"Apply":"Apply", "Apply": "Apply",
"Payment Details":"Payment Details", "Payment Details": "Payment Details",
"Total":"Total", "Total": "Total",
"Discount":"Discount", "Discount": "Discount",
"Due after service":"Due after service", "Due after service": "Due after service",
"CONTINUE":"CONTINUE", "CONTINUE": "CONTINUE",
"CANCEL" :"CANCEL", "CANCEL": "CANCEL",
"Promocode Expired":"Promocode Expired", "Promocode Expired": "Promocode Expired",
"Invalid Promocode":"Invalid Promocode", "Invalid Promocode": "Invalid Promocode",
"Secret key miss match":"Secret key miss match" "Secret key miss match": "Secret key miss match"
}, },
"confirm" : { "confirm": {
"Success":"Success", "Success": "Success",
"Your booking has been confirmed on" : "Your booking has been confirmed on", "Your booking has been confirmed on": "Your booking has been confirmed on",
"OKAY" : "OKAY" "OKAY": "OKAY"
}, },
"ride" : { "ride": {
"Quickride Details":"Quickride Details", "Quickride Details": "Quickride Details",
"From":"From", "From": "From",
"To":"To", "To": "To",
"Track Driver" : "Track Driver", "Track Driver": "Track Driver",
"Searching for driver" : "Searching for driver", "Searching for driver": "Searching for driver",
"No drivers found" : "No drivers found", "No drivers found": "No drivers found",
"No drivers are available" : "No drivers are available", "No drivers are available": "No drivers are available",
"Please search again" : "Please search again", "Please search again": "Please search again",
"Cancel" : "Cancel", "Cancel": "Cancel",
"Search" : "Search", "Search": "Search",
"Please try again!" : "Please try again!", "Please try again!": "Please try again!",
"Secret key miss match" : "Secret key miss match", "Secret key miss match": "Secret key miss match",
"Ratings":"Ratings", "Ratings": "Ratings",
"Something went wrong please try again" : "Something went wrong please try again." "Something went wrong please try again": "Something went wrong please try again."
}, },
"map":{ "map": {
"Map" : "Map", "Map": "Map",
"From" : "From", "From": "From",
"To" : "To", "To": "To",
"Cancel" : "Cancel" "Cancel": "Cancel"
}, },
"rating":{ "rating": {
"Rate now" : "Rate now", "Rate now": "Rate now",
"Give your rating" : "Give your rating", "Give your rating": "Give your rating",
"Submit" : "Submit", "Submit": "Submit",
"Later" : "Later", "Later": "Later",
"Please try again!" : "Please try again!", "Please try again!": "Please try again!",
"Secret key miss match" : "Secret key miss match" "Secret key miss match": "Secret key miss match"
}, },
"ridesummary":{ "ridesummary": {
"Quickride Details" : "Quickride Details", "Quickride Details": "Quickride Details",
"From" : "From", "From": "From",
"To" : "To", "To": "To",
"Ratings" : "Ratings", "Ratings": "Ratings",
"Total" : "Total", "Total": "Total",
"km" : "km", "km": "km",
"Discount" : "Discount", "Discount": "Discount",
"Total Price" : "Total Price", "Total Price": "Total Price",
"Close" : "Close", "Close": "Close",
"Please try again!" : "Please try again!", "Please try again!": "Please try again!",
"Secret key miss match" : "Secret key miss match" "Secret key miss match": "Secret key miss match"
},
"payment": {
"Payment Details": "Payment Details",
"Pickup Point": "Pickup Point",
"Drop Point": "Drop Point",
"Total": "Total",
"Discount": "Discount",
"Due after service": "Due after service",
"OKAY": "OKAY",
"Please try again!": "Please try again!",
"Secret key miss match": "Secret key miss match"
},
"mytrips": {
"My Trips": "My Trips",
"Rides": "Rides",
"Upcoming": "Upcoming",
"Completed": "Completed",
"from": "from",
"to": "to",
"Please try again": "Please try again"
},
"trip": {
"Trips Details": "Trips Details",
"Pickup Point": "Pickup Point",
"Drop Point": "Drop Point",
"CAB DETAILS": "CAB DETAILS",
"DRIVER DETAILS": "DRIVER DETAILS",
"Call Now": "Call Now",
"PAYMENT DETAILS": "PAYMENT DETAILS",
"Amount Charged": "Amount Charged",
"Discount Amount": "Discount Amount",
"Amount Payable": "Amount Payable",
"Kindly Rate us for our service.": "Kindly Rate us for our service.",
"Your rating is important for our better service.": "Your ratting is important for our better service.",
"CANCEL RIDE": "CANCEL RIDE",
"Please try again!": "Please try again!",
"Secret key miss match": "Secret key miss match",
"Success": "Success",
"Successfully cancelled the ride": "Successfully cancelled the ride"
} }
} }
\ No newline at end of file
src/pages/landing/landing.ts
...@@ -30,9 +30,7 @@ export class LandingPage { ...@@ -30,9 +30,7 @@ export class LandingPage {
this.lang = lang; this.lang = lang;
} }
else { else {
this.translate.use('en').subscribe(resp=>{ this.translate.use('en')
console.log(resp)
})
} }
}) })
} }
......
src/pages/mytrips/mytrips.module.ts
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular'; import { IonicPageModule } from 'ionic-angular';
import { MytripsPage } from './mytrips'; import { MytripsPage } from './mytrips';
import { TranslateModule } from "@ngx-translate/core";
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -8,6 +9,7 @@ import { MytripsPage } from './mytrips'; ...@@ -8,6 +9,7 @@ import { MytripsPage } from './mytrips';
], ],
imports: [ imports: [
IonicPageModule.forChild(MytripsPage), IonicPageModule.forChild(MytripsPage),
TranslateModule
], ],
}) })
export class MytripsPageModule {} export class MytripsPageModule {}
src/pages/mytrips/mytrips.ts
...@@ -3,6 +3,7 @@ import { IonicPage, NavController, NavParams,Content,Slides } from 'ionic-angula ...@@ -3,6 +3,7 @@ import { IonicPage, NavController, NavParams,Content,Slides } from 'ionic-angula
import { Myservice } from "../../providers/myservice"; import { Myservice } from "../../providers/myservice";
import { Storage } from "@ionic/storage"; import { Storage } from "@ionic/storage";
import { user } from "../../models/mymodel"; import { user } from "../../models/mymodel";
import { TranslateService } from "@ngx-translate/core";
@IonicPage() @IonicPage()
@Component({ @Component({
...@@ -20,11 +21,12 @@ export class MytripsPage { ...@@ -20,11 +21,12 @@ export class MytripsPage {
upTrips:any; upTrips:any;
compTrips:any; compTrips:any;
trips:any; trips:any;
lang: string = 'en';
@ViewChild(Content) content: Content; @ViewChild(Content) content: Content;
@ViewChild('mySlider') slider: Slides; @ViewChild('mySlider') slider: Slides;
constructor(public navCtrl: NavController, public navParams: NavParams, private myservice: Myservice, private storage: Storage) { constructor(public navCtrl: NavController, public navParams: NavParams, private myservice: Myservice, private storage: Storage, private translate: TranslateService) {
let id = 0; let id = 0;
this.slidertab = id; this.slidertab = id;
...@@ -36,6 +38,16 @@ export class MytripsPage { ...@@ -36,6 +38,16 @@ export class MytripsPage {
} }
ionViewDidEnter() { ionViewDidEnter() {
this.storage.get('lang').then(lang => {
if (lang != null) {
this.translate.use(lang)
this.lang = lang;
}
else {
this.translate.use('en')
}
})
this.storage.get('user_data').then(data => { this.storage.get('user_data').then(data => {
if (data) { if (data) {
this.local = data; this.local = data;
...@@ -46,7 +58,9 @@ export class MytripsPage { ...@@ -46,7 +58,9 @@ export class MytripsPage {
console.log(this.trips) console.log(this.trips)
} }
else { else {
this.myservice.show_alert('Failed', 'Please try again') this.translate.get(['mytrips.Please try again']).subscribe(value => {
this.myservice.show_alert('', value['mytrips.Please try again'])
})
} }
}) })
......
src/pages/payment/payment.html
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
<button ion-button class="nav_btn theme_color floatLeft"(click)="dismiss()"> <button ion-button class="nav_btn theme_color floatLeft"(click)="dismiss()">
<ion-icon name="ios-arrow-back"></ion-icon> <ion-icon name="ios-arrow-back"></ion-icon>
</button> </button>
<div class="nav_header_title floatLeft">Payment Details</div> <div class="nav_header_title floatLeft">{{'payment.Payment Details'|translate}}</div>
<div class="clear"></div> <div class="clear"></div>
</ion-header> </ion-header>
<ion-content padding class="cab_coupon_bg"> <ion-content padding class="cab_coupon_bg">
<div class="cab_trip_detail_wrapper"> <div class="cab_trip_detail_wrapper">
<h4 class="text_white">Pickup Point</h4> <h4 class="text_white">{{'payment.Pickup Point'|translate}}</h4>
<p class="floatLeft textLeft width50">{{loc?.from}}</p> <p class="floatLeft textLeft width50">{{loc?.from}}</p>
<!-- <p class="floatRight textRight width50">11 :23 am, 02-08-2017</p> --> <!-- <p class="floatRight textRight width50">11 :23 am, 02-08-2017</p> -->
<div class="clear"></div> <div class="clear"></div>
<br> <br>
<h4 class="text_white">Drop Point</h4> <h4 class="text_white">{{'payment.Drop Point'|translate}}</h4>
<p class="floatLeft textLeft width50">{{loc?.to}}</p> <p class="floatLeft textLeft width50">{{loc?.to}}</p>
<!-- <p class="floatRight textRight width50">12 :00 am, 02-08-2017</p> --> <!-- <p class="floatRight textRight width50">12 :00 am, 02-08-2017</p> -->
<div class="clear"></div> <div class="clear"></div>
...@@ -20,19 +20,19 @@ ...@@ -20,19 +20,19 @@
<br> <br>
</div> </div>
<div class="cab_coupon_content"> <div class="cab_coupon_content">
<p style="padding-top: 0px;margin-top: 0px;margin-bottom: 0px;">Payment Details</p> <p style="padding-top: 0px;margin-top: 0px;margin-bottom: 0px;">{{'payment.Payment Details'|translate}}</p>
<li> <li>
<div class="child textLeft">Total</div> <div class="child textLeft">{{'payment.Total'|translate}}</div>
<div class="child textRight">Rs. {{ride?.amount}}</div> <div class="child textRight">Rs. {{ride?.amount}}</div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li> <li>
<div class="child textLeft">Discount</div> <div class="child textLeft">{{'payment.Discount'|translate}}</div>
<div class="child textRight">Rs. {{ride?.discount}}</div> <div class="child textRight">Rs. {{ride?.discount}}</div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li> <li>
<div class="child textLeft">Due after service</div> <div class="child textLeft">{{'payment.Due after service'|translate}}</div>
<div class="child textRight">Rs. {{ride?.amount - ride?.discount}}</div> <div class="child textRight">Rs. {{ride?.amount - ride?.discount}}</div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
</ion-content> </ion-content>
<ion-footer> <ion-footer>
<div class="theme_bgcolor p10 text_white"> <div class="theme_bgcolor p10 text_white">
<p class="floatLeft text_size_18">Total</p> <p class="floatLeft text_size_18">{{'payment.Total'|translate}}</p>
<p class="floatRight text_size_18">Rs. {{ride?.amount - ride?.discount}}</p> <p class="floatRight text_size_18">Rs. {{ride?.amount - ride?.discount}}</p>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<button ion-button class="cab_footer_btn width100 text_white" (click)="close()">OKAY</button> <button ion-button class="cab_footer_btn width100 text_white" (click)="close()">{{'payment.OKAY'|translate}}</button>
</ion-footer> </ion-footer>
src/pages/payment/payment.module.ts
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular'; import { IonicPageModule } from 'ionic-angular';
import { PaymentPage } from './payment'; import { PaymentPage } from './payment';
import { TranslateModule } from "@ngx-translate/core";
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -8,6 +9,7 @@ import { PaymentPage } from './payment'; ...@@ -8,6 +9,7 @@ import { PaymentPage } from './payment';
], ],
imports: [ imports: [
IonicPageModule.forChild(PaymentPage), IonicPageModule.forChild(PaymentPage),
TranslateModule
], ],
}) })
export class PaymentPageModule {} export class PaymentPageModule {}
src/pages/payment/payment.ts
...@@ -5,6 +5,7 @@ import { Myservice } from "../../providers/myservice"; ...@@ -5,6 +5,7 @@ import { Myservice } from "../../providers/myservice";
import { Storage } from "@ionic/storage"; import { Storage } from "@ionic/storage";
import { user } from "../../models/mymodel"; import { user } from "../../models/mymodel";
import * as firebase from 'firebase'; import * as firebase from 'firebase';
import { TranslateService } from "@ngx-translate/core";
declare var google; declare var google;
...@@ -22,11 +23,22 @@ export class PaymentPage { ...@@ -22,11 +23,22 @@ export class PaymentPage {
public unregisterBackButtonAction: any; public unregisterBackButtonAction: any;
driver: any; driver: any;
ride: any; ride: any;
lang: string = 'en';
constructor(public navCtrl: NavController, public navParams: NavParams, private data: dataService, private zone: NgZone, private myservice: Myservice, private storage: Storage, public platform: Platform) { constructor(public navCtrl: NavController, public navParams: NavParams, private data: dataService, private zone: NgZone, private myservice: Myservice, private storage: Storage, public platform: Platform, private translate: TranslateService) {
} }
ionViewDidEnter() { ionViewDidEnter() {
this.storage.get('lang').then(lang => {
if (lang != null) {
this.translate.use(lang)
this.lang = lang;
}
else {
this.translate.use('en')
}
})
this.myservice.hide_loader(); this.myservice.hide_loader();
this.initializeBackButtonCustomHandler(); this.initializeBackButtonCustomHandler();
this.storage.get('user_data').then(data => { this.storage.get('user_data').then(data => {
...@@ -91,7 +103,9 @@ export class PaymentPage { ...@@ -91,7 +103,9 @@ export class PaymentPage {
console.log(this.loc) console.log(this.loc)
} }
else{ else{
this.myservice.show_alert('',resp.message) this.translate.get(['payment.' + resp.message]).subscribe(value => {
this.myservice.show_alert('', value['payment.' + resp.message])
})
} }
}) })
}) })
......
src/pages/popover/popover.html 0 → 100644
<ion-content>
<!-- [ngClass]="lang=='ar' ? 'ar' : ''" -->
<div class="popover_wrapper">
<ul>
<li id={{lang.code}} *ngFor="let lang of languages" (click)="changeLang(lang.code)">{{lang.name}}</li>
</ul>
</div>
</ion-content>
\ No newline at end of file
src/pages/popover/popover.module.ts 0 → 100644
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { PopoverPage } from './popover';
import { TranslateModule } from "@ngx-translate/core";
@NgModule({
declarations: [
PopoverPage,
],
imports: [
IonicPageModule.forChild(PopoverPage),
TranslateModule,
],
})
export class PopoverPageModule {}
src/pages/popover/popover.scss 0 → 100644
page-popover {
.popover_wrapper{
ul{
padding:0px;
margin:0px;
li{
width: 100%;
list-style: none;
padding: 10px;
font-size:18px;
color: #797979;
&:hover{
background:#91195b;
color: #fff;
}
}
}
}
}
src/pages/popover/popover.ts 0 → 100644
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams, ViewController, ModalController, Events } from 'ionic-angular';
import { Storage } from '@ionic/storage'
import { Myservice } from '../../providers/myservice'
import { TranslateService } from '@ngx-translate/core';
@IonicPage()
@Component({
selector: 'page-popover',
templateUrl: 'popover.html',
})
export class PopoverPage {
languages = [{ 'name': 'English', 'code': 'en' }]//code will be same as filename ol lang
lang: string = 'en';
constructor(public navCtrl: NavController, public navParams: NavParams, public viewCtrl: ViewController, public modalCtrl: ModalController, public storage: Storage, public events: Events, private myservice: Myservice, private translate: TranslateService) {
}
ionViewDidEnter() {
this.storage.get('lang').then(lang => {
if (lang) {
this.lang = lang
document.getElementById(lang).style.background = '#91195b';
document.getElementById(lang).style.color = '#fff';
}
})
}
changeLang(lang) {
this.myservice.show_loader()
this.storage.set('lang', lang);
var This = this;
setTimeout(function () {
This.events.publish('patient:lang', lang);
This.myservice.hide_loader()
This.close();
}, 500)
}
close() {
this.viewCtrl.dismiss();
}
}
src/pages/tripdetails/tripdetails.html
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
<button ion-button class="nav_btn theme_color floatLeft" (click)="back()"> <button ion-button class="nav_btn theme_color floatLeft" (click)="back()">
<ion-icon name="ios-arrow-back"></ion-icon> <ion-icon name="ios-arrow-back"></ion-icon>
</button> </button>
<div class="nav_header_title floatLeft">Trips Details</div> <div class="nav_header_title floatLeft">{{'trip.Trips Details'|translate}}</div>
<button class="nav_btn floatRight"></button> <button class="nav_btn floatRight"></button>
<div class="clear"></div> <div class="clear"></div>
</ion-header> </ion-header>
<ion-content class="cab_dark_bg" padding> <ion-content class="cab_dark_bg" padding>
<div class="cab_trip_detail_wrapper"> <div class="cab_trip_detail_wrapper">
<h4>Pickup Point</h4> <h4>{{'trip.Pickup Point'|translate}}</h4>
<p class="floatLeft textLeft width50">{{details.pickup_area}}</p> <p class="floatLeft textLeft width50">{{details.pickup_area}}</p>
<p class="floatRight textRight width50">{{details.pickup_time}}, {{details.pickup_date}}</p> <p class="floatRight textRight width50">{{details.pickup_time}}, {{details.pickup_date}}</p>
<div class="clear"></div> <div class="clear"></div>
<br> <br>
<h4>Drop Point</h4> <h4>{{'trip.Drop Point'|translate}}</h4>
<p class="floatLeft textLeft width50">{{details.drop_area}}</p> <p class="floatLeft textLeft width50">{{details.drop_area}}</p>
<p class="floatRight textRight width50" *ngIf="details.drop_time">{{details.drop_time}}, {{details.drop_date}}</p> <p class="floatRight textRight width50" *ngIf="details.drop_time">{{details.drop_time}}, {{details.drop_date}}</p>
<div class="clear"></div> <div class="clear"></div>
...@@ -23,16 +23,16 @@ ...@@ -23,16 +23,16 @@
<ion-grid class="p0" *ngIf="details.assigned_for"> <ion-grid class="p0" *ngIf="details.assigned_for">
<ion-row> <ion-row>
<ion-col col-6 class="p0"> <ion-col col-6 class="p0">
<h4>CAB DETAILS</h4> <h4>{{'trip.CAB DETAILS'|translate}}</h4>
<p>{{details.taxi_type}}</p> <p>{{details.taxi_type}}</p>
<!-- <p>Ford Fiesta</p> --> <!-- <p>Ford Fiesta</p> -->
<p>{{details.car_no}}</p> <p>{{details.car_no}}</p>
</ion-col> </ion-col>
<ion-col col-6 class="p0"> <ion-col col-6 class="p0">
<h4>DRIVER DETAILS</h4> <h4>{{'trip.DRIVER DETAILS'|translate}}</h4>
<p>{{details.name}}</p> <p>{{details.name}}</p>
<p>{{details.phone}}</p> <p>{{details.phone}}</p>
<p><strong (click)="call()">Call Now</strong></p> <p><strong (click)="call()">{{'trip.Call Now'|translate}}</strong></p>
</ion-col> </ion-col>
</ion-row> </ion-row>
</ion-grid> </ion-grid>
...@@ -40,22 +40,22 @@ ...@@ -40,22 +40,22 @@
<br> <br>
<hr *ngIf="details.item_status=='Complete'"> <hr *ngIf="details.item_status=='Complete'">
<span *ngIf="details.item_status=='Complete'"> <span *ngIf="details.item_status=='Complete'">
<h4>PAYMENT DETAILS</h4> <h4>{{'trip.PAYMENT DETAILS'|translate}}</h4>
<p class="floatLeft textLeft">Amount Charged</p> <p class="floatLeft textLeft">{{'trip.Amount Charged'|translate}}</p>
<p class="floatRight textRight">Rs {{details.amount}}</p> <p class="floatRight textRight">Rs {{details.amount}}</p>
<div class="clear"></div> <div class="clear"></div>
<p class="floatLeft textLeft">Discount Amount</p> <p class="floatLeft textLeft">{{'trip.Discount Amount'|translate}}</p>
<p class="floatRight textRight">Rs {{details.discount}}</p> <p class="floatRight textRight">Rs {{details.discount}}</p>
<div class="clear"></div> <div class="clear"></div>
<p class="floatLeft textLeft">Amount Payable</p> <p class="floatLeft textLeft">{{'trip.Amount Payable'|translate}}</p>
<p class="floatRight textRight"><strong>Rs {{details.amount - details.discount}}</strong></p> <p class="floatRight textRight"><strong>Rs {{details.amount - details.discount}}</strong></p>
<div class="clear"></div> <div class="clear"></div>
</span> </span>
<br> <br>
<br> <br>
<span *ngIf="details.status=='Complete' && !details.rating"> <span *ngIf="details.status=='Complete' && !details.rating">
<h4 class="textCenter">Kindly Rate us for our service.</h4> <h4 class="textCenter">{{'trip.Kindly Rate us for our service.'|translate}}</h4>
<p class="textCenter">Your ratting is important for our better service.</p> <p class="textCenter">{{'trip.Your rating is important for our better service.'|translate}}</p>
<div class="cab_ratting" (click)="rating($event)"> <div class="cab_ratting" (click)="rating($event)">
<input type="radio" id="star5" name="rating" value="5" /><label for="star5" title="Rocks!">5 stars</label> <input type="radio" id="star5" name="rating" value="5" /><label for="star5" title="Rocks!">5 stars</label>
<input type="radio" id="star4" name="rating" value="4" /><label for="star4" title="Pretty good">4 stars</label> <input type="radio" id="star4" name="rating" value="4" /><label for="star4" title="Pretty good">4 stars</label>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</ion-content> </ion-content>
<ion-footer *ngIf="details.status!='Complete' && details.status!='Started' && details.status!='Cancelled'"> <ion-footer *ngIf="details.status!='Complete' && details.status!='Started' && details.status!='Cancelled'">
<div class="cab_footer_btn_bay"> <div class="cab_footer_btn_bay">
<button ion-button class="cab_footer_btn single_btn" (click)="cancel()">CANCEL RIDE</button> <button ion-button class="cab_footer_btn single_btn" (click)="cancel()">{{'trip.CANCEL RIDE'|translate}}</button>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</ion-footer> </ion-footer>
src/pages/tripdetails/tripdetails.module.ts
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular'; import { IonicPageModule } from 'ionic-angular';
import { TripdetailsPage } from './tripdetails'; import { TripdetailsPage } from './tripdetails';
import { TranslateModule } from "@ngx-translate/core";
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -8,6 +9,7 @@ import { TripdetailsPage } from './tripdetails'; ...@@ -8,6 +9,7 @@ import { TripdetailsPage } from './tripdetails';
], ],
imports: [ imports: [
IonicPageModule.forChild(TripdetailsPage), IonicPageModule.forChild(TripdetailsPage),
TranslateModule
], ],
}) })
export class TripdetailsPageModule {} export class TripdetailsPageModule {}
src/pages/tripdetails/tripdetails.ts
...@@ -5,6 +5,7 @@ import { Storage } from "@ionic/storage"; ...@@ -5,6 +5,7 @@ import { Storage } from "@ionic/storage";
import { user } from "../../models/mymodel"; import { user } from "../../models/mymodel";
import { Toast } from "@ionic-native/toast"; import { Toast } from "@ionic-native/toast";
import { CallNumber } from '@ionic-native/call-number'; import { CallNumber } from '@ionic-native/call-number';
import { TranslateService } from "@ngx-translate/core";
@IonicPage() @IonicPage()
@Component({ @Component({
...@@ -14,11 +15,22 @@ import { CallNumber } from '@ionic-native/call-number'; ...@@ -14,11 +15,22 @@ import { CallNumber } from '@ionic-native/call-number';
export class TripdetailsPage { export class TripdetailsPage {
details = this.navParams.get('data') details = this.navParams.get('data')
local:user local:user
lang: string = 'en';
constructor(public navCtrl: NavController, public navParams: NavParams, private myservice: Myservice, private storage: Storage, private toast: Toast, private callNumber: CallNumber) { constructor(public navCtrl: NavController, public navParams: NavParams, private myservice: Myservice, private storage: Storage, private toast: Toast, private callNumber: CallNumber, private translate: TranslateService) {
} }
ionViewDidEnter() { ionViewDidEnter() {
this.storage.get('lang').then(lang => {
if (lang != null) {
this.translate.use(lang)
this.lang = lang;
}
else {
this.translate.use('en')
}
})
this.storage.get('user_data').then(data=>{ this.storage.get('user_data').then(data=>{
if(data){ if(data){
this.local = data this.local = data
...@@ -39,13 +51,18 @@ export class TripdetailsPage { ...@@ -39,13 +51,18 @@ export class TripdetailsPage {
this.myservice.hide_loader() this.myservice.hide_loader()
if(response.status=='success'){ if(response.status=='success'){
this.details.rating = Number(event.srcElement.value) this.details.rating = Number(event.srcElement.value)
this.toast.show(response.message, '2000', 'center').subscribe(
toast => { this.translate.get(['trip.' + response.message]).subscribe(value => {
console.log(toast); this.toast.show(value['mytrips.' + response.message], '2000', 'center').subscribe(
}); toast => {
console.log(toast);
});
})
} }
else{ else{
this.myservice.show_alert('',response.message) this.translate.get(['trip.' + response.message]).subscribe(value => {
this.myservice.show_alert('', value['trip.' + response.message])
})
} }
}) })
} }
...@@ -63,13 +80,17 @@ export class TripdetailsPage { ...@@ -63,13 +80,17 @@ export class TripdetailsPage {
this.myservice.hide_loader() this.myservice.hide_loader()
if(response.status == 'success'){ if(response.status == 'success'){
this.details.status = 'Cancelled' this.details.status = 'Cancelled'
this.toast.show(response.message, '2000', 'center').subscribe( this.translate.get(['trip.' + response.message]).subscribe(value => {
toast => { this.toast.show(value['mytrips.' + response.message], '2000', 'center').subscribe(
console.log(toast); toast => {
}); console.log(toast);
});
})
} }
else{ else{
this.myservice.show_alert('',response.message) this.translate.get(['trip.' + response.message]).subscribe(value => {
this.myservice.show_alert('', value['trip.' + response.message])
})
} }
}) })
} }
......
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