conflict fix

src/app/address/address.page.html

@@ -13,26 +13,17 @@
     <ion-grid *ngFor="let address of addressService.addressList; let i = index">
       <ion-row>
         <ion-col size="1">
-          <input
-            type="radio"
-            id="address_{{i}}"
-            class="address-radio"
-            name="address"
-            [checked]="address.defaultVal == 1"
-          />
+          <input type="radio" id="address_{{i}}" class="address-radio" name="address"
+            (change)="setDefault(address.addressId)" [checked]="address.defaultVal == 1" />
         </ion-col>
         <ion-col size="9">
           <h1>{{address.addressType}}</h1>
           <h1>{{address.address}}</h1>
           <p>{{address.building}}, {{address.landmark}}</p>
         </ion-col>
-        <ion-col size="2" [hidden]="address.defaultVal == 1"
-          ><button
-            class="show-btn"
-            (click)="addressService.deleteAddress(address.addressId)"
-          >
-            <img src="../../assets/delete.png" /></button
-        ></ion-col>
+        <ion-col size="2" [hidden]="address.defaultVal == 1"><button class="show-btn"
+            (click)="addressService.deleteAddress(address.addressId)">
+            <img src="../../assets/delete.png" /></button></ion-col>
       </ion-row>
     </ion-grid>
     <div class="address-btn-wrapper">
@@ -42,3 +33,9 @@
     </div>
   </div>
 </ion-content>
+<div class="loader" *ngIf="loader">
+  <div class="lds-ripple">
+    <div></div>
+    <div></div>
+  </div>
+</div>
\ No newline at end of file

src/app/address/address.page.ts

@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { AddressService } from './../../config/address.service';
 import { Router, ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
+import { ServiceService } from './../../config/service.service';
+
 
 @Component({
   selector: 'app-address',
@@ -9,18 +11,41 @@ import { Location } from '@angular/common';
   styleUrls: ['./address.page.scss']
 })
 export class AddressPage implements OnInit {
+  custId: any;
+  loader: boolean;
   constructor(
     private location: Location,
     public addressService: AddressService,
-    public router: Router
-  ) {}
+    public router: Router,
+    public service: ServiceService,
+  ) {
+    this.loader = false;
+    const users = this.service.get('user').then(data => {
+      if (data) {
+        data = JSON.parse(data);
+        this.custId = data.uid;
+        this.addressService.addList(data.uid);
+      }
+    });
+  }
 
-  ngOnInit() {}
+  ngOnInit() { }
 
   goBack() {
     this.location.back();
   }
 
+  setDefault(addressId: any) {
+    this.loader = true;
+    console.log(addressId);
+    this.addressService.setDefaultAddress(addressId, this.custId).then(() => {
+      this.loader = false;
+    }).catch(err => {
+      this.loader = false;
+      this.service.showToast('Something went wrong please try again!', 'top', 'my-error', 1000);
+    });
+  }
+
   goToPage(path, data = null) {
     this.router.navigateByUrl(path, { queryParams: data });
     document.body.scrollTop = document.documentElement.scrollTop = 0;

src/app/app-routing.module.ts

-import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-
-const routes: Routes = [
-  {
-    path: '',
-    loadChildren: './landing/landing.module#LandingPageModule'
-  },
-  { path: 'tabs', loadChildren: './tabs/tabs.module#TabsPageModule' },
-  { path: 'login', loadChildren: './login/login.module#LoginPageModule' },
-  { path: 'signup', loadChildren: './signup/signup.module#SignupPageModule' },
-  {
-    path: 'verification',
-    loadChildren: './verification/verification.module#VerificationPageModule'
-  },
-  { path: 'forgot', loadChildren: './forgot/forgot.module#ForgotPageModule' },
-  {
-    path: 'changepass',
-    loadChildren: './changepass/changepass.module#ChangepassPageModule'
-  },
-  {
-    path: 'orderdelivered',
-    loadChildren:
-      './orderdelivered/orderdelivered.module#OrderdeliveredPageModule'
-  },
-  {
-    path: 'orderplaced',
-    loadChildren: './orderplaced/orderplaced.module#OrderplacedPageModule'
-  },
-  {
-    path: 'ordercancelled',
-    loadChildren:
-      './ordercancelled/ordercancelled.module#OrdercancelledPageModule'
-  },
-  {
-    path: 'myorder',
-    loadChildren: './myorder/myorder.module#MyorderPageModule'
-  },
-  { path: 'cart', loadChildren: './cart/cart.module#CartPageModule' },
-  {
-    path: 'changedetails',
-    loadChildren: './changedetails/changedetails.module#ChangedetailsPageModule'
-  },
-  {
-    path: 'wishlist',
-    loadChildren: './wishlist/wishlist.module#WishlistPageModule'
-  },
-  {
-    path: 'addaddresss',
-    loadChildren: './addaddresss/addaddresss.module#AddaddresssPageModule'
-  },
-  {
-    path: 'profile',
-    loadChildren: './profile/profile.module#ProfilePageModule'
-  },
-  { path: 'home', loadChildren: './home/home.module#HomePageModule' },
-  {
-    path: 'productlist',
-    loadChildren: './productlist/productlist.module#ProductlistPageModule'
-  },
-  {
-    path: 'productdetail',
-    loadChildren: './productdetail/productdetail.module#ProductdetailPageModule'
-  },
-  {
-    path: 'reviewlist',
-    loadChildren: './reviewlist/reviewlist.module#ReviewlistPageModule'
-  },
-  {
-    path: 'catagory',
-    loadChildren: './catagory/catagory.module#CatagoryPageModule'
-  },
-  {
-    path: 'trackorder',
-    loadChildren: './trackorder/trackorder.module#TrackorderPageModule'
-  },
-  {
-    path: 'storelist',
-    loadChildren: './storelist/storelist.module#StorelistPageModule'
-  },
-  {
-    path: 'catstorelist',
-    loadChildren: './catstorelist/catstorelist.module#CatStorelistPageModule'
-  },
-  { path: 'nearby', loadChildren: './nearby/nearby.module#NearbyPageModule' },
-  { path: 'review', loadChildren: './review/review.module#ReviewPageModule' },
-  {
-    path: 'delivery',
-    loadChildren: './delivery/delivery.module#DeliveryPageModule'
-  },
-  {
-    path: 'addcard',
-    loadChildren: './addcard/addcard.module#AddcardPageModule'
-  },
-  {
-    path: 'searchmodal',
-    loadChildren: './searchmodal/searchmodal.module#SearchmodalPageModule'
-  },
-  {
-    path: 'noresult',
-    loadChildren: './noresult/noresult.module#NoresultPageModule'
-  },
-  {
-    path: 'feedback',
-    loadChildren: './feedback/feedback.module#FeedbackPageModule'
-  },
-  {
-    path: 'address',
-    loadChildren: './address/address.module#AddressPageModule'
-  },
-  {
-    path: 'success',
-    loadChildren: './success/success.module#SuccessPageModule'
-  },
-  { path: 'failed', loadChildren: './failed/failed.module#FailedPageModule' },
-  {
-    path: 'preference',
-    loadChildren: './preference/preference.module#PreferencePageModule'
-  },
-  {
-    path: 'contact',
-    loadChildren: './contact/contact.module#ContactPageModule'
-  },
-  {
-    path: 'changeaddress',
-    loadChildren: './changeaddress/changeaddress.module#ChangeaddressPageModule'
-  },
  { path: 'verficationnumber', loadChildren: './verficationnumber/verficationnumber.module#VerficationnumberPageModule' }
+import { NgModule } from '@angular/core';
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
 
-];
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
-  ],
-  exports: [RouterModule]
-})
-export class AppRoutingModule {}
+const routes: Routes = [
+  {
+    path: 'landing',
+    loadChildren: './landing/landing.module#LandingPageModule'
+  },
+  { path: 'tabs', loadChildren: './tabs/tabs.module#TabsPageModule' },
+  { path: 'login', loadChildren: './login/login.module#LoginPageModule' },
+  { path: 'signup', loadChildren: './signup/signup.module#SignupPageModule' },
+  {
+    path: 'verification',
+    loadChildren: './verification/verification.module#VerificationPageModule'
+  },
+  { path: 'forgot', loadChildren: './forgot/forgot.module#ForgotPageModule' },
+  {
+    path: 'changepass',
+    loadChildren: './changepass/changepass.module#ChangepassPageModule'
+  },
+  {
+    path: 'orderdelivered',
+    loadChildren:
+      './orderdelivered/orderdelivered.module#OrderdeliveredPageModule'
+  },
+  {
+    path: 'orderplaced',
+    loadChildren: './orderplaced/orderplaced.module#OrderplacedPageModule'
+  },
+  {
+    path: 'ordercancelled',
+    loadChildren:
+      './ordercancelled/ordercancelled.module#OrdercancelledPageModule'
+  },
+  {
+    path: 'myorder',
+    loadChildren: './myorder/myorder.module#MyorderPageModule'
+  },
+  { path: 'cart', loadChildren: './cart/cart.module#CartPageModule' },
+  {
+    path: 'changedetails',
+    loadChildren: './changedetails/changedetails.module#ChangedetailsPageModule'
+  },
+  {
+    path: 'wishlist',
+    loadChildren: './wishlist/wishlist.module#WishlistPageModule'
+  },
+  {
+    path: 'addaddresss',
+    loadChildren: './addaddresss/addaddresss.module#AddaddresssPageModule'
+  },
+  {
+    path: 'profile',
+    loadChildren: './profile/profile.module#ProfilePageModule'
+  },
+  { path: 'home', loadChildren: './home/home.module#HomePageModule' },
+  {
+    path: 'productlist',
+    loadChildren: './productlist/productlist.module#ProductlistPageModule'
+  },
+  {
+    path: 'productdetail',
+    loadChildren: './productdetail/productdetail.module#ProductdetailPageModule'
+  },
+  {
+    path: 'reviewlist',
+    loadChildren: './reviewlist/reviewlist.module#ReviewlistPageModule'
+  },
+  {
+    path: 'catagory',
+    loadChildren: './catagory/catagory.module#CatagoryPageModule'
+  },
+  {
+    path: 'trackorder',
+    loadChildren: './trackorder/trackorder.module#TrackorderPageModule'
+  },
+  {
+    path: 'storelist',
+    loadChildren: './storelist/storelist.module#StorelistPageModule'
+  },
+  {
+    path: 'catstorelist',
+    loadChildren: './catstorelist/catstorelist.module#CatStorelistPageModule'
+  },
+  { path: 'nearby', loadChildren: './nearby/nearby.module#NearbyPageModule' },
+  { path: 'review', loadChildren: './review/review.module#ReviewPageModule' },
+  {
+    path: 'delivery',
+    loadChildren: './delivery/delivery.module#DeliveryPageModule'
+  },
+  {
+    path: 'addcard',
+    loadChildren: './addcard/addcard.module#AddcardPageModule'
+  },
+  {
+    path: 'searchmodal',
+    loadChildren: './searchmodal/searchmodal.module#SearchmodalPageModule'
+  },
+  {
+    path: 'noresult',
+    loadChildren: './noresult/noresult.module#NoresultPageModule'
+  },
+  {
+    path: 'feedback',
+    loadChildren: './feedback/feedback.module#FeedbackPageModule'
+  },
+  {
+    path: 'address',
+    loadChildren: './address/address.module#AddressPageModule'
+  },
+  {
+    path: 'success',
+    loadChildren: './success/success.module#SuccessPageModule'
+  },
+  { path: 'failed', loadChildren: './failed/failed.module#FailedPageModule' },
+  {
+    path: 'preference',
+    loadChildren: './preference/preference.module#PreferencePageModule'
+  },
+  {
+    path: 'contact',
+    loadChildren: './contact/contact.module#ContactPageModule'
+  },
+  {
+    path: 'changeaddress',
+    loadChildren: './changeaddress/changeaddress.module#ChangeaddressPageModule'
+  },
+  {
+    path: 'verficationnumber',
+    loadChildren:
+      './verficationnumber/verficationnumber.module#VerficationnumberPageModule'
+  },
+  { path: '', loadChildren: './firstpage/firstpage.module#FirstpagePageModule' }
+];
+@NgModule({
+  imports: [
+    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
+  ],
+  exports: [RouterModule]
+})
+export class AppRoutingModule {}

