kj1352
há 5 anos
2 ficheiros alterados com 61 adições e 68 eliminações
Visualização em 2 colunas
Opções das diferenças
+ 47
- 46
src/app/orders/orders.component.html
Ver ficheiro
| @@ -5,54 +5,55 @@ | |||
| <ul class="orders"> | |||
| <li *ngFor="let userOrder of userOrders" class="order"> | |||
| <div class="order-mall" *ngFor="let order of userOrder.orderedlist"> | |||
| <div class="heading"> Order ID: {{ order.orderedlist_id }} </div> | |||
| <div class="time-details"> | |||
| Pickup on {{ getFormattedDate(order.pickup_time, 'DD MMMM YYYY @ hh:mm A') }} | |||
| </div> | |||
| <div class="time-details"> | |||
| <p> | |||
| <strong>Mall:</strong> {{ order.mall_name }} | |||
| </p> | |||
| <p> | |||
| <strong>Outlet:</strong> {{ order.outlet_name }} | |||
| </p> | |||
| </div> | |||
| <div class="order-mall"> | |||
| <div class="heading"> Order ID: {{ userOrder.orders_id }} </div> | |||
| <ng-container *ngFor="let order of userOrder.orderedlist"> | |||
| <div class="time-details"> | |||
| Pickup on {{ getFormattedDate(order.pickup_time, 'DD MMMM YYYY @ hh:mm A') }} | |||
| </div> | |||
| <div class="time-details"> | |||
| <p> | |||
| <strong>Mall:</strong> {{ order.mall_name }} | |||
| </p> | |||
| <p> | |||
| <strong>Outlet:</strong> {{ order.outlet_name }} | |||
| </p> | |||
| </div> | |||
| <ul class="ordered-items"> | |||
| <li *ngFor="let item of order.menuitems"> | |||
| <div class="order-item-details"> | |||
| <label class="name"> {{ item.menu_item_name }} x {{ item.item_quantity }} </label> | |||
| </div> | |||
| </li> | |||
| </ul> | |||
| <ul class="ordered-items"> | |||
| <li> | |||
| <div class="order-item-details"> | |||
| <label class="name"> <strong> TOTAL </strong> </label> | |||
| <label class="time"> <strong> ₹ {{ order.total_price }} </strong> </label> | |||
| </div> | |||
| </li> | |||
| </ul> | |||
| <ul class="ordered-items"> | |||
| <li> | |||
| <div class="order-item-details"> | |||
| <label class="name"> {{ order.menuitems.menu_item_name }} x {{ order.quantity }} </label> | |||
| </div> | |||
| </li> | |||
| </ul> | |||
| <ul class="ordered-items"> | |||
| <li> | |||
| <div class="order-item-details"> | |||
| <label class="name"> <strong> TOTAL </strong> </label> | |||
| <label class="time"> <strong> ₹ {{ order.total_price }} </strong> </label> | |||
| </div> | |||
| </li> | |||
| </ul> | |||
| <ul class="ordered-items"> | |||
| <li> | |||
| <div class="order-item-details"> | |||
| <label class="name"> <strong> STATUS </strong> </label> | |||
| <label class="time"> <strong> {{ getOrderStatusName(userOrder.orderstatus.orderstatus_id) }} </strong> </label> | |||
| </div> | |||
| </li> | |||
| </ul> | |||
| </ng-container> | |||
| <p class="note"> | |||
| We will notify you each time a order is ready for pickup | |||
| </p> | |||
| <ul class="ordered-items"> | |||
| <li> | |||
| <div class="order-item-details"> | |||
| <label class="name"> <strong> STATUS </strong> </label> | |||
| <label class="time"> <strong> {{ getOrderStatusName(userOrder.orderstatus.orderstatus_id) }} </strong> </label> | |||
| </div> | |||
| </li> | |||
| </ul> | |||
| <p class="note"> | |||
| We will notify you each time a order is ready for pickup | |||
| </p> | |||
| <div class="action-buttons-holder"> | |||
| <ion-button shape="round" (click)="reOrder(userOrder.orderedlist)"> Reorder </ion-button> | |||
| <ion-button shape="round" fill="outline" (click)="selectedOrder = userOrder"> Rate & Review </ion-button> | |||
| </div> | |||
| </div> | |||
| <div class="action-buttons-holder"> | |||
| <ion-button shape="round" (click)="reOrder(userOrder.orderedlist)"> Reorder </ion-button> | |||
| <ion-button shape="round" fill="outline" (click)="selectedOrder = userOrder"> Rate & Review </ion-button> | |||
| </div> | |||
| </div> | |||
| </li> | |||
| </ul> | |||
+ 14
- 22
src/app/orders/orders.component.ts
Ver ficheiro
| @@ -36,20 +36,14 @@ export class OrdersComponent implements OnInit { | |||
| submitFeedbackForOrder() { | |||
| this.tempReview.app_user.user_id = this.userInfo.id; | |||
| this.selectedOrder.rating = this.tempReview; | |||
| console.log(this.selectedOrder); | |||
| this.orderService.updateOrder(this.selectedOrder).then(() => { | |||
| this.selectedOrder = null; | |||
| this.selectedOrder = null; | |||
| this.tempReview = { | |||
| app_user: { | |||
| user_id: null | |||
| }, | |||
| comment: '', | |||
| rating: null, | |||
| }; | |||
| }, () => { | |||
| this.toastService.presentToast("Failed to send review, please try again", "danger"); | |||
| }) | |||
| }; | |||
| } | |||
| ngOnInit() { | |||
| @@ -87,20 +81,18 @@ export class OrdersComponent implements OnInit { | |||
| reOrder(orderedlist: any) { | |||
| 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, | |||
| }); | |||
| } | |||
| } | |||
| this.userCart.orderedlist.push({ | |||
| mall_id: orderedlist[i].mall_id, | |||
| outlet_id: orderedlist[i].outlet_id, | |||
| menuitem_id: orderedlist[i].menuitems.menuitem_id, | |||
| quantity: orderedlist[i].quantity, | |||
| pickup_time: moment().add(moment.duration(orderedlist[i].menuitems.wait_duration).asMinutes(), 'minutes').format(), | |||
| 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); | |||