diff --git a/bookie/src/app/sales/bill.service.ts b/bookie/src/app/sales/bill.service.ts
index 3fa8d43..e49b1ba 100644
--- a/bookie/src/app/sales/bill.service.ts
+++ b/bookie/src/app/sales/bill.service.ts
@@ -33,6 +33,7 @@ export class BillService {
const view = this.bill.kots.map(k => {
return [{
isKot: true,
+ oldKot: true,
info: `Kot: ${k.code} / ${k.date} (${k.user.name}) `
}, ...k.inventories.map(i => {
return {
@@ -186,14 +187,6 @@ export class BillService {
);
}
- amount() {
- return math.round(this.bill.kots.reduce(
- (ka: number, k: Kot) => ka + k.inventories.reduce(
- (ca: number, c: Inventory) => ca + ((c.isHappyHour ? 0 : c.price) * c.quantity * (1 - c.discount) * (1 + c.taxRate))
- , 0)
- , 0))
- }
-
type() {
return this.bill.voucherType;
}
@@ -203,4 +196,36 @@ export class BillService {
tap(x => console.log(x))
);
}
+
+ netAmount() {
+ return math.round(this.bill.kots.reduce(
+ (ka: number, k: Kot) => ka + k.inventories.reduce(
+ (ca: number, c: Inventory) => ca + ((c.isHappyHour ? 0 : c.price) * c.quantity)
+ , 0)
+ , 0))
+ }
+
+ discountAmount() {
+ return math.round(this.bill.kots.reduce(
+ (ka: number, k: Kot) => ka + k.inventories.reduce(
+ (ca: number, c: Inventory) => ca + ((c.isHappyHour ? 0 : c.price) * c.quantity * c.discount)
+ , 0)
+ , 0))
+ }
+
+ taxAmount() {
+ return math.round(this.bill.kots.reduce(
+ (ka: number, k: Kot) => ka + k.inventories.reduce(
+ (ca: number, c: Inventory) => ca + ((c.isHappyHour ? 0 : c.price) * c.quantity * (1 - c.discount) * c.taxRate)
+ , 0)
+ , 0))
+ }
+
+ amount() {
+ return math.round(this.bill.kots.reduce(
+ (ka: number, k: Kot) => ka + k.inventories.reduce(
+ (ca: number, c: Inventory) => ca + ((c.isHappyHour ? 0 : c.price) * c.quantity * (1 - c.discount) * (1 + c.taxRate))
+ , 0)
+ , 0))
+ }
}
diff --git a/bookie/src/app/sales/bills/bills.component.css b/bookie/src/app/sales/bills/bills.component.css
index 154032d..bc29553 100644
--- a/bookie/src/app/sales/bills/bills.component.css
+++ b/bookie/src/app/sales/bills/bills.component.css
@@ -1,13 +1,49 @@
-.kot {
- background-color: lightblue;
-}
-
-.printed {
- background-color: lightpink;
-}
-
.square-button {
min-width: 150px;
max-width: 150px;
min-height: 150px;
}
+
+.right-align {
+ display: flex;
+ justify-content: flex-end;
+}
+
+table {
+ width: 100%;
+}
+
+.grey900 {
+ background-color: #1b5e20;
+ color: #ffffff;
+}
+
+.grey700 {
+ background-color: #388e3c;
+ color: #ffffff;
+}
+
+.grey500 {
+ background-color: #4caf50;
+ color: #000000;
+}
+
+.grey300 {
+ background-color: #81c784;
+ color: #000000;
+}
+
+.blue400 {
+ background-color: #42a5f5;
+ color: #000000;
+}
+
+.blue800 {
+ background-color: #1565c0;
+ color: #ffffff;
+}
+
+.red100 {
+ background-color: #ffcdd2;
+ color: #000000;
+}
diff --git a/bookie/src/app/sales/bills/bills.component.html b/bookie/src/app/sales/bills/bills.component.html
index a9ab087..0a76d6e 100644
--- a/bookie/src/app/sales/bills/bills.component.html
+++ b/bookie/src/app/sales/bills/bills.component.html
@@ -1,12 +1,16 @@
Bill
+
+ home
+ Main Menu
+
-
+
-
+
{{row.info}}
@@ -14,11 +18,12 @@
{{m.name}}
+ Amount
Quantity
-
+
@@ -35,11 +40,34 @@
assignment
+ {{ amount() | currency: 'INR' }}
+
+
+ Net
+
+
+ {{ netAmount() | currency: 'INR' }}
+
+
+ Discount
+
+
+ {{ discountAmount() | currency: 'INR' }}
+
+
+ Tax
+
+
+ {{ taxAmount() | currency: 'INR' }}
-
-
-
+
+
+
+
+
+
diff --git a/bookie/src/app/sales/bills/bills.component.ts b/bookie/src/app/sales/bills/bills.component.ts
index 80b2957..70fb40e 100644
--- a/bookie/src/app/sales/bills/bills.component.ts
+++ b/bookie/src/app/sales/bills/bills.component.ts
@@ -62,4 +62,20 @@ export class BillsComponent implements OnInit {
modifier(item: any): void {
this.bs.modifier(item);
}
+
+ netAmount(): number {
+ return this.bs.netAmount();
+ }
+
+ discountAmount(): number {
+ return this.bs.discountAmount();
+ }
+
+ taxAmount(): number {
+ return this.bs.taxAmount();
+ }
+
+ amount(): number {
+ return this.bs.amount();
+ }
}