Skip to content

G
getme
Commit 2cbe65ee by Adarsh K
Options

Merge branch 'adarsh' into 'master'

Adarsh See merge request !106
parents 5b3e5c67 d1b4b96b
Showing with 244 additions and 273 deletions
src/app/addaddresss/addaddresss.page.ts
...@@ -19,7 +19,7 @@ export class AddaddresssPage implements OnInit { ...@@ -19,7 +19,7 @@ export class AddaddresssPage implements OnInit {
geoLongitude: number; geoLongitude: number;
geoAccuracy: number; geoAccuracy: number;
geoAddress: string; geoAddress: string;
address: Address = { address: Address = {
addressType: '', addressType: '',
area: '', area: '',
city: '', city: '',
...@@ -49,7 +49,7 @@ export class AddaddresssPage implements OnInit { ...@@ -49,7 +49,7 @@ export class AddaddresssPage implements OnInit {
) { } ) { }
ngOnInit() { ngOnInit() {
} }
goToPage(path, data = null) { goToPage(path, data = null) {
...@@ -71,21 +71,21 @@ export class AddaddresssPage implements OnInit { ...@@ -71,21 +71,21 @@ export class AddaddresssPage implements OnInit {
this.geoAccuracy = pos.coords.accuracy; this.geoAccuracy = pos.coords.accuracy;
this.getGeoencoder(this.geoLatitude, this.geoLongitude); this.getGeoencoder(this.geoLatitude, this.geoLongitude);
}).catch(err => { }).catch(err => {
alert('Error getting location' + JSON.stringify(err)); console.log('Error getting location' + JSON.stringify(err));
}); });
} }
getGeoencoder(latitude, longitude) { getGeoencoder(latitude, longitude) {
console.log('reached'); console.log('reached');
this.nativeGeocoder.reverseGeocode(latitude, longitude, this.geoencoderOptions) this.nativeGeocoder.reverseGeocode(latitude, longitude, this.geoencoderOptions)
.then((result: NativeGeocoderResult[]) => { .then((result: NativeGeocoderResult[]) => {
console.log(result); console.log(result);
this.geoAddress = this.generateAddress(result[0]); this.geoAddress = this.generateAddress(result[0]);
console.log(this.geoAddress); console.log(this.geoAddress);
}) })
.catch((error: any) => { .catch((error: any) => {
alert('Error getting location' + JSON.stringify(error)); console.log('Error getting location' + JSON.stringify(error));
}); });
} }
generateAddress(addressObj) { generateAddress(addressObj) {
...@@ -98,21 +98,21 @@ export class AddaddresssPage implements OnInit { ...@@ -98,21 +98,21 @@ export class AddaddresssPage implements OnInit {
obj.reverse(); obj.reverse();
for (const val in obj) { for (const val in obj) {
if (obj[val].length) { if (obj[val].length) {
address += obj[val] + ', '; address += obj[val] + ', ';
} }
} }
return address.slice(0, -2); return address.slice(0, -2);
} }
onAddrss(form: NgForm) { onAddrss(form: NgForm) {
this.submitted = true; this.submitted = true;
console.log(form.value);
if (form.valid) {
console.log(form.value); console.log(form.value);
this.register.createAddress(form.value); if (form.valid) {
} else { console.log(form.value);
console.log(form.errors); this.register.createAddress(form.value);
} else {
console.log(form.errors);
}
} }
}
} }
src/app/app.component.html
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
<div class="sub_menu"> <div class="sub_menu">
<ul *ngIf="categoryService.activecategories"> <ul *ngIf="categoryService.activecategories">
<ion-menu-toggle> <ion-menu-toggle>
<li *ngFor="let category of categoryService.activecategories" (click)="goToPage('catstorelist', category)"> <li *ngFor="let category of categoryService.activecategories"
(click)="goToPage('catstorelist', category)">
{{ category.catName }} {{ category.catName }}
</li> </li>
</ion-menu-toggle> </ion-menu-toggle>
...@@ -87,8 +88,8 @@ ...@@ -87,8 +88,8 @@
<img src="../assets/basket.png" alt="Product"> <img src="../assets/basket.png" alt="Product">
</div> </div>
<div class="content"> <div class="content">
<h1>Order Placed Successfully</h1> <h1>{{service.popupSub}}</h1>
<p *ngIf="orderId">Order ID {{orderId}} , New Order has been successfully Placed. </p> <p *ngIf="orderId">Order ID {{orderId}}, {{service.popupMsg}}</p>
</div> </div>
<span (click)="istoggle();"><img src="../assets/close.png" alt="Close"></span> <span (click)="istoggle();"><img src="../assets/close.png" alt="Close"></span>
......
src/app/cart/cart.page.html
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<ion-row class="no-gutter"> <ion-row class="no-gutter">
<ion-col class="no-gutter" size="2"> <ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<img src="../assets/arrow_white.png" /> <img src="../assets/arrow_white.png" />
</button> </button>
</ion-col> </ion-col>
<ion-col class="no-gutter" size="8"> <ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
...@@ -86,31 +86,27 @@ ...@@ -86,31 +86,27 @@
<h5> <h5>
<span class="floatLeft">ITEMS</span> <span class="floatLeft">ITEMS</span>
<span class="floatRight" *ngIf="cartService.cartTotal">A$ <span class="floatRight" *ngIf="cartService.cartTotal">A$
{{service.formatNumber(cartService.cartTotal.toFixed(2))}}</span {{service.formatNumber(cartService.cartTotal.toFixed(2))}}</span>
> <div class="clear"></div>
<div class="clear"></div> </h5>
</h5> <ion-grid class="p0" *ngIf="cartService.carts && cartService.carts.length > 0">
<ion-grid <ion-row *ngFor="let carts of cartService.carts">
class="p0" <ion-col size="6" class="p0">
*ngIf="cartService.carts && cartService.carts.length > 0" <h6 class="textLeft">{{unEscape(carts.prodName)}}</h6>
> </ion-col>
<ion-row *ngFor="let carts of cartService.carts"> <ion-col size="2" class="p0">
<ion-col size="6" class="p0"> <h6 class="textRight"><strong>{{carts.qty}} X</strong></h6>
<h6 class="textLeft">{{unEscape(carts.prodName)}}</h6> </ion-col>
</ion-col> <ion-col size="4" class="p0">
<ion-col size="2" class="p0"> <h6 class="textRight">
<h6 class="textRight"><strong>{{carts.qty}} X</strong></h6> <strong>A$ {{service.formatNumber(carts.price)}}</strong>
</ion-col> </h6>
<ion-col size="4" class="p0"> </ion-col>
<h6 class="textRight"> </ion-row>
<strong>A$ {{service.formatNumber(carts.price)}}</strong> </ion-grid>
</h6> <hr />
</ion-col> <h5>
</ion-row> <span class="floatLeft">DELIVERY</span>
</ion-grid>
<hr />
<h5>
<span class="floatLeft">DELIVERY</span>
<span class="floatRight" (click)="istoggle()">CHANGE</span> <span class="floatRight" (click)="istoggle()">CHANGE</span>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
...@@ -118,58 +114,63 @@ ...@@ -118,58 +114,63 @@
<ion-row> <ion-row>
<ion-col class="p0"> <ion-col class="p0">
<h6> <h6>
{{addressService.custAddress.building}},<span *ngIf="addressService.custAddress.landmark && addressService.custAddress.landmark!==''">{{addressService.custAddress.landmark}},</span {{addressService.custAddress.building}}<span
> *ngIf="addressService.custAddress.landmark && addressService.custAddress.landmark!==''">,
<br /> {{addressService.custAddress.landmark}}</span>
{{addressService.custAddress.address}} <!-- <br />
</h6> {{addressService.custAddress.address}} -->
</ion-col> </h6>
</ion-row> </ion-col>
</ion-grid> </ion-row>
<hr /> </ion-grid>
<h5> <hr />
<span class="floatLeft">PAYMENT</span> <h5>
<!-- <span class="floatRight">CHANGE</span> --> <span class="floatLeft">PAYMENT</span>
<div class="clear"></div> <!-- <span class="floatRight">CHANGE</span> -->
</h5> <div class="clear"></div>
<div class="payment_method"> </h5>
<input type="radio" name="payments" id="cod" name="radio-group" checked="true" (click)="getwaycod()" /> <div class="payment_method">
<label for="cod"> <input type="radio" name="payments" id="cod" name="radio-group" checked="true"
<p>Credit Card</p> (click)="getwaycod()" />
</label> <label for="cod">
</div> <p>Credit Card</p>
<div class="payment_method"> </label>
<input type="radio" name="payments" id="paypal" name="radio-group" (click)="getwaypaypal()" /> </div>
<label for="paypal"> <div class="payment_method">
<p>PayPal</p> <input type="radio" name="payments" id="paypal" name="radio-group"
</label> (click)="getwaypaypal()" />
</div> <label for="paypal">
<!-- <div class="card_div" [hidden]="gateway !=1"> <p>PayPal</p>
</label>
</div>
<!-- <div class="card_div" [hidden]="gateway !=1">
<input class="card_no borderNone widthFull" placeholder="PayPal ID" /> <input class="card_no borderNone widthFull" placeholder="PayPal ID" />
</div> --> </div> -->
<div class="payment_method"> <div class="payment_method">
<input type="radio" name="payments" id="afterpay" name="radio-group" (click)="getwayafterpay()" /> <input type="radio" name="payments" id="afterpay" name="radio-group"
<label for="afterpay"> (click)="getwayafterpay()" />
<p>AfterPay</p> <label for="afterpay">
</label> <p>AfterPay</p>
</div> </label>
<!-- <div class="card_div" [hidden]="gateway !=2"> </div>
<!-- <div class="card_div" [hidden]="gateway !=2">
<input class="card_no" placeholder="**** **** **** 1458" /> <input class="card_no" placeholder="**** **** **** 1458" />
<input class="cv_number" placeholder="CVV" /> <input class="cv_number" placeholder="CVV" />
</div> --> </div> -->
<div class="payment_method"> <div class="payment_method">
<input type="radio" name="payments" id="payk" name="radio-group" (click)="getwaypayk()" /> <input type="radio" name="payments" id="payk" name="radio-group"
<label for="payk"> (click)="getwaypayk()" />
<p>PayK</p> <label for="payk">
</label> <p>PayK</p>
</div> </label>
<!-- <div class="card_div" [hidden]="gateway !=3"> </div>
<!-- <div class="card_div" [hidden]="gateway !=3">
<input <input
class="card_no borderNone widthFull" class="card_no borderNone widthFull"
placeholder="PafyK ID" placeholder="PafyK ID"
/> />
</div> --> </div> -->
<!-- <div class="delivery_time"> <!-- <div class="delivery_time">
<ul> <ul>
<li> <li>
Delivery 10 Mnt<br> Delivery 10 Mnt<br>
...@@ -181,202 +182,162 @@ ...@@ -181,202 +182,162 @@
</li> </li>
</ul> </ul>
</div> --> </div> -->
<hr /> <hr />
<div class="coupon_code"> <div class="coupon_code">
<div class="promo-row"> <div class="promo-row">
<input class="" placeholder="COUPON CODE: GET50" #promo /><button class="add_btn apply_btn" (click)="promoApply(promo.value)"> <input class="" placeholder="COUPON CODE: GET50" #promo /><button
APPLY class="add_btn apply_btn" (click)="promoApply(promo.value)">
</button> APPLY
</div> </button>
<span *ngIf="discountApplied == 1" class="promo-success">Promocode applied successfully </div>
</span> <span *ngIf="discountApplied == 1" class="promo-success">Promocode applied successfully
<span *ngIf="discountApplied == 2" class="promo-error">Invalid Promocode</span </span>
> <span *ngIf="discountApplied == 2" class="promo-error">Invalid Promocode</span>
</div> </div>
<br /> <br />
<h6> <h6>
<span class="floatLeft">PRODUCT COST</span> <span class="floatLeft">PRODUCT COST</span>
<span class="floatRight" *ngIf="cartService.cartTotal">A$ <span class="floatRight" *ngIf="cartService.cartTotal">A$
{{service.formatNumber(cartService.cartTotal.toFixed(2))}}</span {{service.formatNumber(cartService.cartTotal.toFixed(2))}}</span>
> <div class="clear"></div>
<div class="clear"></div> </h6>
</h6>
<h6> <h6>
<span class="floatLeft">DELIVERY CHARGE</span> <span class="floatLeft">DELIVERY CHARGE</span>
<span class="floatRight" *ngIf="cartService.cartTotal">A$ <span class="floatRight" *ngIf="cartService.cartTotal">A$
{{service.formatNumber(getDeliveryCharge(cartService.cartTotal))}}</span {{service.formatNumber(getDeliveryCharge(cartService.cartTotal))}}</span>
> <div class="clear"></div>
<div class="clear"></div> </h6>
</h6> <h6>
<h6> <span class="floatLeft">GST/TAX</span>
<span class="floatLeft">GST/TAX</span> <span class="floatRight" *ngIf="cartService.cartTotal">A$
<span class="floatRight" *ngIf="cartService.cartTotal">A$ {{service.formatNumber(getTax(cartService.cartTotal))}}</span>
{{service.formatNumber(getTax(cartService.cartTotal))}}</span <div class="clear"></div>
> </h6>
<div class="clear"></div> <h6 *ngIf="discountApplied">
</h6> <span class="floatLeft">DISCOUNT</span>
<h6 *ngIf="discountApplied"> <span class="floatRight">(-) A$ {{service.formatNumber(discount)}}</span>
<span class="floatLeft">DISCOUNT</span> <div class="clear"></div>
<span class="floatRight">(-) A$ {{service.formatNumber(discount)}}</span </h6>
> <hr />
<div class="clear"></div> <div class="total_div">
</h6> <ion-row>
<hr /> <ion-col>
<div class="total_div"> <p class="textLeft">Total Price:</p>
<ion-row> </ion-col>
<ion-col> <ion-col>
<p class="textLeft">Total Price:</p> <p class="textRight" *ngIf="cartService.cartTotal">
</ion-col> A$
<ion-col> {{service.formatNumber(getTotal(cartService.cartTotal))}}
<p class="textRight" *ngIf="cartService.cartTotal"> </p>
A$ </ion-col>
{{service.formatNumber(getTotal(cartService.cartTotal))}} </ion-row>
</p> </div>
</ion-col> </div>
</ion-row> </ion-slide>
</div> <ion-slide>
</div> <div class="order_placed_div">
</ion-slide> <img src="../assets/[email protected]" />
<ion-slide> <h4>Order Placed</h4>
<div class="order_placed_div"> <p>{{bookDate}}</p>
<img src="../assets/[email protected]" /> <h3>Your order is due for delivery in</h3>
<h4>Order Placed</h4> <h1>{{deliveryTime}}</h1>
<p>{{bookDate}}</p> <button class="view_order" (click)="goToPage('myorder')">
<h3>Your order is due for delivery in</h3> VIEW ORDERS</button><br />
<h1>{{deliveryTime}}</h1> <button class="home_btn" (click)="goToPage('home')">HOME</button>
<button class="view_order" (click)="goToPage('myorder')"> </div>
VIEW ORDERS</button </ion-slide>
><br /> </ion-slides>
<button class="home_btn" (click)="goToPage('home')">HOME</button>
</div> </div>
</ion-slide> </div>
</ion-slides>
</div>
</div> </div>
</div>
</ion-content> </ion-content>
<ion-footer class="hide-on-keyboard-open"> <ion-footer class="hide-on-keyboard-open">
<div <div class="footer_btnbay" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 0">
class="footer_btnbay" <div class="continue" (click)="goToPage('productlist')">
*ngIf="cartService.carts && cartService.carts.length > 0" CONTINUE SHOPPING
[hidden]="currentIndex != 0" </div>
> <div class="checkout" (click)="next(1)">CHECKOUT</div>
<div class="continue" (click)="goToPage('productlist')"> </div>
CONTINUE SHOPPING <div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 1"
(click)="next(2);">
PAY
</div> </div>
<div class="checkout" (click)="next(1)">CHECKOUT</div>
</div>
<div
class="footer_btn"
*ngIf="cartService.carts && cartService.carts.length > 0"
[hidden]="currentIndex != 1"
(click)="next(2);"
>
PAY
</div>
</ion-footer> </ion-footer>
<div class="loader" *ngIf="loader"> <div class="loader" *ngIf="loader">
<div class="lds-ripple"> <div class="lds-ripple">
<div></div> <div></div>
<div></div> <div></div>
</div> </div>
</div> </div>
<div *ngIf="isShow" [@slideInOut]> <div *ngIf="isShow" [@slideInOut]>
<div class="nav_header"> <div class="nav_header">
<ion-grid class="no-gutter"> <ion-grid class="no-gutter">
<ion-row class="no-gutter"> <ion-row class="no-gutter">
<ion-col class="no-gutter" size="2"> <ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="istoggle();"> <button class="nav_btn nav_back floatLeft" (click)="istoggle();">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col> </ion-col>
<ion-col class="no-gutter" size="8"> <ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>CHANGE LOCATION</h4> <h4>CHANGE LOCATION</h4>
</div> </div>
</ion-col> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col> <ion-col class="no-gutter" size="2"></ion-col>
</ion-row> </ion-row>
</ion-grid> </ion-grid>
</div> </div>
<ion-content class="sort_wrappper"> <ion-content class="sort_wrappper">
<agm-map <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false"
[zoom]="20" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
[latitude]="lat" <agm-marker [latitude]="lat" [longitude]="lng" [iconUrl]="
[longitude]="lng"
[disableDefaultUI]="false"
[zoomControl]="false"
[backgroundColor]="'rgba(29, 27, 130,0.2)'"
>
<agm-marker
[latitude]="lat"
[longitude]="lng"
[iconUrl]="
{ {
url: './assets/pin-2.svg', url: './assets/pin-2.svg',
scaledSize: { scaledSize: {
width: 28, width: 28,
height: 40 height: 40
}}" }}"></agm-marker>
></agm-marker> </agm-map>
</agm-map> <div class="add_address_wrapper">
<div class="add_address_wrapper"> <h5>
<h5> <span class="floatLeft">SELECT ADDRESS</span>
<span class="floatLeft">SELECT ADDRESS</span> <span class="floatRight" (click)="istoggle(); goToPage('nearby')">ADD NEW</span>
<span class="floatRight" (click)="istoggle(); goToPage('nearby')">ADD NEW</span <div class="clear"></div>
> </h5>
<div class="clear"></div> <ul *ngIf="addressService.addressList && addressService.addressList.length > 0">
</h5> <li *ngFor="let address of addressService.addressList; let i = index"
<ul [ngClass]="{'no-devlivery': !address.nearest}">
*ngIf="addressService.addressList && addressService.addressList.length > 0" <h4 *ngIf="address.nearest === true">DELIVERS TO</h4>
> <h4 *ngIf="address.nearest === false">DOES NOT DELIVER TO</h4>
<li <div>
*ngFor="let address of addressService.addressList; let i = index" {{address.default}}
[ngClass]="{'no-devlivery': !address.nearest}" <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio"
> (click)="setDefault(address.addressId, i)" [value]="address.addressId" #addressType />
<h4 *ngIf="address.nearest === true">DELIVERS TO</h4> <label for="styled-checkbox-{{i}}"> {{address.addressType}} </label>
<h4 *ngIf="address.nearest === false">DOES NOT DELIVER TO</h4> </div>
<div> <div>
{{address.default}} <p>
<input {{address.building}},
class="styled-checkbox" <span *ngIf="address.landmark && address.landmark!==''">{{address.landmark}},</span>
name="addressId" <!-- {{address.address}} -->
id="styled-checkbox-{{i}}" </p>
type="radio" </div>
(click)="setDefault(address.addressId, i)" <div class="clear"></div>
[value]="address.addressId" </li>
#addressType </ul>
/> <div class="textCenter" *ngIf="addressService.addressList && addressService.addressList.length === 0">
<label for="styled-checkbox-{{i}}"> {{address.addressType}} </label> No Address Found
</div> </div>
<div> </div>
<p> <!-- <div class="loader" *ngIf="loader">
{{address.building}},
<span *ngIf="address.landmark && address.landmark!==''"
>{{address.landmark}},</span
>
<!-- {{address.address}} -->
</p>
</div>
<div class="clear"></div>
</li>
</ul>
<div
class="textCenter"
*ngIf="addressService.addressList && addressService.addressList.length === 0"
>
No Address Found
</div>
</div>
<!-- <div class="loader" *ngIf="loader">
<div class="lds-ripple"> <div class="lds-ripple">
<div></div> <div></div>
<div></div> <div></div>
</div> </div>
</div> --> </div> -->
</ion-content> </ion-content>
</div> </div>
\ No newline at end of file
src/app/cart/cart.page.ts
...@@ -210,6 +210,8 @@ export class CartPage implements OnInit { ...@@ -210,6 +210,8 @@ export class CartPage implements OnInit {
custAddress: this.addressService.custAddress, custAddress: this.addressService.custAddress,
paymentMethod: this.paymentMethod paymentMethod: this.paymentMethod
}; };
this.service.popupMsg = 'New Order has been successfully Placed!';
this.service.popupSub = 'Order Placed Successfully';
const state = this.orderService const state = this.orderService
.checkOut( .checkOut(
this.cartService.carts, this.cartService.carts,
......
src/app/changeaddress/changeaddress.page.ts
...@@ -211,6 +211,8 @@ export class ChangeaddressPage implements OnInit { ...@@ -211,6 +211,8 @@ export class ChangeaddressPage implements OnInit {
status: true status: true
}; };
console.log(postData, orderId); console.log(postData, orderId);
this.service.popupMsg = 'Order address has been changed successfully!';
this.service.popupSub = 'Order Address changed';
This.addressService.changeAddress(postData, orderId); This.addressService.changeAddress(postData, orderId);
val.deliveryAddress = postData; val.deliveryAddress = postData;
This.service.set('order', val); This.service.set('order', val);
......
src/app/nearby/nearby.page.ts
...@@ -92,12 +92,12 @@ export class NearbyPage implements OnInit { ...@@ -92,12 +92,12 @@ export class NearbyPage implements OnInit {
console.log(navigator); console.log(navigator);
/* this.latitude = -33.87276; /* this.latitude = -33.87276;
this.longitude = 151.20534; */ this.longitude = 151.20534; */
this.zoom = 24; this.zoom = 16;
this.getAddress(this.latitude, this.longitude); this.getAddress(this.latitude, this.longitude);
navigator.geolocation.getCurrentPosition(position => { navigator.geolocation.getCurrentPosition(position => {
this.latitude = position.coords.latitude; this.latitude = position.coords.latitude;
this.longitude = position.coords.longitude; this.longitude = position.coords.longitude;
this.zoom = 24; this.zoom = 16;
this.getAddress(this.latitude, this.longitude); this.getAddress(this.latitude, this.longitude);
}); });
} }
...@@ -119,7 +119,7 @@ export class NearbyPage implements OnInit { ...@@ -119,7 +119,7 @@ export class NearbyPage implements OnInit {
console.log(status); console.log(status);
if (status === 'OK') { if (status === 'OK') {
if (results[0]) { if (results[0]) {
this.zoom = 24; this.zoom = 16;
this.address = results[0].formatted_address; this.address = results[0].formatted_address;
console.log(this.address); console.log(this.address);
} else { } else {
...@@ -158,8 +158,8 @@ export class NearbyPage implements OnInit { ...@@ -158,8 +158,8 @@ export class NearbyPage implements OnInit {
this.loader = true; this.loader = true;
console.log(data); console.log(data);
const postData: Address = { const postData: Address = {
address: this.address, address: '',
addressType: '', addressType: data.addressType,
building: this.searchElementRef.nativeElement.value, building: this.searchElementRef.nativeElement.value,
landmark: data.landmark !== undefined ? data.landmark : '', landmark: data.landmark !== undefined ? data.landmark : '',
defaultVal: 0, defaultVal: 0,
......
src/config/service.service.ts
...@@ -9,10 +9,14 @@ import * as firebase from 'firebase'; ...@@ -9,10 +9,14 @@ import * as firebase from 'firebase';
export class ServiceService { export class ServiceService {
state: boolean; state: boolean;
distance: any; distance: any;
popupMsg: any;
popupSub: any;
constructor( constructor(
public storage: Storage, public storage: Storage,
public toastController: ToastController public toastController: ToastController
) { ) {
this.popupMsg = '';
this.popupSub = '';
this.state = true; this.state = true;
this.distance = 10; this.distance = 10;
this.storage.ready().then(() => { this.storage.ready().then(() => {
......
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