Merge branch 'adarsh' into 'master'

src/app/cart/cart.page.html

@@ -36,7 +36,7 @@
                                 <li *ngFor="let carts of cartService.carts; let i= index">
                                     <div class="close" (click)="cartService.removeItem(i)"></div>
                                     <div class="cart_image">
-                                        <img [src]="carts.image" onerror="this.src=''" />
+                                        <img [src]="carts.image" onerror="this.src='./../../assets/cart.png'" />
                                     </div>
                                     <div class="cart_detail">
                                         <h4>{{unEscape(carts.prodName)}}</h4>
@@ -59,7 +59,7 @@
                                         <p class="textLeft">Total Price:</p>
                                     </ion-col>
                                     <ion-col>
-                                        <p class="textRight">A$ {{cartService.cartTotal}}</p>
+                                        <p class="textRight">A$ {{cartService.cartTotal.toFixed(2)}}</p>
                                     </ion-col>
                                 </ion-row>
                             </div>
@@ -112,7 +112,7 @@
                             <hr />
                             <h5>
                                 <span class="floatLeft">PAYMENT</span>
-                                <span class="floatRight">CHANGE</span>
+                                <!-- <span class="floatRight">CHANGE</span> -->
                                 <div class="clear"></div>
                             </h5>
                             <div class="payment_method">
@@ -185,7 +185,7 @@
                             <h6>
                                 <span class="floatLeft">PRODUCT COST</span>
                                 <span class="floatRight" *ngIf="cartService.cartTotal">A$
-                                    {{cartService.cartTotal}}</span>
+                                    {{cartService.cartTotal.toFixed(2)}}</span>
                                 <div class="clear"></div>
                             </h6>
 
@@ -240,7 +240,7 @@
 </ion-content>
 <ion-footer>
     <div class="footer_btnbay" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 0">
-        <div class="continue" (click)="goToPage('productlist')">
+        <div class="continue" (click)="goToPage('home')">
             CONTINUE SHOPPING
         </div>
         <div class="checkout" (click)="next(1)">CHECKOUT</div>

src/app/home/home.page.ts

@@ -43,6 +43,7 @@ export class HomePage implements OnInit {
   address: any;
   custId: any;
   private geoCoder;
+  subscription: any;
   slideOpts = {
     slidesPerView: 1.5
   };
@@ -62,7 +63,7 @@ export class HomePage implements OnInit {
     private searchService: SearchService,
     private productsService: ProductsService,
     private subjectService: SubjectService,
-    private authService: AuthService,
+    private authService: AuthService
   ) {
     this.loader = false;
   }

src/app/login/login.page.ts

 import { Component, OnInit } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import { AuthService } from './../../config/auth.service';
-import { MenuController } from '@ionic/angular';
+import { MenuController, Platform } from '@ionic/angular';
 import { async } from 'q';
 
 @Component({
@@ -10,11 +10,13 @@ import { async } from 'q';
   styleUrls: ['./login.page.scss']
 })
 export class LoginPage implements OnInit {
+  subscription: any;
   constructor(
     private router: Router,
     private route: ActivatedRoute,
     public authService: AuthService,
-    public menuCtrl: MenuController
+    public menuCtrl: MenuController,
+    private platform: Platform
   ) { }
 
   ngOnInit() { }
@@ -23,6 +25,18 @@ export class LoginPage implements OnInit {
     this.menuCtrl.enable(false);
   }
 
+  ionViewDidEnter() {
+    this.subscription = this.platform.backButton.subscribe(() => {
+      console.log('cancelled');
+      // tslint:disable-next-line:no-string-literal
+      navigator['app'].exitApp();
+    });
+  }
+
+  ionViewWillLeave() {
+    this.subscription.unsubscribe();
+  }
+
   goToPage(path, data = null) {
     this.router.navigateByUrl(path, { replaceUrl: true, queryParams: data });
     document.body.scrollTop = document.documentElement.scrollTop = 0;

src/app/wishlist/wishlist.page.html

@@ -35,11 +35,16 @@
     <button (click)="goToPage('home')">shop now</button>
   </div>
 
+
+</ion-content>
+
+<ion-footer>
   <div class="footer-btns-wrapper" *ngIf="wishService.whishItem.length > 0">
     <button class="btn-clear" (click)="clearAll()">Clear All</button>
     <button class="btn-cart" (click)="addToCart()">add all to cart</button>
   </div>
-</ion-content>
+</ion-footer>
+
 <div class="loader" *ngIf="loader">
   <div class="lds-ripple">
     <div></div>

src/global.scss

@@ -453,7 +453,7 @@ app-success {
 .not {
     background-color: #3b394d;
     color: #fff;
-    width: 17px;
+    min-width: 17px;
     height: 17px;
     border-radius: 50%;
     position: absolute;