From b70b01b72667c115ea6614d762bc4cf1d5ce2451 Mon Sep 17 00:00:00 2001
From: tanshu <git@tanshu.com>
Date: Fri, 18 Dec 2020 13:24:50 +0530
Subject: [PATCH] Back to table / product group order changed to have the back
 button in the beginning The bill now highlights the happy hour products.

---
 bookie/src/app/sales/bills/bills.component.css |  8 ++++++++
 .../src/app/sales/bills/bills.component.html   |  4 +++-
 .../menu-categories.component.html             | 18 +++++++++---------
 .../app/sales/products/products.component.html | 18 +++++++++---------
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/bookie/src/app/sales/bills/bills.component.css b/bookie/src/app/sales/bills/bills.component.css
index 90bcba2..4abbb0f 100644
--- a/bookie/src/app/sales/bills/bills.component.css
+++ b/bookie/src/app/sales/bills/bills.component.css
@@ -67,3 +67,11 @@ table {
   background-color: #b39ddb;
   color: #000000;
 }
+
+.yellow300 {
+  background-color: #fff176;
+}
+
+.yellow-for-hh-printed {
+  background-color: #f7ca18;
+}
diff --git a/bookie/src/app/sales/bills/bills.component.html b/bookie/src/app/sales/bills/bills.component.html
index d9d0988..73ca130 100644
--- a/bookie/src/app/sales/bills/bills.component.html
+++ b/bookie/src/app/sales/bills/bills.component.html
@@ -173,7 +173,9 @@
         *matRowDef="let row; columns: displayedColumns"
         [class.blue400]="row.isOldKot"
         [class.blue800]="row.isNewKot"
-        [class.red100]="row.isPrinted"
+        [class.red100]="row.isPrinted && !row.isHappyHour"
+        [class.yellow300]="row.isHappyHour && !row.isPrinted"
+        [class.yellow-for-hh-printed]="row.isPrinted && row.isHappyHour"
       ></mat-row>
       <mat-footer-row *matFooterRowDef="['net-title', 'net-amount']"></mat-footer-row>
       <mat-footer-row *matFooterRowDef="['discount-title', 'discount-amount']"></mat-footer-row>
diff --git a/bookie/src/app/sales/menu-categories/menu-categories.component.html b/bookie/src/app/sales/menu-categories/menu-categories.component.html
index 91762d7..e58b6a8 100644
--- a/bookie/src/app/sales/menu-categories/menu-categories.component.html
+++ b/bookie/src/app/sales/menu-categories/menu-categories.component.html
@@ -1,5 +1,14 @@
 <mat-card>
   <mat-card-content fxLayout="row wrap" fxLayoutGap="grid 20px">
+    <mat-card
+      fxLayout="column"
+      class="square-button warn"
+      matRipple
+      [routerLink]="['../']"
+      queryParamsHandling="preserve"
+    >
+      <h3 class="item-name">Back</h3>
+    </mat-card>
     <mat-card
       fxLayout="column"
       class="square-button"
@@ -10,14 +19,5 @@
     >
       <h3 class="item-name">{{ item.name }}</h3>
     </mat-card>
-    <mat-card
-      fxLayout="column"
-      class="square-button warn"
-      matRipple
-      [routerLink]="['../']"
-      queryParamsHandling="preserve"
-    >
-      <h3 class="item-name">Back</h3>
-    </mat-card>
   </mat-card-content>
 </mat-card>
diff --git a/bookie/src/app/sales/products/products.component.html b/bookie/src/app/sales/products/products.component.html
index 2a6a638..3cdf6e5 100644
--- a/bookie/src/app/sales/products/products.component.html
+++ b/bookie/src/app/sales/products/products.component.html
@@ -1,5 +1,14 @@
 <mat-card>
   <mat-card-content fxLayout="row wrap" fxLayoutGap="grid 20px">
+    <mat-card
+      fxLayout="column"
+      class="square-button red700"
+      matRipple
+      [routerLink]="['../../menu-categories']"
+      queryParamsHandling="preserve"
+    >
+      <h3 class="item-name">Back</h3>
+    </mat-card>
     <mat-card
       fxLayout="column"
       class="square-button"
@@ -12,14 +21,5 @@
       <h3 class="item-name">{{ item.name }}</h3>
       <mat-card-subtitle class="center">{{ item.price | currency: 'INR' }}</mat-card-subtitle>
     </mat-card>
-    <mat-card
-      fxLayout="column"
-      class="square-button red700"
-      matRipple
-      [routerLink]="['../../menu-categories']"
-      queryParamsHandling="preserve"
-    >
-      <h3 class="item-name">Back</h3>
-    </mat-card>
   </mat-card-content>
 </mat-card>