src/app/app.component.ts

@@ -117,7 +117,8 @@ export class AppComponent {
       'trackorder',
       'changeaddress',
       'changedetails',
-      'contact'
+      'contact',
+      'myorder'
     ];
     const currentUrl = this.router.url.split('/');
     const index = restrictedUrl.findIndex(x => x === currentUrl[1]);

src/app/app.module.ts

@@ -30,6 +30,8 @@ import { FormsModule } from '@angular/forms';
 import { SearchmodalPageModule } from './searchmodal/searchmodal.module';
 import { SocialSharing } from '@ionic-native/social-sharing/ngx';
 import { CallNumber } from '@ionic-native/call-number/ngx';
+import { sanitizeHtmlPipe } from './../config/safehtml';
+
 @NgModule({
   declarations: [AppComponent],
   entryComponents: [],
@@ -57,7 +59,8 @@ import { CallNumber } from '@ionic-native/call-number/ngx';
     ServiceService,
     AuthService,
     GooglePlus,
-    SocialSharing
+    SocialSharing,
+    sanitizeHtmlPipe
   ],
   bootstrap: [AppComponent]
 })

src/app/cart/cart.page.ts

@@ -198,9 +198,7 @@ export class CartPage implements OnInit {
   }
 
   getDeliveryTime(timeStamp) {
-    console.log(timeStamp);
     const endDate = new Date(timeStamp * 1000);
-    console.log(endDate);
     endDate.setHours(endDate.getHours() + 1);
     const t = this.getTimeRemaining(endDate, new Date());
     const minutes = t.minutes < 10 ? '0' + t.minutes : t.minutes;

src/app/catagory/catagory.page.ts

@@ -3,6 +3,10 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
 import { CategoriesService } from './../../config/category.service';
 import { ServiceService } from './../../config/service.service';
+import { SearchmodalPage } from '../searchmodal/searchmodal.page';
+import { SubjectService } from './../../config/subject.service';
+import { ModalController } from '@ionic/angular';
+
 
 @Component({
   selector: 'app-catagory',
@@ -15,7 +19,9 @@ export class CatagoryPage implements OnInit {
     public router: Router,
     public location: Location,
     public categoriesService: CategoriesService,
-    public service: ServiceService
+    public service: ServiceService,
+    private subjectService: SubjectService,
+    public modalController: ModalController
   ) {
     this.service.get('params').then((val) => {
       this.data = val;
@@ -35,4 +41,15 @@ export class CatagoryPage implements OnInit {
     this.location.back();
   }
 
+  async searchModal() {
+    this.subjectService.setTabData(false);
+    const modal = await this.modalController.create({
+      component: SearchmodalPage
+    });
+    modal.onDidDismiss().then(dataReturned => {
+      this.subjectService.setTabData(true);
+    });
+    return await modal.present();
+  }
+
 }

src/app/changeaddress/changeaddress.page.ts

@@ -115,30 +115,31 @@ export class ChangeaddressPage implements OnInit {
 
   onSubmit(data: any) {
     this.loader = true;
-    console.log(data);
-    const postData: Address = {
-      address: this.address,
-      addressType: data.addressType,
-      building: data.building,
-      landmark: data.landmark,
-      defaultVal: 0,
-      uid: this.uid,
-      latLng: new firebase.firestore.GeoPoint(this.latitude, this.longitude),
-      status: true
-    };
-    this.addressService.addressCreate(postData);
-    this.successState = true;
+    this.service.get('orderId').then((orderId) => {
+      const postData: Address = {
+        address: this.address,
+        addressType: data.addressType,
+        building: data.building,
+        landmark: data.landmark,
+        defaultVal: 0,
+        uid: this.uid,
+        latLng: new firebase.firestore.GeoPoint(this.latitude, this.longitude),
+        status: true
+      };
+      console.log(postData, orderId);
+      this.addressService.changeAddress(postData, orderId);
+      this.service.get('order').then(val => {
+        val.deliveryAddress = postData;
+        this.service.set('order', val);
+      });
+      this.successState = true;
 
-    setTimeout(() => {
-      this.loader = false;
-      this.successState = false;
-      if (this.type === 1) {
-        this.service.set('type', 0);
-        this.router.navigateByUrl('home', { queryParams: null });
-      } else {
+      setTimeout(() => {
+        this.loader = false;
+        this.successState = false;
         this.goBack();
-      }
-    }, 3000);
+      }, 3000);
+    });
   }
 }
 

src/app/changedetails/changedetails.page.html

@@ -14,48 +14,21 @@
         <h6>Personal Details</h6>
       </div>
       <div class="row">
-        <input
-          [(value)]="userData && userData.name"
-          name="name"
-          required
-          class=""
-          type="text"
-          [(ngModel)]="userData && userData.name"
-          placeholder="Change your Name"
-          #name="ngModel"
-        />
-        <div
-          class="md-errors-spacer"
-          [hidden]="name.valid"
-          class="ion-padding-start"
-        >
+        <input [(value)]="userData && userData.name" name="name" readonly class="" type="text"
+          [(ngModel)]="userData && userData.name" placeholder="Change your Name" #name="ngModel" />
+        <div class="md-errors-spacer" [hidden]="name.valid" class="ion-padding-start">
           Name is required
         </div>
       </div>
       <div class="row">
-        <input
-          [(value)]="userData && userData.emailId"
-          readonly
-          class=""
-          name="emailId"
-          type="mail"
-          placeholder="email cannot be changed"
-        />
+        <input [(value)]="userData && userData.emailId" readonly class="" name="emailId" type="mail"
+          placeholder="email cannot be changed" />
       </div>
 
       <div class="row">
-        <input
-          [(value)]="userData && userData.phone"
-          required
-          class=""
-          name="phone"
-          type="number"
-          pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}"
-          maxlength="10"
-          [(ngModel)]="userData && userData.phone"
-          placeholder="Change your Phone Number"
-          #phone="ngModel"
-        />
+        <input [(value)]="userData && userData.phone" required class="" name="phone" type="number"
+          pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}" maxlength="10"
+          [(ngModel)]="userData && userData.phone" placeholder="Change your Phone Number" #phone="ngModel" />
         <div class="md-errors-spacer" [hidden]="phone.valid">
           <div *ngIf="phone.errors && phone.errors.required">
             Phone number is required
@@ -70,60 +43,30 @@
           <h6>Change Password</h6>
         </div>
         <div class="row">
-          <input
-            class=""
-            type="password"
-            minlength="6"
-            #currentPassword="ngModel"
-            [(ngModel)]="updatePassword.currentPassword"
-            name="currentPassword"
-            placeholder="Current Password"
-          />
-          <div
-            *ngIf="currentPassword.errors && currentPassword.errors.minlength"
-          >
+          <input class="" type="password" minlength="6" #currentPassword="ngModel"
+            [(ngModel)]="updatePassword.currentPassword" name="currentPassword" placeholder="Current Password" />
+          <div *ngIf="currentPassword.errors && currentPassword.errors.minlength">
             Password must be at least 6 characters
           </div>
         </div>
         <div class="row">
-          <input
-            class=""
-            [(ngModel)]="updatePassword.password"
-            name="password"
-            type="password"
-            placeholder="New Password"
-            minlength="6"
-            [required]="currentPassword ? true: false"
-            #password="ngModel"
-          />
+          <input class="" [(ngModel)]="updatePassword.password" name="password" type="password"
+            placeholder="New Password" minlength="6" [required]="currentPassword ? true: false" #password="ngModel" />
           <div *ngIf="password.errors && password.errors.minlength">
             Password must be at least 6 characters
           </div>
         </div>
         <div class="row">
-          <input
-            class=""
-            #confirmPassword="ngModel"
-            [(ngModel)]="updatePassword.confirmPassword"
-            name="confirmPassword"
-            type="password"
-            [required]="currentPassword ? true: false"
-            placeholder="Confirm Password"
-          />
-          <div
-            *ngIf="confirmPassword.value !=='' && confirmPassword.value !== password.value"
-          >
+          <input class="" #confirmPassword="ngModel" [(ngModel)]="updatePassword.confirmPassword" name="confirmPassword"
+            type="password" [required]="currentPassword ? true: false" placeholder="Confirm Password" />
+          <div *ngIf="confirmPassword.value !=='' && confirmPassword.value !== password.value">
             Password should match
           </div>
         </div>
       </div>
 
       <div class="row">
-        <button
-          class="login_btn"
-          (click)="onFormSubmit(updateForm)"
-          [disabled]="!phone.valid || !name.valid"
-        >
+        <button class="login_btn" (click)="onFormSubmit(updateForm)" [disabled]="!phone.valid || !name.valid">
           UPDATE
         </button>
       </div>
@@ -136,4 +79,4 @@
     <div></div>
     <div></div>
   </div>
-</div>
+</div>
\ No newline at end of file

src/app/firstpage/firstpage.module.ts

+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+
+import { IonicModule } from '@ionic/angular';
+
+import { FirstpagePage } from './firstpage.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: FirstpagePage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    RouterModule.forChild(routes)
+  ],
+  declarations: [FirstpagePage]
+})
+export class FirstpagePageModule {}

