latest changes

src/app/app.component.html

@@ -3,7 +3,8 @@
         <ion-menu>
             <ion-content>
                 <div class="side_menu_wrapper">
-                    <div class="top_banner" (click)="vieworder('profile')">
+                    <ion-menu-toggle>
+                    <div class="top_banner">
                         <div class="top_image">
 
                         </div>
@@ -13,6 +14,7 @@
                         </div>
                         <div class="clear"></div>
                     </div>
+                    </ion-menu-toggle>
                     <div class="sidemenu_list">
                         <ul>
                             <ion-menu-toggle>

src/app/home/home.page.html

@@ -10,7 +10,7 @@
     </div>
     <button class="nav_btn nav_search floatRight" *ngIf="!searchShow">
     </button>
-    <button class="nav_btn nav_exit floatRight" *ngIf="searchShow" (click)="searchClose()">
+    <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()">
     </button>
     <div class="clear"></div>
 </div>

src/app/myorder/myorder.page.html

@@ -15,7 +15,7 @@
                     <button class="order_track floatRight" *ngIf="order.orderStatus >= 3 && order.orderStatus < 7" (click)="orderDetails(i)">Track Order</button>
                     <div class="clear"></div>
                 </div>
-                <div *ngFor="let product of order.product">
+                <div *ngFor="let product of order.product" (click)="viewOrder(order)">
                         <div class="order_image"><img [src]="product.image" onerror="" /></div>
                         <div class="order_detail">
                             <h5 class="floatLeft">{{product.prodName}}</h5>

src/app/myorder/myorder.page.ts

@@ -4,6 +4,7 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { MyordersService } from './../../config/myorder.service';
 import { ModalController } from '@ionic/angular';
 import { DeliverypopPage } from '../deliverypop/deliverypop.page';
