From 5cd0acc7a940c949e7e3ba1dd01e5ae275b7ca63 Mon Sep 17 00:00:00 2001
From: tanshu <git@tanshu.com>
Date: Mon, 5 Jul 2021 08:29:15 +0530
Subject: [PATCH] Feature: Added Happy Hour Discount in the bill display and
 changed Net amount to Gross Amount. Changed the color of running / printed
 tables to a brighter colors.

---
 .../guest-book-list.component.css             |  4 ++--
 bookie/src/app/sales/bill.service.ts          | 18 +++++++++++----
 .../src/app/sales/bills/bills.component.html  | 23 ++++++++++++++-----
 .../running-tables.component.css              |  4 ++--
 .../tables-dialog/tables-dialog.component.css |  4 ++--
 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/bookie/src/app/guest-book/guest-book-list/guest-book-list.component.css b/bookie/src/app/guest-book/guest-book-list/guest-book-list.component.css
index d78addf..5ac280b 100644
--- a/bookie/src/app/guest-book/guest-book-list/guest-book-list.component.css
+++ b/bookie/src/app/guest-book/guest-book-list/guest-book-list.component.css
@@ -3,11 +3,11 @@
 }
 
 .running {
-  background-color: #f8cbad;
+  background-color: #f53d24;
   color: #000000;
 }
 
 .printed {
-  background-color: #c6e0b4;
+  background-color: #00f518;
   color: #000000;
 }
diff --git a/bookie/src/app/sales/bill.service.ts b/bookie/src/app/sales/bill.service.ts
index dd69ee6..10bd60b 100644
--- a/bookie/src/app/sales/bill.service.ts
+++ b/bookie/src/app/sales/bill.service.ts
@@ -26,8 +26,9 @@ import { ModifiersComponent } from './modifiers/modifiers.component';
 export class BillService {
   public dataObs: BehaviorSubject<BillViewItem[]>;
   public bill: Bill = new Bill();
-  public netAmount: BehaviorSubject<number>;
+  public grossAmount: BehaviorSubject<number>;
   public discountAmount: BehaviorSubject<number>;
+  public hhAmount: BehaviorSubject<number>;
   public taxAmount: BehaviorSubject<number>;
   public amount: Observable<number>;
   public amountVal: number;
@@ -44,8 +45,9 @@ export class BillService {
     private modifierCategoryService: ModifierCategoryService,
   ) {
     this.dataObs = new BehaviorSubject<BillViewItem[]>([]);
-    this.netAmount = new BehaviorSubject(0);
+    this.grossAmount = new BehaviorSubject(0);
     this.discountAmount = new BehaviorSubject(0);
+    this.hhAmount = new BehaviorSubject(0);
     this.taxAmount = new BehaviorSubject(0);
     this.amountBs = new BehaviorSubject(0);
     this.amountVal = 0;
@@ -292,11 +294,19 @@ export class BillService {
   }
 
   updateAmounts() {
-    this.netAmount.next(
+    this.grossAmount.next(
+      this.math.halfRoundEven(
+        this.bill.kots.reduce(
+          (t, k) => k.inventories.reduce((a, c) => a + c.price * c.quantity, 0) + t,
+          0,
+        ),
+      ),
+    );
+    this.hhAmount.next(
       this.math.halfRoundEven(
         this.bill.kots.reduce(
           (t, k) =>
-            k.inventories.reduce((a, c) => a + (c.isHappyHour ? 0 : c.price) * c.quantity, 0) + t,
+            k.inventories.reduce((a, c) => a + (c.isHappyHour ? c.price : 0) * c.quantity, 0) + t,
           0,
         ),
       ),
diff --git a/bookie/src/app/sales/bills/bills.component.html b/bookie/src/app/sales/bills/bills.component.html
index f1bcc11..51facf9 100644
--- a/bookie/src/app/sales/bills/bills.component.html
+++ b/bookie/src/app/sales/bills/bills.component.html
@@ -45,7 +45,7 @@
         <mat-header-cell *matHeaderCellDef class="deep-purple-50 bold right-align"
           ><button>Table: {{ bs.bill.table.name }}</button> /
           <button (click)="choosePax()">{{ bs.bill.pax }} Pax</button> /
-          {{ bs.bill.customer?.name }}</mat-header-cell
+          <button>{{ bs.bill.customer?.name || 'Customer' }}</button></mat-header-cell
         >
       </ng-container>
 
@@ -134,12 +134,22 @@
           </button>
         </mat-cell>
       </ng-container>
-      <ng-container matColumnDef="net-title">
-        <mat-footer-cell *matFooterCellDef class="grey300 bold">Net</mat-footer-cell>
+      <ng-container matColumnDef="gross-title">
+        <mat-footer-cell *matFooterCellDef class="grey300 bold">Gross</mat-footer-cell>
       </ng-container>
-      <ng-container matColumnDef="net-amount">
+      <ng-container matColumnDef="gross-amount">
         <mat-footer-cell *matFooterCellDef class="grey300 bold right-align">{{
-          bs.netAmount | async | currency: 'INR'
+          bs.grossAmount | async | currency: 'INR'
+        }}</mat-footer-cell>
+      </ng-container>
+      <ng-container matColumnDef="hh-title">
+        <mat-footer-cell *matFooterCellDef class="grey300 bold"
+          >Happy Hour Discount</mat-footer-cell
+        >
+      </ng-container>
+      <ng-container matColumnDef="hh-amount">
+        <mat-footer-cell *matFooterCellDef class="grey300 bold right-align">{{
+          bs.hhAmount | async | currency: 'INR'
         }}</mat-footer-cell>
       </ng-container>
       <ng-container matColumnDef="discount-title">
@@ -178,7 +188,8 @@
         [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="['gross-title', 'gross-amount']"></mat-footer-row>
+      <mat-footer-row *matFooterRowDef="['hh-title', 'hh-amount']"></mat-footer-row>
       <mat-footer-row *matFooterRowDef="['discount-title', 'discount-amount']"></mat-footer-row>
       <mat-footer-row *matFooterRowDef="['tax-title', 'tax-amount']"></mat-footer-row>
       <mat-footer-row *matFooterRowDef="['amount-title', 'amount-amount']"></mat-footer-row>
diff --git a/bookie/src/app/sales/running-tables/running-tables.component.css b/bookie/src/app/sales/running-tables/running-tables.component.css
index d0d2fbd..d0d58a0 100644
--- a/bookie/src/app/sales/running-tables/running-tables.component.css
+++ b/bookie/src/app/sales/running-tables/running-tables.component.css
@@ -1,10 +1,10 @@
 .running {
-  background-color: #f8cbad;
+  background-color: #f53d24;
   color: #000000;
 }
 
 .printed {
-  background-color: #c6e0b4;
+  background-color: #00f518;
   color: #000000;
 }
 
diff --git a/bookie/src/app/sales/tables-dialog/tables-dialog.component.css b/bookie/src/app/sales/tables-dialog/tables-dialog.component.css
index cd69721..6ecd4b1 100644
--- a/bookie/src/app/sales/tables-dialog/tables-dialog.component.css
+++ b/bookie/src/app/sales/tables-dialog/tables-dialog.component.css
@@ -1,10 +1,10 @@
 .running {
-  background-color: #f8cbad;
+  background-color: #f53d24;
   color: #000000;
 }
 
 .printed {
-  background-color: #c6e0b4;
+  background-color: #00f518;
   color: #000000;
 }