src/app/firstpage/firstpage.page.html

+<ion-content>
+
+</ion-content>
\ No newline at end of file

src/app/firstpage/firstpage.page.spec.ts

+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FirstpagePage } from './firstpage.page';
+
+describe('FirstpagePage', () => {
+  let component: FirstpagePage;
+  let fixture: ComponentFixture<FirstpagePage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ FirstpagePage ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FirstpagePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/firstpage/firstpage.page.ts

+import { Component, OnInit } from '@angular/core';
+import { SubjectService } from './../../config/subject.service';
+import { ServiceService } from './../../config/service.service';
+import { Router, ActivatedRoute } from '@angular/router';
+
+@Component({
+  selector: 'app-firstpage',
+  templateUrl: './firstpage.page.html',
+  styleUrls: ['./firstpage.page.scss'],
+})
+export class FirstpagePage implements OnInit {
+  loader: boolean;
+  constructor(
+    private subjectService: SubjectService,
+    private service: ServiceService,
+    private router: Router,
+  ) {
+    this.loader = true;
+    this.service.get('landing').then(data => {
+      if (data === true) {
+        const user = JSON.parse(localStorage.getItem('user'));
+        console.log(user);
+        if (user) {
+          this.subjectService.sendLoginData(false);
+          this.goToPage('home');
+        } else {
+          this.subjectService.sendLoginData(true);
+          this.goToPage('login');
+        }
+      } else {
+        this.goToPage('landing');
+      }
+      this.loader = false;
+    });
+  }
+
+  goToPage(path, data = null) {
+    this.router.navigateByUrl(path, { replaceUrl: true, queryParams: data });
+    document.body.scrollTop = document.documentElement.scrollTop = 0;
+  }
+
+  ngOnInit() {
+  }
+
+}

src/app/home/home.page.html

@@ -31,7 +31,8 @@
                         <h5>{{center.centerName}}</h5>
                         <p>{{center.description}}</p>
                     </div>
-                    <img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
+                    <img [src]="center.centerImg"
+                        onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
                 </ion-slide>
             </ion-slides>
         </div>
@@ -39,10 +40,12 @@
             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'" />
+                        <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>
@@ -63,22 +66,23 @@
         <div class="home_sub_header">
             <span class="floatLeft">Nearby Shopping Centers</span>
             <span class="floatRight">
-        <div class="nearby_icon" (click)="goToPage('nearby')"></div>
-      </span>
+                <div class="nearby_icon" (click)="goToPage('nearby')"></div>
+            </span>
             <div class="clear"></div>
         </div>
         <div class="nearby_shop_list">
             <ul *ngIf="centerService.nearcenters && centerService.nearcenters.length > 0">
                 <li *ngFor="let center of centerService.nearcenters" (click)="goToPage('storelist', center)">
                     <div class="nearby_image">
-                        <img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
+                        <img [src]="center.centerImg"
+                            onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
                     </div>
                     <div class="nearby_detail">
                         <h5>
                             <span class="floatLeft">{{center.centerName}}</span>
                             <span class="floatRight">0
-                <img src="../assets/Path61_2.png" />
-              </span>
+                                <img src="../assets/Path61_2.png" />
+                            </span>
                             <div class="clear"></div>
                         </h5>
                         <p>{{center.description}}</p>
@@ -92,8 +96,10 @@
         </div>
         <div class="featured_catagory_list">
             <ul *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
-                <li *ngFor="let categories of categoriesService.activecategories" (click)="goToPage('catstorelist', categories)">
-                    <img [src]="categories.catImage" onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
+                <li *ngFor="let categories of categoriesService.activecategories"
+                    (click)="goToPage('catstorelist', categories)">
+                    <img [src]="categories.catImage"
+                        onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
                     <div class="featured_overlay">
                         <h4>{{categories.catName}}</h4>
                     </div>
@@ -105,15 +111,16 @@
 <div *ngIf="isShow" [@slideInOut]>
     <div class="nav_header">
         <button class="nav_btn nav_back floatLeft" (click)="istoggle()">
-      <img src="../assets/Group17_2.png" />
-    </button>
+            <img src="../assets/Group17_2.png" />
+        </button>
         <div class="nav_title floatLeft">
             <h4>CHANGE LOCATION</h4>
         </div>
         <div class="clear"></div>
     </div>
     <ion-content class="sort_wrappper">
-        <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
+        <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false"
+            [backgroundColor]="'rgba(29, 27, 130,0.2)'">
             <agm-marker [latitude]="lat" [longitude]="lng"></agm-marker>
         </agm-map>
         <div class="add_address_wrapper">
@@ -127,10 +134,12 @@
                     <li *ngFor="let address of addressService.addressList; let i = index">
                         <div class="floatLeft">
                             {{address.default}}
-                            <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address.addressId)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
+                            <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio"
+                                (click)="setDefault(address.addressId)" [value]="address.addressId" #addressType
+                                [checked]="address.defaultVal == 1" />
                             <label for="styled-checkbox-{{i}}">
-                {{address.addressType}}
-              </label>
+                                {{address.addressType}}
+                            </label>
                         </div>
                         <div class="floatLeft">
                             <p>
@@ -142,5 +151,11 @@
                 </ul>
             </div>
         </div>
+        <div class="loader" *ngIf="loader">
+            <div class="lds-ripple">
+                <div></div>
+                <div></div>
+            </div>
+        </div>
     </ion-content>
 </div>
\ No newline at end of file

src/app/home/home.page.ts

@@ -37,6 +37,7 @@ export class HomePage implements OnInit {
   searchShow = false;
   public lat = 51.678418;
   public lng = 7.809007;
+  loader: boolean;
   address: any;
   custId: any;
   private geoCoder;
@@ -59,7 +60,9 @@ export class HomePage implements OnInit {
     private searchService: SearchService,
     private productsService: ProductsService,
     private subjectService: SubjectService
-  ) {}
+  ) {
+    this.loader = false;
+  }
 
   ngOnInit() {
     this.mapsAPILoader.load().then(() => {
@@ -77,10 +80,12 @@ export class HomePage implements OnInit {
   }
 
   private setCurrentLocation() {
+    const This = this;
     if ('geolocation' in navigator) {
       navigator.geolocation.getCurrentPosition(position => {
         this.lat = position.coords.latitude;
         this.lng = position.coords.longitude;
+        this.centerService.getNearBy(this.lat, this.lng, 10);
         this.getAddress(this.lat, this.lng);
       });
     }
@@ -108,7 +113,13 @@ export class HomePage implements OnInit {
   }
 
   setDefault(addressId: any) {
-    this.addressService.setDefaultAddress(addressId, this.custId);
+    this.loader = true;
+    this.addressService.setDefaultAddress(addressId, this.custId).then(() => {
+      this.loader = false;
+    }).catch(err => {
+      this.loader = false;
+      this.service.showToast('Something went wrong please try again!', 'top', 'my-error', 1000);
+    });
   }
 
   clickSearch() {

src/app/landing/landing.page.ts

@@ -17,21 +17,6 @@ export class LandingPage implements OnInit {
     private service: ServiceService,
     public subjectService: SubjectService
   ) {
-    this.loader = true;
-    this.service.get('landing').then(data => {
-      if (data === true) {
-        const user = JSON.parse(localStorage.getItem('user'));
-        console.log(user);
-        if (user) {
-          this.subjectService.sendLoginData(false);
-          this.goToPage('home');
-        } else {
-          this.subjectService.sendLoginData(true);
-          this.goToPage('login');
-        }
-      }
-      this.loader = false;
-    });
   }
 
   slideOpts = {
@@ -49,11 +34,11 @@ export class LandingPage implements OnInit {
     allowTouchMove: true
   };
 
-  ngOnInit() {}
+  ngOnInit() { }
 
   goToPage(path, data = null) {
     this.service.set('landing', true);
-    this.router.navigateByUrl(path, { queryParams: data });
+    this.router.navigateByUrl(path, { replaceUrl: true, queryParams: data });
     document.body.scrollTop = document.documentElement.scrollTop = 0;
   }
 

src/app/login/login.page.ts

@@ -15,16 +15,16 @@ export class LoginPage implements OnInit {
     private route: ActivatedRoute,
     public authService: AuthService,
     public menuCtrl: MenuController
-  ) {}
+  ) { }
 
-  ngOnInit() {}
+  ngOnInit() { }
 
   ionViewWillEnter() {
     this.menuCtrl.enable(false);
   }
 
   goToPage(path, data = null) {
-    this.router.navigateByUrl(path, { queryParams: data });
+    this.router.navigateByUrl(path, { replaceUrl: true, queryParams: data });
     document.body.scrollTop = document.documentElement.scrollTop = 0;
   }
 }

src/app/myorder/myorder.page.html

@@ -11,11 +11,8 @@
       <li *ngFor="let order of myorder.orders; let i = index">
         <div class="order_info">
           <h5 class="floatLeft">{{order.orderCode}}</h5>
-          <button
-            class="order_track floatRight"
-            *ngIf="order.orderStatus >= 3 && order.orderStatus < 7"
-            (click)="orderDetails(i)"
-          >
+          <button class="order_track floatRight" *ngIf="order.orderStatus >= 3 && order.orderStatus < 7"
+            (click)="orderDetails(i)">
             Track Order
           </button>
           <div class="clear"></div>
@@ -28,25 +25,19 @@
             <h5 class="floatLeft">{{product.prodName}}</h5>
             <div class="clear"></div>
             <h5>
-              <span *ngIf="product.color !== 'No-Color'"
-                >{{product.color}},
+              <span *ngIf="product.color !== 'No-Color'">{{product.color}},
               </span>
-              <span *ngIf="product.size !== 'Any-Size'">{{product.size}}</span
-              >&nbsp;<span>{{product.qty}}</span>
+              <span *ngIf="product.size !== 'Any-Size'">{{product.size}}</span>&nbsp;<span>{{product.qty}}</span>
             </h5>
 
-            <p>A$ {{product.price}}</p>
+            <p *ngIf="product.price">A$ {{product.price}}</p>
           </div>
           <div class="order_other">
             <h6 class="floatRight">
               {{ order.bookDate.seconds * 1000 | date:'MMMM dd, y' }}
             </h6>
-            <span
-              class="floatRight"
-              *ngIf="order.orderStatus < 3 || order.orderStatus >= 7"
-              (click)="acceptOrder(order)"
-              >{{getStatus(order.orderStatus)}}</span
-            >
+            <span class="floatRight" *ngIf="order.orderStatus < 3 || order.orderStatus >= 7"
+              (click)="acceptOrder(order)">{{getStatus(order.orderStatus)}}</span>
             <div class="clear"></div>
             <!-- <button class="track_btn" *ngIf="order.orderStatus >= 3 && order.orderStatus < 7" (click)="orderDetails(i)">TRACK</button> -->
             <div class="clear"></div>
@@ -121,4 +112,4 @@
     <div></div>
     <div></div>
   </div>
-</div>
+</div>
\ No newline at end of file

src/app/myorder/myorder.page.ts

@@ -13,7 +13,7 @@ import { ServiceService } from './../../config/service.service';
 })
 export class MyorderPage implements OnInit {
   loader = false;
-
+  userData: any;
   constructor(
     private router: Router,
     private route: ActivatedRoute,
@@ -29,7 +29,14 @@ export class MyorderPage implements OnInit {
     setTimeout(() => {
       This.loader = false;
     }, 500);
-    // this.myorder.orderList('WwHnLICVY2dvZGUHuKqasiTB91a2');
+    this.service.get('user').then(data => {
+      if (data) {
+        this.userData = JSON.parse(data);
+        console.log(this.userData.uid);
+        this.myorder.orderList(this.userData.uid);
+      }
+    });
+
   }
 
   async finishpop(data: any) {
@@ -50,9 +57,9 @@ export class MyorderPage implements OnInit {
   }
 
   orderDetails(index: number) {
-      this.myorder.trackOrder(this.myorder.orders[index]);
-      this.router.navigateByUrl('trackorder');
-      document.body.scrollTop = document.documentElement.scrollTop = 0;
+    this.myorder.trackOrder(this.myorder.orders[index]);
+    this.router.navigateByUrl('trackorder');
+    document.body.scrollTop = document.documentElement.scrollTop = 0;
   }
 
   acceptOrder(order: any) {

src/app/orderplaced/orderplaced.page.html

@@ -59,16 +59,12 @@
       <ul>
         <li (click)="goToPage('productlist')">
           <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 class="nearby_detail">
             <h5>
               <span class="floatLeft">{{data.shopperName}}</span>
-              <span class="floatRight"
-                >{{data.product[0].qty}}
+              <span class="floatRight">{{data.product[0].qty}}
                 <img src="../assets/Path61_2.png" />
               </span>
               <div class="clear"></div>
@@ -86,8 +82,7 @@
       </h6>
       <h5>Quantity : <span>{{product.qty}}</span></h5>
       <h5>
-        Amount : <strong>A$ {{product.price}}</strong
-        ><span class="afterpay">COD</span>
+        Amount : <strong>A$ {{product.price}}</strong><span class="afterpay">COD</span>
       </h5>
       <h5 *ngIf="data.orderStatus >= 3 && data.orderStatus < 7">
         Delivery time : <span>{{deliveryTime}}</span>
@@ -95,12 +90,8 @@
       <h5>Order Status : <span>{{getStatus(data.orderStatus)}}</span></h5>
       <div class="delivery-wrap">
         <h4 class="floatLeft">DELIVERY</h4>
-        <span class="floatRight"
-          ><img
-            class="ng-tns-c3-0"
-            src="../../assets/edit.png"
-            (click)="goToPage('changeaddress')"
-        /></span>
+        <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>
 
         <div class="clear"></div>
       </div>
@@ -110,11 +101,8 @@
         {{data.deliveryAddress.building}}, <br />
         {{data.deliveryAddress.landmark}}
       </h5>
-      <button
-        class="cancel_btn"
-        (click)="goToPage('contact')"
-        *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"
-      >
+      <button class="cancel_btn" (click)="goToPage('contact')"
+        *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
         CANCEL THIS ORDER
       </button>
       <!-- <hr /> -->
@@ -176,4 +164,4 @@
             </ul>
         </div> -->
   </div>
-</ion-content>
+</ion-content>
\ No newline at end of file

src/app/orderplaced/orderplaced.page.ts

@@ -20,6 +20,18 @@ export class OrderplacedPage implements OnInit {
     private service: ServiceService,
     private myOrder: MyordersService
   ) {
+
+  }
+
+
+
+  data: any;
+
+  relatedProd = {
+    slidesPerView: 2
+  };
+
+  ionViewWillEnter() {
     this.deliveryTime = '';
     this.service.get('order').then(val => {
       this.data = val;
@@ -28,16 +40,11 @@ export class OrderplacedPage implements OnInit {
       }, 1000);
     });
   }
-  data: any;
-
-  relatedProd = {
-    slidesPerView: 2
-  };
 
   getDeliveryTime(timeStamp) {
-    console.log(timeStamp);
+    // console.log(timeStamp);
     const endDate = new Date(timeStamp * 1000);
-    console.log(endDate);
+    // console.log(endDate);
     endDate.setHours(endDate.getHours() + 1);
     const t = this.getTimeRemaining(endDate, new Date());
     const minutes = t.minutes < 10 ? '0' + t.minutes : t.minutes;
@@ -60,13 +67,19 @@ export class OrderplacedPage implements OnInit {
     };
   }
 
-  ngOnInit() {}
+  ngOnInit() { }
 
   goToPage(path, data = null) {
     this.router.navigateByUrl(path, { queryParams: data });
     document.body.scrollTop = document.documentElement.scrollTop = 0;
   }
 
+  changeAddress(orderId) {
+    this.service.set('orderId', orderId);
+    this.router.navigateByUrl('changeaddress');
+    document.body.scrollTop = document.documentElement.scrollTop = 0;
+  }
+
   goBack() {
     this.location.back();
   }

src/app/productdetail/productdetail.page.html

@@ -36,9 +36,10 @@
         <div class="product_header">
             <ion-row>
                 <ion-col size="8">
-                    <h3>{{product.prodName}}</h3>
+                    <h3>{{unEscape(product.prodName)}}</h3>
                     <p>
-                        <strong><span><img src="../assets/Path61_2.png" /></span>{{product.rating}}</strong>&nbsp; {{product.category}}, {{product.subCate}}
+                        <strong><span><img src="../assets/Path61_2.png" /></span>{{product.rating}}</strong>&nbsp;
+                        {{product.category}}, {{product.subCate}}
                         <br />
                         <span *ngFor="let tag of product.tag"><span *ngIf="tag !=='No-Tag'">#{{tag}}&nbsp;</span></span>
                     </p>
@@ -147,7 +148,7 @@
                 </ul>
             </div> -->
             <h5>Description</h5>
-            <p>{{product.prodDesc}}</p>
+            <p>{{unEscape(product.prodDesc)}}</p>
             <!--<h5>
                 <span class="floatLeft">Reviews</span><span class="floatRight" (click)="goToPage('reviewlist')">MORE</span>
                 <div class="clear"></div>
@@ -213,7 +214,8 @@
                 </ul>
             </div> -->
             <h5 *ngIf="product.similar && product.similar.length > 0">
-                <span class="floatLeft">Related Products</span><span class="floatRight" (click)="goToPage('productlist', data)">MORE</span>
+                <span class="floatLeft">Related Products</span><span class="floatRight"
+                    (click)="goToPage('productlist', data)">MORE</span>
                 <div class="clear"></div>
             </h5>
             <div class="related_product_slider">
@@ -226,7 +228,7 @@
                                     <div [ngClass]="checkFavStatus(similar.prodId)" (click)="changeFav(similar.prodId)">
                                     </div>
                                 </div>
-                                <h5>{{similar.prodName}}</h5>
+                                <h5>{{unEscape(similar.prodName)}}</h5>
                                 <p>{{similar.price}}</p>
                             </li>
                         </ion-slide>
@@ -245,7 +247,8 @@
 <ion-footer *ngIf="product">
     <div class="footer_div">
         <div class="footer_options">
-            <button class="share" (click)="socialShare(product.prodName, product.category, product.subCate, product.price, product.image)"></button>
+            <button class="share"
+                (click)="socialShare(product.prodName, product.category, product.subCate, product.price, product.image)"></button>
             <button [ngClass]="checkFavStatus(product.prodId)" (click)="changeFav(product.prodId)"></button>
             <button class="cart" [disabled]="!disCart" (click)="buyNow(product,0)"></button>
         </div>

src/app/productdetail/productdetail.page.ts

-import { Component, OnInit } from "@angular/core";
-import { Location } from "@angular/common";
-import { Router, ActivatedRoute } from "@angular/router";
-import { Products } from "./../../config/services/product";
-import { Slides } from "./../../config/services/slides";
-
-import { Order } from "./../../config/services/order";
-import { CartsService } from "./../../config/cart.service";
-import { ProductsService } from "./../../config/products.service";
-import { ServiceService } from "./../../config/service.service";
-import { SocialSharing } from "@ionic-native/social-sharing/ngx";
-import { map } from "rxjs/operators";
+import { Component, OnInit } from '@angular/core';
+import { Location } from '@angular/common';
+import { Router, ActivatedRoute } from '@angular/router';
+import { Products } from './../../config/services/product';
+import { Slides } from './../../config/services/slides';
+
+import { Order } from './../../config/services/order';
+import { CartsService } from './../../config/cart.service';
+import { ProductsService } from './../../config/products.service';
+import { ServiceService } from './../../config/service.service';
+import { SocialSharing } from '@ionic-native/social-sharing/ngx';
+import { map } from 'rxjs/operators';
+
 
 @Component({
-  selector: "app-productdetail",
-  templateUrl: "./productdetail.page.html",
-  styleUrls: ["./productdetail.page.scss"]
+  selector: 'app-productdetail',
+  templateUrl: './productdetail.page.html',
+  styleUrls: ['./productdetail.page.scss']
 })
 export class ProductdetailPage implements OnInit {
-  disCart: boolean = true;
+  disCart = true;
   slide: Slides;
   product: Products;
   order: Order;
@@ -56,7 +57,7 @@ export class ProductdetailPage implements OnInit {
       params.subCate,
       params.prodId
     );
-    this.service.get("params").then(val => {
+    this.service.get('params').then(val => {
       this.data = val;
     });
     this.cartService.cartList();
@@ -73,6 +74,10 @@ export class ProductdetailPage implements OnInit {
     this.getProd(params);
   }
 
+  unEscape(text: string) {
+    return unescape(text);
+  }
+
   getProd(params) {
     if (params) {
       let slideItem = [];
@@ -133,9 +138,9 @@ export class ProductdetailPage implements OnInit {
   buyNow(product: any, type: number) {
     this.cartService.buyNow(product).then(() => {
       if (type === 1) {
-        this.router.navigateByUrl("cart");
+        this.router.navigateByUrl('cart');
       } else {
-        this.service.showToast("Added into cart", "top", "my-toast", 2000);
+        this.service.showToast('Added into cart', 'top', 'my-toast', 2000);
       }
       this.cartService.cartList();
     });
@@ -147,32 +152,32 @@ export class ProductdetailPage implements OnInit {
 
   checkFavStatus(index) {
     const state = this.prodService.fav.findIndex(x => x === index);
-    return state > -1 ? "fav_active" : "fav";
+    return state > -1 ? 'fav_active' : 'fav';
   }
 
   changeFav(index) {
-    this.prodService.changeFav(index, "yes");
+    this.prodService.changeFav(index, 'yes');
     const state = this.prodService.fav.findIndex(x => x === index);
     // console.log(state);
     // console.log(this.prodService.fav);
     if (state > -1) {
       this.prodService.fav.splice(state, 1);
-      this.prodService.changeFav(index, "yes");
+      this.prodService.changeFav(index, 'yes');
     } else {
       this.prodService.fav.push(index);
-      this.prodService.changeFav(index, "no");
+      this.prodService.changeFav(index, 'no');
     }
     return;
     // console.log(this.prodService.fav);
   }
 
   socialShare(prodName, category, subCate, price, image) {
-    const desc = category + ", " + subCate + ", " + price;
+    const desc = category + ', ' + subCate + ', ' + price;
     const content = {
       message: desc, // not supported on some apps (Facebook, Instagram)
       subject: prodName, // fi. for email
       files: image,
-      chooserTitle: "GetMi"
+      chooserTitle: 'GetMi'
     };
     this.socialSharing.shareWithOptions(content);
   }

src/app/productlist/productlist.page.html

@@ -3,22 +3,10 @@
     <img src="../assets/Group17_2.png" />
   </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"
-    (click)="clickSearch()"
-  ></button>
-  <button
-    class="nav_btn nav_close floatRight"
-    *ngIf="searchShow"
-    (click)="searchClose()"
-  ></button>
+  <button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="clickSearch()"></button>
+  <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
   <div class="clear"></div>
 </div>
 <ion-content>
@@ -26,11 +14,7 @@
     <div class="product_taskbar">
       <div class="filter floatLeft" (click)="istoggle()"></div>
       <div class="viewset floatRight">
-        <div
-          class="grid_view grid_act floatRight"
-          (click)="gridToggle()"
-          [class.line_view]="onGrid"
-        ></div>
+        <div class="grid_view grid_act floatRight" (click)="gridToggle()" [class.line_view]="onGrid"></div>
         <div class="clear"></div>
       </div>
       <div class="clear"></div>
@@ -38,30 +22,18 @@
     <div class="product_title" *ngIf="data">
       {{data.shopName}}
     </div>
-    <ul
-      [class.grid_view]="onGrid"
-      *ngIf="prodService.product && prodService.product.length > 0"
-    >
+    <ul [class.grid_view]="onGrid" *ngIf="prodService.product && prodService.product.length > 0">
       <li *ngFor="let product of prodService.product; let i = index">
         <div class="product_image">
           <div class="load-back">
-            <img
-              [src]="product.image"
-              onerror="this.src='../assets/[email protected]'"
-              (click)="prodDetails(i)"
-            />
+            <img [src]="product.image" onerror="this.src='../assets/[email protected]'" (click)="prodDetails(i)" />
           </div>
-          <div
-            [ngClass]="checkFavStatus(product.prodId)"
-            (click)="changeFav(product.prodId)"
-          ></div>
+          <div [ngClass]="checkFavStatus(product.prodId)" (click)="changeFav(product.prodId)"></div>
           <div class="featured_badge" *ngIf="product.featured">Featured</div>
         </div>
-        <h5 class="ellipse" (click)="prodDetails(i)">{{product.prodName}}</h5>
+        <h5 class="ellipse" (click)="prodDetails(i)" [innerHTML]="unEscape(product.prodName)"></h5>
         <p (click)="prodDetails(i)">
-          A$ {{product.price}}<span class="offer" *ngIf="product.discount > 0"
-            >-{{product.discount}}%</span
-          >
+          A$ {{product.price}}<span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span>
         </p>
       </li>
     </ul>
@@ -110,47 +82,23 @@
                     <label for="styled-checkbox-2">Relevence</label>
                 </li> -->
         <li>
-          <input
-            class="styled-checkbox"
-            id="styled-checkbox-1"
-            type="radio"
-            value="newest"
-            name="sort"
-            (click)="setValue($event.target.value)"
-          />
+          <input class="styled-checkbox" id="styled-checkbox-1" type="radio" value="newest" name="sort"
+            (click)="setValue($event.target.value)" />
           <label for="styled-checkbox-1">Newest First</label>
         </li>
         <li>
-          <input
-            class="styled-checkbox"
-            id="styled-checkbox-5"
-            type="radio"
-            value="a-z"
-            name="sort"
-            (click)="setValue($event.target.value)"
-          />
+          <input class="styled-checkbox" id="styled-checkbox-5" type="radio" value="a-z" name="sort"
+            (click)="setValue($event.target.value)" />
           <label for="styled-checkbox-5">Name A - Z</label>
         </li>
         <li>
-          <input
-            class="styled-checkbox"
-            id="styled-checkbox-3"
-            type="radio"
-            value="low"
-            name="sort"
-            (click)="setValue($event.target.value)"
-          />
+          <input class="styled-checkbox" id="styled-checkbox-3" type="radio" value="low" name="sort"
+            (click)="setValue($event.target.value)" />
           <label for="styled-checkbox-3">Price Low - High</label>
         </li>
         <li>
-          <input
-            class="styled-checkbox"
-            id="styled-checkbox-4"
-            type="radio"
-            value="high"
-            name="sort"
-            (click)="setValue($event.target.value)"
-          />
+          <input class="styled-checkbox" id="styled-checkbox-4" type="radio" value="high" name="sort"
+            (click)="setValue($event.target.value)" />
           <label for="styled-checkbox-4">Price High - Low</label>
         </li>
 
@@ -174,4 +122,4 @@
       <div></div>
     </div>
   </div>
-</ion-content>
+</ion-content>
\ No newline at end of file

src/app/productlist/productlist.page.ts

@@ -63,7 +63,7 @@ export class ProductlistPage implements OnInit {
     });
   }
 
-  ngOnInit() {}
+  ngOnInit() { }
 
   ionViewWillEnter() {
     console.log('logged');
@@ -89,6 +89,10 @@ export class ProductlistPage implements OnInit {
     window.history.back();
   }
 
+  unEscape(text: string) {
+    return unescape(text);
+  }
+
   gridToggle() {
     this.onGrid = !this.onGrid;
   }

src/app/searchmodal/searchmodal.page.html

 <div class="nav_header">
   <button class="nav_btn nav_back floatLeft" (click)="closeModal()"></button>
   <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()"
+      (input)="searchFun($event.target.value)" #searchText />
   </div>
   <button class="nav_btn nav_close floatRight" (click)="closeModal()"></button>
   <div class="clear"></div>
 </div>
 <div class="search_item_list">
   <ul *ngIf="searchService.searchList">
-    <li
-      *ngFor="let search of searchService.searchList"
-      (click)="viewPage(search)"
-    >
-      {{search.text}}
+    <li *ngFor="let search of searchService.searchList" (click)="viewPage(search)">{{unEscape(search.text)}}
     </li>
   </ul>
-</div>
+</div>
\ No newline at end of file

src/app/searchmodal/searchmodal.page.ts

@@ -19,7 +19,7 @@ export class SearchmodalPage implements OnInit {
     public service: ServiceService,
     private productsService: ProductsService,
     private router: Router
-  ) {}
+  ) { }
 
   ngOnInit() {
     this.searchService.searchList = [];
@@ -69,5 +69,11 @@ export class SearchmodalPage implements OnInit {
     this.searchShow = false;
   }
 
+  unEscape(text: string) {
+    return unescape(text);
+  }
+
+
+
 
 }

src/app/signup/signup.page.ts

@@ -28,7 +28,7 @@ export class SignupPage implements OnInit {
   currDate = new Date();
   mobnumPattern = '(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,10}';
   minDate: any;
-  signup: Signup  = {
+  signup: Signup = {
     emailId: '',
     name: '',
     password: '',
@@ -48,8 +48,8 @@ export class SignupPage implements OnInit {
     this.currDate.setFullYear(this.currDate.getFullYear() - 10);
     console.log(this.currDate);
     const month = this.currDate.getMonth() + 1 < 10 ? '0' + (this.currDate.getMonth() + 1) : '' + (this.currDate.getMonth() + 1),
-    day = this.currDate.getDate() < 10 ? '0' + this.currDate.getDate() : this.currDate.getDate(),
-    year = this.currDate.getFullYear();
+      day = this.currDate.getDate() < 10 ? '0' + this.currDate.getDate() : this.currDate.getDate(),
+      year = this.currDate.getFullYear();
     this.minDate = [year, month, day].join('-');
   }
 
@@ -57,7 +57,7 @@ export class SignupPage implements OnInit {
   }
 
   goToPage(path, data = null) {
-    this.router.navigateByUrl(path, { queryParams: data });
+    this.router.navigateByUrl(path, { replaceUrl: true, queryParams: data });
     document.body.scrollTop = document.documentElement.scrollTop = 0;
   }
 

src/app/verification/verification.page.ts

@@ -21,7 +21,7 @@ export class VerificationPage implements OnInit {
   }
 
   goToPage(path, data = null) {
-    this.router.navigateByUrl(path, { queryParams: data });
+    this.router.navigateByUrl(path, { replaceUrl: true, queryParams: data });
     document.body.scrollTop = document.documentElement.scrollTop = 0;
   }
 

src/config/address.service.ts

@@ -11,7 +11,7 @@ import { Address, AddressList } from './services/address';
 })
 export class AddressService {
   addressList: AddressList[] = [];
-  constructor(public afs: AngularFirestore) {}
+  constructor(public afs: AngularFirestore) { }
 
   public async addList(userId: string) {
     const This = this;
@@ -62,25 +62,35 @@ export class AddressService {
       });
   }
 
-  setDefaultAddress(addId: string, userId: string) {
+
+  changeAddress(data: Address, orderId) {
+    console.log(data);
     this.afs
-      .collection('address', ref => ref.where('uid', '==', userId))
-      .get()
-      .forEach(item => {
-        return item.docs.map(m => {
-          return this.afs.doc(`address/${m.id}`).update({ defaultVal: 0 });
-        });
-      });
-    setTimeout(() => {
-      console.log(addId);
+      .collection('orders').doc(orderId).update({ deliveryAddress: data });
+  }
+
+  async setDefaultAddress(addId: string, userId: string) {
+    return await new Promise(resolve => {
       this.afs
-        .collection('address')
-        .doc(addId)
-        .update({ defaultVal: 1 })
-        .then(() => {
-          console.log('Address updated Successfully');
+        .collection('address', ref => ref.where('uid', '==', userId))
+        .get()
+        .forEach(item => {
+          return item.docs.map(m => {
+            return this.afs.doc(`address/${m.id}`).update({ defaultVal: 0 });
+          });
         });
-    }, 1000);
+      setTimeout(() => {
+        console.log(addId);
+        this.afs
+          .collection('address')
+          .doc(addId)
+          .update({ defaultVal: 1 })
+          .then(() => {
+            resolve(true);
+            console.log('Address updated Successfully');
+          });
+      }, 1000);
+    });
   }
 
   deleteAddress(addId: string) {

src/config/center.service.ts

-import { Injectable } from "@angular/core";
+import { Injectable } from '@angular/core';
 import {
   AngularFirestore,
   AngularFirestoreDocument,
   AngularFirestoreCollection
-} from "@angular/fire/firestore";
-import { Centers, CenterData } from "./services/center";
-import * as firebase from "firebase";
+} from '@angular/fire/firestore';
+import { Centers, CenterData } from './services/center';
+import * as firebase from 'firebase';
 
 @Injectable({
-  providedIn: "root"
+  providedIn: 'root'
 })
 export class CenterService {
   centers: Centers[] = [];
@@ -22,8 +22,8 @@ export class CenterService {
     const This = this;
     const state = true;
     const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
-      "centers",
-      ref => ref.where("featured", "==", state).where("status", "==", state)
+      'centers',
+      ref => ref.where('featured', '==', state).where('status', '==', state)
     );
     orderRef.valueChanges().subscribe(value => {
       this.centers = [];
@@ -72,12 +72,12 @@ export class CenterService {
       greaterLon
     );
     const orderRef: AngularFirestoreCollection<any> = this.afs.collection(
-      "centers",
+      'centers',
       ref =>
         ref
-          .where("latLng", ">", lesserGeopoint)
-          .where("latLng", "<", greaterGeopoint)
-          .where("status", "==", state)
+          .where('latLng', '>', lesserGeopoint)
+          .where('latLng', '<', greaterGeopoint)
+          .where('status', '==', state)
     );
     orderRef.valueChanges().subscribe(value => {
       this.nearcenters = [];

src/config/myorder.service.ts

@@ -95,7 +95,7 @@ export class MyordersService {
 
   public async orderList(custId) {
     // console.log('called');
-    // console.log(custId);
+    console.log(custId);
     const This = this;
     this.orders = [];
     const orderRef: AngularFirestoreCollection<any> = this.afs.collection(

src/config/order.service.ts

@@ -32,10 +32,11 @@ export class OrdersService {
     this.size = 'small';
     this.color = 'Blue';
     this.custId = '';
-    this.service.get('user').then(data => {
+    this.service.get('userData').then(data => {
       if (data) {
         data = JSON.parse(data);
         this.users = data;
+        console.log(this.users);
         this.custId = data.uid;
         // console.log(this.custId);
       } else {
@@ -132,15 +133,15 @@ export class OrdersService {
     // console.log(cartCount);
     const promise = new Promise(resolve => {
       distinctShops.forEach(item => {
-        // console.log(item);
+        console.log(item);
         this.afs
           .collection('orders')
           .add({
+            shopper: firebase.firestore().doc('/shoppers/' + item),
             bookDate: firebase.firestore.FieldValue.serverTimestamp()
           })
           .then(docRef => {
             const neworderId = docRef.id;
-            const delivery = new firebase.firestore.GeoPoint(10.0237, 76.3116);
             const pickup = new firebase.firestore.GeoPoint(10.7231, 76.1234);
             const products = {};
             const cartItem = cartGroup[item];
@@ -162,19 +163,20 @@ export class OrdersService {
             // console.log(cartItem);
             // console.log(products);
             const product = cartItem[0];
+            this.custId = this.custId.trim();
             const orderItem: Order = {
               amount: 'A$ ' + otherCharge.totalAmt,
               customer: firebase.firestore().doc('/customer/' + this.custId),
               shopper: product.shopper,
               deliveryAddress: otherCharge.custAddress,
               deliveryCharge: 'A$ ' + otherCharge.deliveryCharge,
-              deliveryLocation: delivery,
+              deliveryLocation: otherCharge.custAddress.latLng,
               bookDate: firebase.firestore.FieldValue.serverTimestamp(),
               orderDate: Math.floor(Date.now() / 1000),
               orderCode: this.orderCode(),
               orderId: neworderId,
               orderStatus: 1,
-              pickupAddress: 'GetMi, Canberra, AUS',
+              pickupAddress: '',
               pickupLocation: pickup,
               promoId: null,
               rider: firebase
@@ -184,10 +186,10 @@ export class OrdersService {
               custId: this.custId,
               riderId: 'qbTKza18mWVzYG9NLIbmjMbrYjG2',
               shopperId: product.shopperId,
-              custName: 'Jone Doe',
+              custName: 'Customer',
               riderName: 'John',
               shopperState: 0,
-              shopperName: 'Witchery',
+              shopperName: '',
               product: products,
               discount: 'A$ ' + otherCharge.discount,
               promoApplied: otherCharge.discountApplied,

src/config/products.service.ts

@@ -154,7 +154,7 @@ export class ProductsService {
             brand: item.brand,
             category: item.category,
             shopperId: item.shopperId,
-            color: item.color,
+            color: this.service.splitSep(item.color),
             discount: item.discount,
             featured: item.featured,
             image: item.image,

src/config/safehtml.ts

+import { Pipe, PipeTransform } from '@angular/core';
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
+
+@Pipe({ name: 'sanitizeHtml'})
+
+export class sanitizeHtmlPipe implements PipeTransform  {
+
+  constructor(private _sanitizer:DomSanitizer) { }
+
+  transform(value:string):SafeHtml {    
+    value = value.replace("�", "'");
+    console.log(value);
+    return this._sanitizer.bypassSecurityTrustHtml(value);
+  }
+}
\ No newline at end of file

src/config/search.service.ts

@@ -12,7 +12,7 @@ import { take } from 'rxjs/operators';
 })
 export class SearchService {
   searchList: Search[] = [];
-  constructor(public afs: AngularFirestore) {}
+  constructor(public afs: AngularFirestore) { }
 
   public async search(inputText: string) {
     if (inputText === '') {
@@ -77,7 +77,7 @@ export class SearchService {
 
     // tslint:disable-next-line:max-line-length
     const feaRef: AngularFirestoreCollection<any> = this.afs.collection(
-      'category',
+      'shopcategory',
       ref =>
         ref
           .where('status', '==', state)

src/config/services/shopper.ts

@@ -4,6 +4,7 @@ export interface Shopper {
   phone: string;
   caption: string;
   profilePhoto: string;
+  location: any;
   status: boolean;
   uid: string;
   shopName: string;

src/config/shopper.service.ts

@@ -48,6 +48,7 @@ export class ShoppersService {
             workingHours: item.workingHours,
             caption: item.caption,
             centre: item.centre,
+            location: item.location,
             rate: item.rate,
             centerId: item.centerId
           };
@@ -88,6 +89,7 @@ export class ShoppersService {
             workingHours: item.workingHours,
             caption: item.caption,
             centre: item.centre,
+            location: item.location,
             rate: item.rate,
             centerId: item.centerId
           };
@@ -147,6 +149,7 @@ export class ShoppersService {
             workingHours: item.workingHours,
             caption: item.caption,
             centre: item.centre,
+            location: item.location,
             rate: item.rate,
             centerId: item.centerId
           };

src/config/user.service.ts

-import { Injectable } from "@angular/core";
-import { AngularFireAuth } from "@angular/fire/auth";
+import { Injectable } from '@angular/core';
+import { AngularFireAuth } from '@angular/fire/auth';
 import {
   AngularFirestore,
   AngularFirestoreDocument,
   AngularFirestoreCollection
-} from "@angular/fire/firestore";
-import * as firebase from "firebase";
-import { User } from "./services/user";
+} from '@angular/fire/firestore';
+import * as firebase from 'firebase';
+import { User } from './services/user';
 
 @Injectable({
-  providedIn: "root"
+  providedIn: 'root'
 })
 
 // Gets User Details
 export class UserService {
   users: User;
-  constructor(public afs: AngularFirestore, public afAuth: AngularFireAuth) {}
+  constructor(public afs: AngularFirestore, public afAuth: AngularFireAuth) { }
 
   public async getUserData(userId: string) {
     const This = this;
@@ -23,8 +23,8 @@ export class UserService {
 
     // Get User Query
     const userRef: AngularFirestoreCollection<any> = this.afs.collection(
-      "customers",
-      ref => ref.where("uid", "==", userId).where("status", "==", state)
+      'customers',
+      ref => ref.where('uid', '==', userId).where('status', '==', state)
     );
     userRef.valueChanges().subscribe(value => {
       const res = value;
@@ -40,11 +40,11 @@ export class UserService {
           phoneVerified: item.phoneVerified,
           emailVerified: item.emailVerified,
           loginType: 0,
-          otp: "",
+          otp: '',
           currency: {
-            currId: "",
-            currName: "",
-            symbol: ""
+            currId: '',
+            currName: '',
+            symbol: ''
           }
         };
       }

src/index.html

@@ -6,7 +6,6 @@
     <title>Ionic App</title>
 
     <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="format-detection" content="telephone=no" />
     <meta name="msapplication-tap-highlight" content="no" />