Merge branch 'amal' into 'master'

src/app/app.component.html

@@ -17,7 +17,10 @@
                         <ul>
                             <li>Shop</li>
                             <li>About us</li>
-                            <li>Catagories</li>
+                            <ion-menu-toggle>
+                                <li (click)="vieworder('myorder')">View Order</li>
+                            </ion-menu-toggle>
+
                             <div class="sub_menu">
                                 <ul>
                                     <li>Men's Fashion</li>

src/app/app.component.ts

 import { Component } from '@angular/core';
-
+import { Router, ActivatedRoute } from '@angular/router';
 import { Platform } from '@ionic/angular';
 import { SplashScreen } from '@ionic-native/splash-screen/ngx';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
@@ -13,7 +13,8 @@ export class AppComponent {
   constructor(
     private platform: Platform,
     private splashScreen: SplashScreen,
-    private statusBar: StatusBar
+    private statusBar: StatusBar,
+    private router: Router
   ) {
     this.initializeApp();
   }
@@ -25,4 +26,11 @@ export class AppComponent {
       this.statusBar.overlaysWebView(false);
     });
   }
+
+
+
+  vieworder(path, data = null) {
+    this.router.navigateByUrl(path, { queryParams: data });
+    document.body.scrollTop = document.documentElement.scrollTop = 0;
+  }
 }

src/app/myorder/myorder.page.ts

@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
 import { Router, ActivatedRoute } from '@angular/router';
 import { MyordersService } from './../../config/myorder.service';
+import { ModalController } from '@ionic/angular';
+import { DeliverypopPage } from '../deliverypop/deliverypop.page';
 
 @Component({
   selector: 'app-myorder',
@@ -14,10 +16,19 @@ export class MyorderPage implements OnInit {
     private router: Router,
     private route: ActivatedRoute,
     private location: Location,
-    public myorder: MyordersService
+    public myorder: MyordersService,
+    public modalController: ModalController
   ) { }
 
   ngOnInit() {
+    this.finishpop();
+  }
+
+  async finishpop() {
+    const modal = await this.modalController.create({
+      component: DeliverypopPage
+    });
+    return await modal.present();
   }
 
   goToPage(path, data = null) {