Skip to content

G
getme
Commit 7a430c30 by Adarsh K
Options

Merge branch 'adarsh' into 'master'

Adarsh See merge request !96
parents 92f3f93b 0cafe703
Showing with 21 additions and 11 deletions
src/app/changeaddress/changeaddress.page.ts
...@@ -14,6 +14,7 @@ import { ServiceService } from './../../config/service.service'; ...@@ -14,6 +14,7 @@ import { ServiceService } from './../../config/service.service';
import { MyordersService } from './../../config/myorder.service'; import { MyordersService } from './../../config/myorder.service';
import { NgForm } from '@angular/forms'; import { NgForm } from '@angular/forms';
import * as firebase from 'firebase'; import * as firebase from 'firebase';
declare var google: any;
@Component({ @Component({
selector: 'app-changeaddress', selector: 'app-changeaddress',
...@@ -93,7 +94,7 @@ export class ChangeaddressPage implements OnInit { ...@@ -93,7 +94,7 @@ export class ChangeaddressPage implements OnInit {
mapReady(map) { mapReady(map) {
map.addListener('dragend', () => { map.addListener('dragend', () => {
console.log(this.newCenterLat, this.newCenterLng); console.log(this.newCenterLat, this.newCenterLng);
this.getAddress(this.latitude, this.longitude); this.getAddress(this.newCenterLat, this.newCenterLng);
}); });
} }
centerChange(e) { centerChange(e) {
......
src/app/orderplaced/orderplaced.page.html
...@@ -66,9 +66,10 @@ ...@@ -66,9 +66,10 @@
</div> </div>
<div class="nearby_shop_list"> <div class="nearby_shop_list">
<ul> <ul>
<li (click)="goToPage('productlist')"> <li>
<div class="nearby_image"> <div class="nearby_image">
<img [src]="data.product[0].image" onerror="this.src='../assets/[email protected]'" /> <img [src]="data.product[0].image"
onerror="this.src='../assets/[email protected]'" />
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
...@@ -91,7 +92,8 @@ ...@@ -91,7 +92,8 @@
</h6> </h6>
<h5>Quantity : <span>{{product.qty}}</span></h5> <h5>Quantity : <span>{{product.qty}}</span></h5>
<h5> <h5>
Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span class="afterpay">{{data.paymentMode}}</span> Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span
class="afterpay">{{data.paymentMode}}</span>
</h5> </h5>
<h5 *ngIf="data.orderStatus >= 3 || data.orderStatus < 7"> <h5 *ngIf="data.orderStatus >= 3 || data.orderStatus < 7">
Delivery time : <span>{{deliveryTime}}</span> Delivery time : <span>{{deliveryTime}}</span>
...@@ -103,7 +105,8 @@ ...@@ -103,7 +105,8 @@
<div class="delivery-wrap"> <div class="delivery-wrap">
<h4 class="floatLeft">DELIVERY</h4> <h4 class="floatLeft">DELIVERY</h4>
<span class="floatRight" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"><img <span class="floatRight"
*ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"><img
class="ng-tns-c3-0" src="../../assets/edit.png" (click)="changeAddress(data.orderId)" /></span> class="ng-tns-c3-0" src="../../assets/edit.png" (click)="changeAddress(data.orderId)" /></span>
<div class="clear"></div> <div class="clear"></div>
...@@ -176,7 +179,8 @@ ...@@ -176,7 +179,8 @@
<ion-footer> <ion-footer>
<div class="footer-btn"> <div class="footer-btn">
<button class="cancel_btn" (click)="cancelOrder(data.orderId)" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"> <button class="cancel_btn" (click)="cancelOrder(data.orderId)"
*ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
CANCEL THIS ORDER CANCEL THIS ORDER
</button> </button>
</div> </div>
......
src/app/searchmodal/searchmodal.page.html
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
</div> </div>
<div class="search-sctn"> <div class="search-sctn">
<div class="nav_title floatLeft relative"> <div class="nav_title floatLeft relative">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" (input)="searchFun($event.target.value)" #searchText /> <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..."
(click)="clickSearch($event.target.value)" (input)="searchFun($event.target.value)" #searchText />
</div> </div>
</div> </div>
<div class="close-sctn"> <div class="close-sctn">
......
src/app/searchmodal/searchmodal.page.ts
...@@ -43,9 +43,11 @@ export class SearchmodalPage implements OnInit { ...@@ -43,9 +43,11 @@ export class SearchmodalPage implements OnInit {
this.searchService.search(data); this.searchService.search(data);
} }
clickSearch() { clickSearch(text: string) {
this.searchShow = true; this.searchShow = true;
this.searchService.searchList = []; if (text === '') {
this.searchService.searchList = [];
}
} }
viewPage(datas: any) { viewPage(datas: any) {
......
src/index.html
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Ionic App</title> <title>Ionic App</title>
<base href="/" /> <base href="/" />
<meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <meta name="viewport"
content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name="format-detection" content="telephone=no" /> <meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no" /> <meta name="msapplication-tap-highlight" content="no" />
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
</head> </head>
<body> <body>
<script
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBn6hOlr6YHcZAmbptlsmbhvH5iQllWflE&libraries=geometry"></script>
<app-root></app-root> <app-root></app-root>
</body> </body>
......
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