| @@ -1,12 +1,12 @@ | |||||
| <div class="heading-holder"> | <div class="heading-holder"> | ||||
| <div class="name"> MY ORDERS </div> | <div class="name"> MY ORDERS </div> | ||||
| <ion-button fill="clear"> SORT / FILTER </ion-button> | |||||
| <!-- <ion-button fill="clear"> SORT / FILTER </ion-button> --> | |||||
| </div> | </div> | ||||
| <ul class="orders"> | <ul class="orders"> | ||||
| <li *ngFor="let userOrder of userOrders" class="order" (click)="selected_order = order"> | <li *ngFor="let userOrder of userOrders" class="order" (click)="selected_order = order"> | ||||
| <div class="order-mall" *ngFor="let order of userOrder.orderedlist"> | <div class="order-mall" *ngFor="let order of userOrder.orderedlist"> | ||||
| <div class="heading"> Order ID: {{ order.orderedlist_id }} </div> | |||||
| <div class="heading"> Order ID: {{ userOrder.orders_id }} </div> | |||||
| <div class="time-details"> | <div class="time-details"> | ||||
| Pickup on {{ getFormattedDate(order.pickup_time, 'DD MMMM YYYY @ hh:mm A') }} | Pickup on {{ getFormattedDate(order.pickup_time, 'DD MMMM YYYY @ hh:mm A') }} | ||||
| </div> | </div> | ||||
| @@ -40,7 +40,7 @@ | |||||
| </p> | </p> | ||||
| <div class="action-buttons-holder"> | <div class="action-buttons-holder"> | ||||
| <ion-button shape="round"> Reorder </ion-button> | |||||
| <ion-button shape="round" (click)="reOrder(userOrder.orderedlist)"> Reorder </ion-button> | |||||
| <ion-button shape="round" fill="outline" (click)="show_rate_modal = true"> Rate & Review </ion-button> | <ion-button shape="round" fill="outline" (click)="show_rate_modal = true"> Rate & Review </ion-button> | ||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| @@ -1,6 +1,8 @@ | |||||
| import { Component, OnInit } from '@angular/core'; | import { Component, OnInit } from '@angular/core'; | ||||
| import { OrderService } from '../services/order.service'; | import { OrderService } from '../services/order.service'; | ||||
| import * as moment from 'moment'; | import * as moment from 'moment'; | ||||
| import { ICart } from '../cart/cart.page'; | |||||
| import { Router } from '@angular/router'; | |||||
| @Component({ | @Component({ | ||||
| selector: 'app-orders', | selector: 'app-orders', | ||||
| @@ -13,9 +15,13 @@ export class OrdersComponent implements OnInit { | |||||
| selected_rating: number = 0; | selected_rating: number = 0; | ||||
| userInfo: any; | userInfo: any; | ||||
| show_rate_modal: boolean = false; | show_rate_modal: boolean = false; | ||||
| userCart: ICart = { | |||||
| orderedlist: [] | |||||
| }; | |||||
| constructor( | constructor( | ||||
| private orderService: OrderService, | |||||
| private orderService: OrderService, | |||||
| private router: Router | |||||
| ) { } | ) { } | ||||
| ngOnInit() { | ngOnInit() { | ||||
| @@ -30,6 +36,25 @@ export class OrdersComponent implements OnInit { | |||||
| getFormattedDate(date, format) { | getFormattedDate(date, format) { | ||||
| return moment(date).format(format); | return moment(date).format(format); | ||||
| } | |||||
| } | |||||
| reOrder(orderedlist: any) { | |||||
| // for (let i = 0; i < orderedlist.length; i += 1) { | |||||
| // this.userCart.orderedlist.push({ | |||||
| // mall_id: orderedlist[i].mall_id, | |||||
| // outlet_id: orderedlist[i].mall_id, | |||||
| // menuitem_id: '', | |||||
| // quantity: '', | |||||
| // pickup_time: string, | |||||
| // take_away: true, | |||||
| // order_status: false, | |||||
| // total_price: 0, | |||||
| // soft_delete: false, | |||||
| // }) | |||||
| // } | |||||
| // localStorage.userCart = JSON.stringify(this.userCart); | |||||
| // this.router.navigate(['/cart']); | |||||
| // console.log(this.userCart); | |||||
| } | |||||
| } | } | ||||
| @@ -2,16 +2,18 @@ | |||||
| <section class="profile"> | <section class="profile"> | ||||
| <div class="profile-details-holder"> | <div class="profile-details-holder"> | ||||
| <figure class="profile-image"> | <figure class="profile-image"> | ||||
| <img src="assets/custom/name.svg" alt=""> | |||||
| </figure> | </figure> | ||||
| <div class="content"> | <div class="content"> | ||||
| <h5> {{ userInfo.name }} | <h5> {{ userInfo.name }} | ||||
| <ion-button fill="clear" color="light" size="small"> Edit </ion-button> | |||||
| <button fill="clear" color="light"> Edit </button> | |||||
| </h5> | </h5> | ||||
| <ul class="contact"> | |||||
| <li> {{ userInfo.mobile }} </li> | |||||
| <li> {{ userInfo.email }} </li> | |||||
| </ul> | |||||
| <p> | |||||
| {{ userInfo.mobile }} | |||||
| </p> | |||||
| <p> | |||||
| {{ userInfo.email }} | |||||
| </p> | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <div class="location-details"> | <div class="location-details"> | ||||
| @@ -11,13 +11,19 @@ | |||||
| align-items: stretch; | align-items: stretch; | ||||
| justify-content: space-between; | justify-content: space-between; | ||||
| border-bottom: 1px solid var(--brand-blue); | border-bottom: 1px solid var(--brand-blue); | ||||
| padding-bottom: 15px; | |||||
| padding-bottom: 5px; | |||||
| .profile-image { | .profile-image { | ||||
| width: 40px; | width: 40px; | ||||
| height: 40px; | height: 40px; | ||||
| border-radius: 50%; | border-radius: 50%; | ||||
| background-color: white; | |||||
| background-color: transparent; | |||||
| img { | |||||
| width: 100%; | |||||
| height: 100%; | |||||
| } | |||||
| } | } | ||||
| h5 { | h5 { | ||||
| @@ -26,29 +32,26 @@ | |||||
| display: flex; | display: flex; | ||||
| align-items: center; | align-items: center; | ||||
| justify-content: space-between; | justify-content: space-between; | ||||
| ion-button { | |||||
| margin: 0; | |||||
| font-size: 10px; | |||||
| position: relative; | |||||
| button { | |||||
| position: absolute; | |||||
| right: 0; | |||||
| top: 0; | |||||
| font-size: 14px; | |||||
| color: white; | |||||
| background-color: transparent; | |||||
| border: 1px solid white; | |||||
| border-radius: 5px; | |||||
| width: 50px; | |||||
| height: 35px; | |||||
| } | } | ||||
| } | } | ||||
| .contact { | |||||
| padding: 0; | |||||
| margin: 10px 0 0; | |||||
| font-size: 10px; | |||||
| display: flex; | |||||
| justify-content: space-between; | |||||
| flex-wrap: wrap; | |||||
| width: 90%; | |||||
| li { | |||||
| width: 48%; | |||||
| } | |||||
| li:first-child { | |||||
| list-style: none; | |||||
| } | |||||
| p { | |||||
| font-size: 12px; | |||||
| width: 100%; | |||||
| margin: 10px auto; | |||||
| } | } | ||||
| .content { | .content { | ||||