Merge branch 'adarsh' into 'master'

src/app/cart/cart.page.ts

@@ -341,6 +341,7 @@ export class CartPage implements OnInit {
   }
 
   unEscape(text: string) {
-    return unescape(text);
+    const regex = '%uFFFD';
+    return unescape(text.replace(/%uFFFD/g, ''));
   }
 }

src/app/catstorelist/catstorelist.page.html

 <div class="nav_header">
   <button class="nav_btn nav_back floatLeft" (click)="goBack()"></button>
   <div class="nav_title floatLeft">
-    <input
-      class="search_bar"
-      placeholder="Search here.. eg:shirts, retailers etc..."
-      (click)="clickSearch()"
-    />
+    <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" />
   </div>
   <button class="nav_btn nav_search floatRight" *ngIf="!searchShow"></button>
-  <button
-    class="nav_btn nav_close floatRight"
-    *ngIf="searchShow"
-    (click)="searchClose()"
-  ></button>
+  <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
   <div class="clear"></div>
 </div>
 <ion-content>
@@ -21,20 +13,11 @@
       Featured Stores
     </div>
     <div class="featured_slider">
-      <ion-slides
-        pager="false"
-        [options]="slideOpts"
-        *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0"
-      >
+      <ion-slides pager="false" [options]="slideOpts"
+        *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
         <ion-slide *ngFor="let shopper of shopperService.activeshoppers">
-          <div
-            class="feature_product"
-            (click)="goToPage('productlist', shopper)"
-          >
-            <img
-              [src]="shopper.featuredImage"
-              onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'"
-            />
+          <div class="feature_product" (click)="goToPage('productlist', shopper)">
+            <img [src]="shopper.featuredImage" onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
             <div class="feature_overlay">
               <h5>{{shopper.name}}</h5>
               <p>{{shopper.caption}}</p>
@@ -48,21 +31,14 @@
     </div>
     <div class="nearby_shop_list">
       <ul *ngIf="shopperService.shoppers && shopperService.shoppers.length > 0">
-        <li
-          *ngFor="let shopper of shopperService.shoppers"
-          (click)="goToPage('productlist', shopper)"
-        >
+        <li *ngFor="let shopper of shopperService.shoppers" (click)="goToPage('productlist', shopper)">
           <div class="nearby_image">
-            <img
-              [src]="shopper.profilePic"
-              onerror="this.src='./../../assets/getmi_malls/store298/stores1.png'"
-            />
+            <img [src]="shopper.profilePhoto" onerror="this.src='./../../assets/getmi_malls/store298/stores1.png'" />
           </div>
           <div class="nearby_detail">
             <h5>
               <span class="floatLeft">{{shopper.name}}</span>
-              <span class="floatRight"
-                >0
+              <span class="floatRight">0
                 <img src="../assets/Path61_2.png" />
               </span>
               <div class="clear"></div>
@@ -72,14 +48,11 @@
           <div class="clear"></div>
         </li>
       </ul>
-      <div
-        class="no-result-wrapper"
-        *ngIf="shopperService.shoppers.length === 0"
-      >
+      <div class="no-result-wrapper" *ngIf="shopperService.shoppers.length === 0">
         <img src="../../assets/basket.png" />
         <h1>No result found</h1>
         <button (click)="goToPage('home')">home</button>
       </div>
     </div>
   </div>
-</ion-content>
+</ion-content>
\ No newline at end of file

src/app/firstpage/firstpage.page.ts

@@ -22,13 +22,13 @@ export class FirstpagePage implements OnInit {
         console.log(user);
         if (user) {
           this.subjectService.sendLoginData(false);
-          this.goToPage('home');
+          this.goToPage('home', { replaceUrl: true });
         } else {
           this.subjectService.sendLoginData(true);
-          this.goToPage('login');
+          this.goToPage('login', { replaceUrl: true });
         }
       } else {
-        this.goToPage('landing');
+        this.goToPage('landing', { replaceUrl: true });
       }
       this.loader = false;
     });

src/app/myorder/myorder.page.ts

@@ -116,7 +116,8 @@ export class MyorderPage implements OnInit {
   }
 
   unEscape(text: string) {
-    return unescape(text);
+    const regex = '%uFFFD';
+    return unescape(text.replace(/%uFFFD/g, ''));
   }
 
 }

src/app/orderplaced/orderplaced.page.ts

@@ -42,7 +42,8 @@ export class OrderplacedPage implements OnInit {
   }
 
   unEscape(text: string) {
-    return unescape(text);
+    const regex = '%uFFFD';
+    return unescape(text.replace(/%uFFFD/g, ''));
   }
 
   getDeliveryTime(timeStamp) {

src/app/productdetail/productdetail.page.ts

@@ -75,7 +75,8 @@ export class ProductdetailPage implements OnInit {
   }
 
   unEscape(text: string) {
-    return unescape(text);
+    const regex = '%uFFFD';
+    return unescape(text.replace(/%uFFFD/g, ''));
   }
 
   getProd(params) {

src/app/productlist/productlist.page.ts

@@ -90,7 +90,8 @@ export class ProductlistPage implements OnInit {
   }
 
   unEscape(text: string) {
-    return unescape(text);
+    const regex = '%uFFFD';
+    return unescape(text.replace(/%uFFFD/g, ''));
   }
 
   gridToggle() {

src/app/searchmodal/searchmodal.page.ts

@@ -70,7 +70,8 @@ export class SearchmodalPage implements OnInit {
   }
 
   unEscape(text: string) {
-    return unescape(text);
+    const respVal = unescape(text);
+    return respVal.replace('�', '');
   }
 
 

src/config/auth.service.ts

@@ -40,7 +40,7 @@ export class AuthService {
         this.SetUserData(user);
         this.loader = false;
         if (this.type === 1) {
-          this.router.navigateByUrl('home');
+          this.router.navigateByUrl('home', { replaceUrl: true });
         } else {
           this.router.navigateByUrl('verification');
         }
@@ -325,7 +325,7 @@ export class AuthService {
           .then(() => {
             console.log('Address add Successfully');
             this.service.set('user', JSON.stringify(this.userData));
-            this.router.navigateByUrl('home');
+            this.router.navigateByUrl('home', { replaceUrl: true });
             document.body.scrollTop = document.documentElement.scrollTop = 0;
           })
           .catch(err => {