| @@ -78,7 +78,7 @@ | |||||
| </div> | </div> | ||||
| <ion-button shape="round" [disabled]="userCart.orderedlist.length === 0" expand="block" | <ion-button shape="round" [disabled]="userCart.orderedlist.length === 0" expand="block" | ||||
| class="pay-button" (click)="requestInvoice()"> Pay Now </ion-button> | |||||
| class="pay-button" (click)="requestInvoice();"> Pay Now </ion-button> | |||||
| <div class="common-semi-modal filter-holder with-border" [ngClass]="{'active' : show_promocodes }"> | <div class="common-semi-modal filter-holder with-border" [ngClass]="{'active' : show_promocodes }"> | ||||
| <header> | <header> | ||||
| @@ -6,7 +6,7 @@ | |||||
| <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: {{ userOrder.orders_id }} </div> | |||||
| <div class="heading"> Order ID: {{ order.orderedlist_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> | ||||
| @@ -39,22 +39,24 @@ export class OrdersComponent implements OnInit { | |||||
| } | } | ||||
| reOrder(orderedlist: any) { | 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); | |||||
| for (let i = 0; i < orderedlist.length; i += 1) { | |||||
| for (let j = 0; j < orderedlist[i].menuitems.length; j += 1) { | |||||
| this.userCart.orderedlist.push({ | |||||
| mall_id: orderedlist[i].mall_id, | |||||
| outlet_id: orderedlist[i].outlet_id, | |||||
| menuitem_id: orderedlist[i].menuitems[j].menuitem_id, | |||||
| quantity: orderedlist[i].menuitems[j].item_quantity, | |||||
| pickup_time: orderedlist[i].pickup_time, | |||||
| take_away: true, | |||||
| order_status: null, | |||||
| total_price: orderedlist[i].total_price, | |||||
| soft_delete: false, | |||||
| }); | |||||
| } | |||||
| } | |||||
| localStorage.userCart = JSON.stringify(this.userCart); | |||||
| this.router.navigate(['/cart']); | |||||
| console.log(this.userCart); | |||||
| } | } | ||||
| } | } | ||||