@@ -52,7 +66,7 @@
-
+
- -
-
-
-
- |
- KFC Bucket
- |
-
- Qty: 1
- |
-
- ₹ 250
- |
-
-
-
-
- Paid online
-
-
-
-
-
-
-
- -
+
-
-
-
- |
- KFC Bucket
- |
-
- Qty: 1
- |
-
- ₹ 250
- |
-
-
+
+ {{ item.menu_item_name }} x {{ item.quantity }} = ₹ {{ getFixedDecimalPoints(item.total_price) }}
+
-
- Paid online
-
-
-
-
-
-
-
- -
-
-
-
- |
- KFC Bucket
- |
-
- Qty: 1
- |
-
- ₹ 250
- |
-
-
-
-
- Paid online
-
-
diff --git a/src/app/orders/orders.component.scss b/src/app/orders/orders.component.scss
index 550fc9f..b1ce9b5 100644
--- a/src/app/orders/orders.component.scss
+++ b/src/app/orders/orders.component.scss
@@ -16,14 +16,12 @@
display: flex;
flex-grow: 1;
- app-custom-selector {
+ .selector {
margin: 0 10px;
flex-grow: 1;
@media screen and (max-width: 1023px) {
margin: 0;
- width: 45%;
- flex-grow: 0;
}
}
@@ -186,31 +184,13 @@
letter-spacing: 1px;
}
- table {
- padding: 10px 15px;
- width: 100%;
-
- td {
- font-size: 14px;
- color: var(--dark-grey);
- font-weight: 500;
- letter-spacing: 0.5px;
-
- &:nth-child(1) {
- width: 50%;
- }
-
- &:nth-child(2) {
- width: 25%;
- text-align: center;
- }
-
- &:nth-child(3) {
- width: 25%;
- text-align: right;
- }
- }
- }
+ .info {
+ font-size: 14px;
+ color: var(--dark-grey);
+ font-weight: 500;
+ letter-spacing: 0.5px;
+ padding: 10px 15px;
+ }
.order-status-holder {
background-color: #efefef;
@@ -223,6 +203,17 @@
justify-content: space-between;
align-items: center;
+ .status {
+
+ &.success {
+ color: green;
+ }
+
+ &.failed {
+ color: red;
+ }
+ }
+
.action-buttons {
display: flex;
width: auto;
diff --git a/src/app/orders/orders.component.ts b/src/app/orders/orders.component.ts
index 8e84d1c..539294f 100644
--- a/src/app/orders/orders.component.ts
+++ b/src/app/orders/orders.component.ts
@@ -1,5 +1,4 @@
-import { Component, OnInit } from '@angular/core';
-import { IFilterOption } from '../models/filter-option';
+import { Component, OnInit, Input } from '@angular/core';
import { OrderService } from '../services/order.service';
import * as moment from 'moment';
@@ -9,26 +8,54 @@ import * as moment from 'moment';
styleUrls: ['./orders.component.scss']
})
export class OrdersComponent implements OnInit {
- statusOptions: Array ;
- dateOptions: Array;
showRejectionPopup: boolean = false;
orderList: any = [];
+ tempOrderList: any = [];
orderStatus: any = [];
+ searchTerm: string = '';
+ showFilter: boolean = false;
+ filterOption: {
+ orderStatus: string,
+ orderstatus_id: number
+ } = {
+ orderStatus: 'All',
+ orderstatus_id: 0
+ };
+
+ @Input() params: any;
constructor(
private orderService: OrderService
) { }
ngOnInit() {
- this.statusOptions = [{
- name: 'All',
- id: 'all'
- }];
-
- this.dateOptions = [{
- name: 'Today',
- id: 'today'
- }];
+ if (this.params) {
+ try {
+ switch(this.params.filterType) {
+ case 'pending': this.filterOption = {
+ orderStatus: 'Pending',
+ orderstatus_id: 6
+ }; break;
+ case 'delivered': this.filterOption = {
+ orderStatus: 'Delivered',
+ orderstatus_id: 3
+ }; break;
+ case 'confirmed': this.filterOption = {
+ orderStatus: 'Accepted',
+ orderstatus_id: 1
+ }; break;
+ default: this.filterOption = {
+ orderStatus: 'All',
+ orderstatus_id: 0
+ }; break;
+ }
+ } catch {
+ this.filterOption = {
+ orderStatus: 'All',
+ orderstatus_id: 0
+ };
+ }
+ }
this.orderService.getOrders().then((data) => {
this.orderList = data;
@@ -36,13 +63,21 @@ export class OrdersComponent implements OnInit {
this.orderList = this.orderList.filter((order) => {
return order.orderstatus;
});
+
+ this.tempOrderList = this.orderList.filter((order) => {
+ return order.orderstatus;
+ });
}, () => {
alert("Error getting the orders");
});
- this.orderService.getallOrderStatus().then((data) => {
- console.log(data);
+ this.orderService.getallOrderStatus().then((data: any) => {
this.orderStatus = data;
+
+ this.orderStatus.push({
+ orderStatus: 'All',
+ orderstatus_id: 0
+ });
}, () => {
alert("Error getting the order statuses");
});
@@ -71,4 +106,20 @@ export class OrdersComponent implements OnInit {
})
}
+ getFilteredOrders(id: number, orders?: any) {
+ if (id > 0) {
+ return this.tempOrderList.filter((order) => {
+ return order.orderstatus.orderstatus_id === id;
+ });
+ } else {
+ return this.tempOrderList;
+ }
+ }
+
+ searchOrders() {
+ this.tempOrderList = this.orderList.filter((order: any) => {
+ return order.orders_id.toString().toLowerCase().includes(this.searchTerm.toLowerCase());
+ });
+ }
+
}
diff --git a/src/app/widgets-holder/widgets-holder.component.html b/src/app/widgets-holder/widgets-holder.component.html
index 183135b..f4d47af 100644
--- a/src/app/widgets-holder/widgets-holder.component.html
+++ b/src/app/widgets-holder/widgets-holder.component.html
@@ -5,7 +5,7 @@
(click)="selected_nav = 'faq'"> FAQ's
Support
-
+
@@ -21,37 +21,37 @@
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
|