+import { ServiceService } from './../../config/service.service';
 
 @Component({
   selector: 'app-myorder',
@@ -18,7 +19,8 @@ export class MyorderPage implements OnInit {
     private route: ActivatedRoute,
     private location: Location,
     public myorder: MyordersService,
-    public modalController: ModalController
+    public modalController: ModalController,
+    public service: ServiceService
   ) { }
 
   ngOnInit() {
@@ -59,6 +61,13 @@ export class MyorderPage implements OnInit {
     }
   }
 
+  viewOrder(data) {
+    console.log(data);
+    this.service.set('order', data);
+    this.router.navigateByUrl('orderplaced', { queryParams: data });
+    document.body.scrollTop = document.documentElement.scrollTop = 0;
+  }
+
   getStatus(status: number) {
     switch (status) {
       case 1:

src/app/nearby/nearby.page.html

 <div class="nav_header">
-    <button class="nav_btn nav_back floatLeft" (click)="goBack()">
+    <button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="type === 0">
     <img src="../assets/Group17_2.png">
   </button>
     <div class="nav_title floatLeft">

src/app/nearby/nearby.page.ts

@@ -25,6 +25,7 @@ export class NearbyPage implements OnInit {
   addressData = new Address('', '', '', '', true, '', 0, '');
   successState: boolean;
   uid: string;
+  type: any;
   public searchElementRef: ElementRef;
 
   constructor(
@@ -37,12 +38,17 @@ export class NearbyPage implements OnInit {
     public service: ServiceService
   ) {
     this.successState = false;
+    this.type = 0;
     const users = this.service.get('user').then((data) => {
       if (data) {
         data = JSON.parse(data);
         this.uid = data.uid;
       }
     });
+
+    this.service.get('type').then((data) => {
+      this.type = data;
+    });
   }
 
   ngOnInit() {
@@ -118,6 +124,10 @@ export class NearbyPage implements OnInit {
     this.successState = true;
     setTimeout(() => {
       this.successState = false;
+      if (this.type === 1) {
+        this.service.set('type', 0);
+        this.router.navigateByUrl('home', { queryParams: null });
+      }
     }, 3000);
   }
 }

src/app/orderplaced/orderplaced.page.html

 <ion-content>
-    <div class="cart_wrapper">
+    <div class="cart_wrapper" *ngIf="data">
         <div class="cart_head">
             <div class="nav_header">
                 <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
@@ -14,16 +14,16 @@
             </div>
             <img src="../assets/white_tick.png">
             <h4>ORDER IS PLACED</h4>
-            <p>June 26th 2019, 03:00 PM</p>
+            <p>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</p>
         </div>
         <div class="order_status">
 
             <div class="clear"></div>
             <div class="status_div go_green">
                 <h4>Order Placed</h4>
-                <h6>June 26th 2019, 03:00PM</h6>
+                <h6>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</h6>
             </div>
-            <div class="status_gap go_green">
+            <!-- <div class="status_gap go_green">
             </div>
             <div class="status_div go_green">
                 <h4>Retailer Accepted</h4>
@@ -55,7 +55,7 @@
             </div>
             <div class="status_div">
                 <h4>Your product is delivered</h4>
-            </div>
+            </div> -->
         </div>
         <div class="nearby_shop_list">
             <ul>
@@ -65,8 +65,8 @@
                     </div>
                     <div class="nearby_detail">
                         <h5>
-                            <span class="floatLeft">Carnival Life</span>
-                            <span class="floatRight">4
+                            <span class="floatLeft">{{data.shopperName}}</span>
+                            <span class="floatRight">0
                      <img src="../assets/Path61_2.png">
                    </span>
                             <div class="clear"></div>
@@ -77,20 +77,20 @@
                 </li>
             </ul>
         </div>
-        <div class="product_detail">
-            <h6>Green, Small</h6>
-            <h5>Quantity : <span>3</span></h5>
-            <h5>Amount : <strong>AU$99.00</strong><span class="afterpay">After Pay</span></h5>
+        <div class="product_detail" *ngFor="let product of data.product">
+            <h6>{{product.color}}, {{product.size}}</h6>
+            <h5>Quantity : <span>{{product.qty}}</span></h5>
+            <h5>Amount : <strong>A$ {{product.price}}</strong><span class="afterpay">COD</span></h5>
             <h5>Delivery time : <span>Delivery in 1 hour</span></h5>
             <h4>DELIVERY</h4>
             <h5>
-                Shamjith KS<br> +00 0000 888 888<br> Carnival InfoparkInfopark Kochi<br> 682030, Kerala, India
+                {{deliveryAddress}}
             </h5>
             <button class="cancel_btn" (click)="goToPage('ordercancelled')">CANCEL THIS ORDER</button>
             <hr>
         </div>
 
-        <div class="related_product_slider">
+        <!-- <div class="related_product_slider">
             <h5>
                 <span class="floatLeft">Related Products</span><span class="floatRight">MORE</span>
                 <div class="clear"></div>
@@ -144,6 +144,6 @@
                     </ion-slide>
                 </ion-slides>
             </ul>
-        </div>
+        </div> -->
     </div>
 </ion-content>
\ No newline at end of file

src/app/orderplaced/orderplaced.page.ts

 import { Component, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
 import { Router, ActivatedRoute } from '@angular/router';
+import { ServiceService } from './../../config/service.service';
 
 @Component({
   selector: 'app-orderplaced',
@@ -8,12 +9,18 @@ import { Router, ActivatedRoute } from '@angular/router';
   styleUrls: ['./orderplaced.page.scss'],
 })
 export class OrderplacedPage implements OnInit {
-
+  data: any;
   constructor(
     private router: Router,
     private route: ActivatedRoute,
-    private location: Location
-  ) { }
+    private location: Location,
+    private service: ServiceService
+  ) {
+    this.service.get('order').then(val => {
+      this.data = val;
+    });
+
+  }
 
   ngOnInit() {
   }

src/app/productdetail/productdetail.page.html

@@ -14,14 +14,24 @@
         <div class="product_banner">
             <div [ngClass]="checkFavStatus(product.prodId)" (click)="changeFav(product.prodId)"></div>
             <div class="featured_badge" *ngIf="product.featured">Featured</div>
+            <ion-slides pager="true" [options]="bannerOptions">
+                <ion-slide>
+                    <img [src]="product.image" onerror="this.src='../assets/[email protected]'">
+                </ion-slide>
+                <ion-slide>
+                    <img [src]="product.image" onerror="this.src='../assets/[email protected]'">
+                </ion-slide>
+                <ion-slide>
                     <img [src]="product.image" onerror="this.src='../assets/[email protected]'">
+                </ion-slide>
+            </ion-slides>
         </div>
         <div class="product_header">
             <ion-row>
                 <ion-col size="8">
                     <h3>{{product.prodName}}</h3>
                     <p><strong><span><img src="../assets/Path61_2.png"></span>0</strong>&nbsp; {{product.category}}, {{product.subCate}}
-                        <br/>
+                        <br />
                         <span *ngFor="let tag of product.tag">#{{tag}}&nbsp;</span>
                     </p>
                 </ion-col>
@@ -41,7 +51,8 @@
                             <li>
                                 <button id="custom_check_button">
                                     <label>
-                                    <input id="{{color}}" type="radio" name="color" value="{{color}}" (click)="cartService.choose_color(color)" [checked]="i==0">
+                                        <input id="{{color}}" type="radio" name="color" value="{{color}}"
+                                            (click)="cartService.choose_color(color)" [checked]="i==0">
                                         <p>{{color}}</p>
                                     </label>
                                 </button>
@@ -58,7 +69,8 @@
                             <li>
                                 <button id="custom_check_button">
                                     <label>
-                                <input id="{{size}}" type="radio" name="services" value="{{size}}" (click)="cartService.choose_size(size)" [checked]="i==0">
+                                        <input id="{{size}}" type="radio" name="services" value="{{size}}"
+                                            (click)="cartService.choose_size(size)" [checked]="i==0">
                                         <p>{{size}}</p>
                                     </label>
                                 </button>
@@ -202,7 +214,8 @@
                             <li (click)="viewProd(similar)">
                                 <div class="product_image">
                                     <img [src]="similar.image" onerror="this.src='../assets/[email protected]'">
-                                    <div [ngClass]="checkFavStatus(similar.prodId)" (click)="changeFav(similar.prodId)"></div>
+                                    <div [ngClass]="checkFavStatus(similar.prodId)" (click)="changeFav(similar.prodId)">
+                                    </div>
                                 </div>
                                 <h5>{{similar.prodName}}</h5>
                                 <p>{{similar.price}}</p>

src/app/productdetail/productdetail.page.scss

@@ -13,6 +13,7 @@
             position: absolute;
             top: 15px;
             right: 15px;
+            z-index: 2;
         }
         .fav_fill {
             width: 30px;
@@ -24,6 +25,7 @@
             position: absolute;
             top: 15px;
             right: 15px;
+            z-index: 2;
         }
         .featured_badge {
             position: absolute;
@@ -35,6 +37,7 @@
             padding-left: 5px;
             padding-right: 5px;
             font-size: 13px;
+            z-index: 2;
         }
         img {
             width: 100%;

src/app/productdetail/productdetail.page.ts

@@ -11,12 +11,18 @@ import { map } from 'rxjs/operators';
 @Component({
   selector: 'app-productdetail',
   templateUrl: './productdetail.page.html',
-  styleUrls: ['./productdetail.page.scss'],
+  styleUrls: ['./productdetail.page.scss']
 })
 export class ProductdetailPage implements OnInit {
   product: Products;
   order: Order;
   data: any;
+
+  bannerOptions = {
+    slidesPerView: 1,
+    speed: 2000,
+    autoplay: true
+  };
   slideOpts = {
     slidesPerView: 3.5
   };
@@ -35,8 +41,13 @@ export class ProductdetailPage implements OnInit {
   ) {
     const params = this.prodService.selItem;
     this.service.state = true;
-    this.prodService.similarProd(params.shopperId, params.category, params.subCate, params.prodId);
-    this.service.get('params').then((val) => {
+    this.prodService.similarProd(
+      params.shopperId,
+      params.category,
+      params.subCate,
+      params.prodId
+    );
+    this.service.get('params').then(val => {
       this.data = val;
     });
     this.cartService.cartList();
@@ -132,5 +143,4 @@ export class ProductdetailPage implements OnInit {
     return;
     console.log(this.prodService.fav);
   }
-
 }

src/config/auth.service.ts

@@ -63,6 +63,7 @@ export class AuthService {
     custRef.valueChanges().pipe(take(1)).subscribe((value: User[]) => {
       if (value.length > 0) {
         this.afs.collection('customers').doc(this.userData.uid).update({otp: ''});
+        this.service.set('type', 1);
         this.router.navigateByUrl('nearby');
       } else {
         window.alert('Please input valid OTP');

src/config/cart.service.ts

@@ -29,7 +29,7 @@ export class CartsService {
   ) {
     this.custId = '';
     this.carts = [];
-    const users = this.service.get('user').then((data) => {
+    const users = this.service.get('user').then(data => {
       if (data) {
         data = JSON.parse(data);
         this.custId = data.uid;
@@ -40,20 +40,33 @@ export class CartsService {
 
   public async buyNow(product: Products) {
     this.prodId = product.prodId;
-    const prodRef = firebase.firestore().collection('products').doc(this.prodId);
+    const prodRef = firebase
+      .firestore()
+      .collection('products')
+      .doc(this.prodId);
 
     this.size = this.size === undefined ? product.size[0] : this.size;
     this.color = this.color === undefined ? product.color[0] : this.color;
 
-    const cartRef: AngularFirestoreCollection<any> = this.afs.collection('carts', ref => ref.where('size', '==', this.size)
+    const cartRef: AngularFirestoreCollection<any> = this.afs.collection(
+      'carts',
+      ref =>
+        ref
+          .where('size', '==', this.size)
           .where('color', '==', this.color)
           .where('custId', '==', this.custId)
           .where('product', '==', prodRef)
     );
-    cartRef.valueChanges().pipe(take(1)).subscribe((value) => {
+    cartRef
+      .valueChanges()
+      .pipe(take(1))
+      .subscribe(value => {
         console.log(value);
         if (value.length === 0) {
-        product.image = product.image === undefined ? '../assets/[email protected]' : product.image;
+          product.image =
+            product.image === undefined
+              ? '../assets/[email protected]'
+              : product.image;
           const cart: Cart = {
             color: this.color,
             custId: this.custId,
@@ -68,13 +81,21 @@ export class CartsService {
             size: this.size
           };
           console.log(cart);
-        this.afs.collection('carts').add(cart).then((docRef) => {
+          this.afs
+            .collection('carts')
+            .add(cart)
+            .then(docRef => {
               const neworderId = docRef.id;
-          this.afs.collection('carts').doc(neworderId).update({cartId: docRef.id}).then(() => {
+              this.afs
+                .collection('carts')
+                .doc(neworderId)
+                .update({ cartId: docRef.id })
+                .then(() => {
                   console.log('Booking Successfully');
                   document.body.scrollTop = document.documentElement.scrollTop = 0;
                 });
-        }).catch((error) => {
+            })
+            .catch(error => {
               console.error('Error adding document: ', error);
             });
         } else {
@@ -83,7 +104,11 @@ export class CartsService {
           const cartId = value[0].cartId;
           // tslint:disable-next-line:radix
           const qty = parseInt(value[0].qty) + 1;
-        this.afs.collection('carts').doc(cartId).update({qty: `${qty}`}).then(() => {
+          this.afs
+            .collection('carts')
+            .doc(cartId)
+            .update({ qty: `${qty}` })
+            .then(() => {
               console.log('Booking Successfully');
               document.body.scrollTop = document.documentElement.scrollTop = 0;
             });
@@ -92,13 +117,16 @@ export class CartsService {
   }
 
   public async cartList() {
-    const cartRef: AngularFirestoreCollection<any> = this.afs.collection('carts', ref => ref.where('custId', '==', this.custId));
-    cartRef.valueChanges().subscribe((value) => {
+    const cartRef: AngularFirestoreCollection<any> = this.afs.collection(
+      'carts',
+      ref => ref.where('custId', '==', this.custId)
+    );
+    cartRef.valueChanges().subscribe(value => {
       this.carts = [];
       const res = value;
       this.cartTotal = 0;
       if (res.length > 0) {
-        res.forEach((item) => {
+        res.forEach(item => {
           const cartItem: CartItem = {
             cartId: item.cartId,
             color: item.color,
@@ -109,7 +137,7 @@ export class CartsService {
             prodName: item.prodName,
             image: item.image,
             qty: item.qty,
-            size: item.size,
+            size: item.size
           };
           console.log(item.price, item.qty);
           if (item.price) {
@@ -142,26 +170,37 @@ export class CartsService {
 
   removeCount(index) {
     // tslint:disable-next-line:radix
-    const qty = this.carts[index].qty > 1 ?  this.carts[index].qty - 1 : this.carts[index].qty;
+    const qty =
+      this.carts[index].qty > 1
+        ? this.carts[index].qty - 1
+        : this.carts[index].qty;
     this.carts[index].qty = qty;
     console.log(this.carts[index].qty);
-    this.afs.collection('carts').doc(this.carts[index].cartId).update({
+    this.afs
+      .collection('carts')
+      .doc(this.carts[index].cartId)
+      .update({
         qty: this.carts[index].qty
       });
-
   }
 
   addCount(index) {
     const qty = this.carts[index].qty + 1;
     this.cartTotal = 0;
     this.carts[index].qty = qty;
-    this.afs.collection('carts').doc(this.carts[index].cartId).update({
+    this.afs
+      .collection('carts')
+      .doc(this.carts[index].cartId)
+      .update({
         qty: this.carts[index].qty
       });
   }
 
   removeItem(index) {
-    this.afs.collection('carts').doc(this.carts[index].cartId).delete();
+    this.afs
+      .collection('carts')
+      .doc(this.carts[index].cartId)
+      .delete();
   }
 
   checkPromo(promoCode: string) {

src/config/myorder.service.ts

@@ -102,6 +102,7 @@ export class MyordersService {
             bookDate: item.bookDate,
             deliveryLocation: item.deliveryLocation,
             pickupLocation: item.pickupLocation,
+            deliveryAddress: item.deliveryAddress,
             riderName: 'John',
             orderId: item.orderId,
             orderCode: item.orderCode,

src/config/services/myorder.ts

@@ -3,6 +3,7 @@ export interface Myorder {
     bookDate: any;
     pickupLocation: any;
     deliveryLocation: any;
+    deliveryAddress: any;
     status: number;
     orderStatus: number;
     riderName: string;

src/global.scss

@@ -141,6 +141,30 @@ button {
     }
 }
 
+.product_banner {
+    ion-slides {
+        .swiper-pagination-bullets {
+            left: auto;
+            width: auto;
+            right: 15px;
+            bottom: 15px;
+        }
+        .swiper-pagination {
+            .swiper-pagination-bullet {
+                background-color: #fff;
+                width: 14px;
+                height: 3px;
+                border-radius: 0px;
+                opacity: 1;
+                margin: 0px;
+            }
+            .swiper-pagination-bullet-active {
+                background-color: rgba(41, 37, 81, 1);
+            }
+        }
+    }
+}
+
 
 /*-------------------------------
 
@@ -513,6 +537,14 @@ app-deliverypop {
     }
 }
 
+.nav_close {
+    background-image: url("./assets/close.png");
+    img {
+        width: 25px;
+        display: none;
+    }
+}
+
 .nav_cart {
     background-image: url("./assets/cart_icon.png");
     img {