Receive payment working.

TODO: Nested subscribe in Receive Payment in sales-home-component.ts should be refactored into something more readable.

barker/models/voucher.py

@@ -191,7 +191,7 @@ class Voucher(Base):
 
     @property
     def amount(self):
-        return sum(i.amount for k in self.kots for i in k.inventories)
+        return round(sum(i.amount for k in self.kots for i in k.inventories), 2)
 
 
 class Kot(Base):

barker/routes.py

@@ -393,7 +393,6 @@ def includeme(config):
     config.add_route("sa_tax", "/SaleAnalysis/Tax.json")
 
     config.add_route("voucher_reprint", "/ReprintVoucher/{id}.json")
-    config.add_route("voucher_settle", "/Settle/{id}.json")
     config.add_route("voucher_split", "/Split/{id}.json")
     config.add_route("voucher_void", "/Void/{id}.json")
 

barker/views/voucher/__init__.py

@@ -12,9 +12,7 @@ def get_tax(tax, voucher_type):
 
 
 def get_settlements(voucher, dbsession):
-    amount = round(
-        -1 * sum(sum(i.amount for i in k.inventories) for k in voucher.kots), 5
-    )
+    amount = voucher.amount
     so_amount = [s for s in voucher.settlements if s.settled == SettleOption.AMOUNT()]
     if len(so_amount) == 1:
         so_amount[0].amount = amount

barker/views/voucher/receive_payment.py

@@ -0,0 +1,60 @@
+import uuid
+from decimal import Decimal
+
+import transaction
+from pyramid.view import view_config
+
+from barker.models import SettleOption, Voucher, Settlement, Overview
+from barker.models.validation_exception import ValidationError
+from barker.views.voucher.show import voucher_info
+
+
+@view_config(
+    request_method="POST",
+    route_name="v1_vouchers_id",
+    renderer="json",
+    request_param="r",
+    permission="Settle Bill",
+    trans=False,
+)
+def receive_payment(request):
+    update_table = request.GET["u"]
+    json = request.json_body
+    for item in json:
+        item["amount"] = round(Decimal(item["amount"]), 0)
+    id_ = uuid.UUID(request.matchdict["id"])
+    item = request.dbsession.query(Voucher).filter(Voucher.id == id_).first()
+
+    total_amount = item.amount
+    json.append({"id": SettleOption.AMOUNT(), "amount": -total_amount})
+    round_off = round(total_amount) - total_amount
+    if round_off != 0:
+        json.append({"id": SettleOption.ROUND_OFF(), "amount": -round_off})
+    if sum([i["amount"] for i in json]) != 0:
+        raise ValidationError("Payment received is not equal to bill amount")
+
+    for i in (j for j in json if j["amount"] != 0):
+        amount = i["amount"]
+        settlement_type_id = i["id"]
+        old = [s for s in item.settlements if s.settled == settlement_type_id]
+        if len(old) == 1:
+            old[0].amount = amount
+        else:
+            s = Settlement(item.id, settlement_type_id, amount)
+            item.settlements.append(s)
+            request.dbsession.add(s)
+
+    allowed = [a["id"] for a in json if a["amount"] != 0]
+    for i in (s for s in item.settlements if s.settled not in allowed):
+        item.settlements.remove(i)
+        request.dbsession.delete(i)
+
+    if update_table:
+        request.dbsession.query(Overview).filter(
+            Overview.voucher_id == item.id
+        ).delete()
+    transaction.commit()
+    item = request.dbsession.query(Voucher).filter(Voucher.id == item.id).first()
+    return voucher_info(item)
+
+

barker/views/voucher/settle.py

@@ -1,53 +0,0 @@
-import uuid
-
-import transaction
-from pyramid.view import view_config
-
-from barker.models import SettleOption, Voucher, Settlement, Overview
-from barker.views.voucher import get_settlements
-from barker.views.voucher.show import voucher_info
-
-
-@view_config(
-    request_method="POST",
-    route_name="voucher_settle",
-    renderer="json",
-    permission="Settle Bill",
-    trans=False,
-)
-def settle_voucher(request):
-    update_table = request.GET["u"]
-    json = request.json_body
-    id_ = uuid.UUID(request.matchdict["id"])
-    item = request.dbsession.query(Voucher).filter(Voucher.id == id_).first()
-
-    allowed = [
-        SettleOption.AMOUNT(),
-        SettleOption.ROUND_OFF(),
-        SettleOption.UNSETTLED(),
-    ]
-    for i in (j for j in json if j["Amount"] != 0):
-        amount = i["Amount"]
-        so = i["Settled"]
-        so_settled = [s for s in item.settlements if s.settled == so]
-        if len(so_settled) == 1:
-            so_settled[0].amount = amount
-        else:
-            s = Settlement(item.id, so, amount)
-            item.settlements.append(s)
-            request.dbsession.add(s)
-        allowed.append(so)
-    for i in (s for s in item.settlements if s.settled not in allowed):
-        item.settlements.remove(i)
-        request.dbsession.delete(i)
-    unsettled = get_settlements(item, request.dbsession)
-
-    if unsettled == 0 and update_table:
-        request.dbsession.query(Overview).filter(
-            Overview.voucher_id == item.id
-        ).delete()
-    transaction.commit()
-    item = request.dbsession.query(Voucher).filter(Voucher.id == item.id).first()
-    return voucher_info(item)
-
-

barker/views/voucher/show.py

@@ -97,7 +97,7 @@ def voucher_info(item):
         "narration": item.narration,
         "void": item.is_void,
         "voidReason": item.void_reason,
-        "voucherType": item.voucher_type.value,
+        "voucherType": item.voucher_type.name,
         "kotId": item.kot_id,
         "kots": [
             {

bookie/src/app/sales/bill.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material';
 import { BehaviorSubject } from 'rxjs';
 import { Observable } from 'rxjs/internal/Observable';
+import * as math from 'mathjs';
 import { Product } from '../core/product';
 import { ModifiersComponent } from './modifiers/modifiers.component';
 import { ModifierCategoryService } from '../modifier-categories/modifier-category.service';
@@ -41,7 +42,7 @@ export class BillService {
           productId: i.product.id,
           isHappyHour: i.isHappyHour,
           isPrinted: true,
-          info: `${i.product.name} (${i.product.units}) @ ${i.price} - ${i.discount * 100}%`,
+          info: `${i.product.name} (${i.product.units}) @ ${i.price} - ${math.round(i.discount * 100, 2)}%`,
           price: i.price,
           quantity: i.quantity,
           discount: i.discount,
@@ -139,7 +140,7 @@ export class BillService {
     this.data.forEach(x=> {
       if (!x.isKot) {
         x.discount = discounts.find(d => d.id === x.product.saleCategory.id).discount / 100;
-        x.info = `${x.product.name} (${x.product.units}) @ ${x.price} - ${x.discount * 100}%`;
+        x.info = `${x.product.name} (${x.product.units}) @ ${x.price} - ${math.round(x.discount * 100, 2)}%`;
       }
     });
     this.dataObs.next(this.data);
@@ -185,4 +186,21 @@ 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;
+  }
+
+  receivePayment(amounts: { id: string; name: string; amount: number }[]) {
+    return this.ser.receivePayment(this.bill.id, amounts, true).pipe(
+      tap(x => console.log(x))
+    );
+  }
 }

bookie/src/app/sales/bills/voucher.service.ts

@@ -75,4 +75,12 @@ export class VoucherService {
       return this.update(voucher, printType, guest_book_id, updateTable);
     }
   }
+
+  receivePayment(id: string, amounts: { id: string; name: string; amount: number }[], updateTable: boolean): Observable<Bill> {
+  const options = {params: new HttpParams().set('r', "").set('u', updateTable.toString())};
+  return <Observable<Bill>>this.http.post<Bill>(`${url}/${id}`, amounts, options)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'receivePayment'))
+      );
+  }
 }

bookie/src/app/sales/home/sales-home.component.html

@@ -15,7 +15,19 @@
   <mat-card fxLayout="column" class="square-button warn" matRipple [routerLink]="['../../tables']">
     <h3 class="item-name">Back to Tables</h3>
   </mat-card>
-  <mat-card fxLayout="column" class="square-button" matRipple [routerLink]="['../../tables']">
+  <mat-card fxLayout="column" class="square-button" matRipple (click)="receivePayment()">
     <h3 class="item-name">Receive Payment</h3>
   </mat-card>
+  <mat-card fxLayout="column" class="square-button" matRipple [routerLink]="['../../tables']">
+    <h3 class="item-name">Move Table</h3>
+  </mat-card>
+  <mat-card fxLayout="column" class="square-button" matRipple [routerLink]="['../../tables']">
+    <h3 class="item-name">Void Bill</h3>
+  </mat-card>
+  <mat-card fxLayout="column" class="square-button" matRipple [routerLink]="['../../tables']">
+    <h3 class="item-name">Move KOT</h3>
+  </mat-card>
+  <mat-card fxLayout="column" class="square-button" matRipple [routerLink]="['../../tables']">
+    <h3 class="item-name">Split Bill</h3>
+  </mat-card>
 </div>

bookie/src/app/sales/home/sales-home.component.ts

@@ -10,6 +10,7 @@ import { SaleCategoryService } from "../../sale-category/sale-category.service";
 import { BillTypeComponent } from "../bill-type/bill-type.component";
 import { PrintType } from "../bills/bill";
 import { AuthService } from "../../auth/auth.service";
+import { ReceivePaymentComponent } from "../receive-payment/receive-payment.component";
 
 @Component({
   selector: 'app-sales-home',
@@ -106,4 +107,24 @@ export class SalesHomeComponent implements OnInit {
         this.toaster.show('Error', "No Bill Type Chosen")
       });
   }
+
+  receivePayment() {
+    let amount = this.bs.amount();
+    let type = this.bs.type();
+    const dialogRef = this.dialog.open(ReceivePaymentComponent, {
+      // width: '750px',
+      data: {
+        type: type,
+        amount: amount
+      }
+    });
+    dialogRef.afterClosed().subscribe((result: boolean | { id: string, name: string, amount: number }[]) => {
+      if (!!result) {
+        this.bs.receivePayment(result as { id: string, name: string, amount: number }[]).subscribe(() => {
+        this.toaster.show('Success', '');
+        this.router.navigate(['/sales']);
+      });
+      }
+    })
+  }
 }

bookie/src/app/sales/receive-payment/receive-payment-datasource.ts

@@ -0,0 +1,16 @@
+import { DataSource } from '@angular/cdk/collections';
+import { Observable, of as observableOf } from 'rxjs';
+
+export class ReceivePaymentDatasource extends DataSource<{name: string, discount: number}> {
+
+  constructor(private data: {name: string, discount: number}[]) {
+    super();
+  }
+
+  connect(): Observable<{name: string, discount: number}[]> {
+    return observableOf(this.data);
+  }
+
+  disconnect() {
+  }
+}

bookie/src/app/sales/receive-payment/receive-payment.component.css

@@ -0,0 +1,7 @@
+.right {
+  display: flex;
+  justify-content: flex-end;
+}
+.bold {
+  font-weight: bold;
+}

bookie/src/app/sales/receive-payment/receive-payment.component.html

@@ -0,0 +1,33 @@
+<h2 mat-dialog-title>Receive Payment</h2>
+<mat-dialog-content>
+  <form [formGroup]="form" fxLayout="column">
+    <mat-table #table [dataSource]="dataSource" formArrayName="amounts">
+
+      <!-- Name Column -->
+      <ng-container matColumnDef="name">
+        <mat-header-cell *matHeaderCellDef class="bold">Amount</mat-header-cell>
+        <mat-cell *matCellDef="let row">{{row.name}}</mat-cell>
+        <mat-footer-cell *matFooterCellDef class="bold">Balance</mat-footer-cell>
+      </ng-container>
+
+      <!-- Discount Column -->
+      <ng-container matColumnDef="amount">
+        <mat-header-cell *matHeaderCellDef class="center bold" fxFlex>{{ amount | currency:'INR'}}</mat-header-cell>
+        <mat-cell *matCellDef="let row; let i = index" class="center" [formGroupName]="i" fxFlex>
+          <mat-form-field>
+            <input matInput type="number" formControlName="amount" autocomplete="off">
+          </mat-form-field>
+        </mat-cell>
+        <mat-footer-cell *matFooterCellDef class="bold">{{ balance | currency:'INR' }}</mat-footer-cell>
+      </ng-container>
+
+      <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+      <mat-footer-row *matFooterRowDef="displayedColumns"></mat-footer-row>
+    </mat-table>
+  </form>
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button [mat-dialog-close]="false">Cancel</button>
+  <button mat-button (click)="accept()" color="primary" [disabled]="!!balance">Ok</button>
+</mat-dialog-actions>

bookie/src/app/sales/receive-payment/receive-payment.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ReceivePaymentComponent } from './receive-payment.component';
+
+describe('ReceivePaymentComponent', () => {
+  let component: ReceivePaymentComponent;
+  let fixture: ComponentFixture<ReceivePaymentComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ReceivePaymentComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ReceivePaymentComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

bookie/src/app/sales/receive-payment/receive-payment.component.ts

@@ -0,0 +1,104 @@
+import { Component, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { FormArray, FormBuilder, FormGroup } from "@angular/forms";
+import { distinctUntilChanged } from "rxjs/operators";
+import { ReceivePaymentDatasource } from "./receive-payment-datasource";
+import { PrintType } from "../bills/bill";
+
+@Component({
+  selector: 'app-receive-payment',
+  templateUrl: './receive-payment.component.html',
+  styleUrls: ['./receive-payment.component.css']
+})
+export class ReceivePaymentComponent {
+  choices = {
+    REGULAR_BILL: [
+      {
+        id: 2,
+        name: "Cash",
+        amount: 0
+      },
+      {
+        id: 3,
+        name: "Credit Card",
+        amount: 0
+      },
+      {
+        id: 5,
+        name: "Bill To Company",
+        amount: 0
+      },
+      {
+        id: 6,
+        name: "Tip",
+        amount: 0
+      }
+    ]
+    ,
+    NO_CHARGE: [
+      {
+        id: 4,
+        name: "No Charge",
+        amount: 0
+      }
+    ],
+    STAFF: [
+      {
+        id: 10,
+        name: "Staff Account",
+        amount: 0
+      }
+    ]
+  };
+  type: PrintType;
+  amount: number;
+  balance: number;
+  form: FormGroup;
+  dataSource: ReceivePaymentDatasource;
+
+  displayedColumns = ['name', 'amount'];
+
+  constructor(
+    public dialogRef: MatDialogRef<ReceivePaymentComponent>,
+    private fb: FormBuilder,
+    @Inject(MAT_DIALOG_DATA) public data: {type: PrintType, amount: number}
+  ) {
+    this.createForm();
+    this.type = data.type;
+    this.amount = data.amount;
+    this.balance = data.amount;
+    this.form.setControl('amounts', this.fb.array(
+      this.choices[this.type].map(
+        x => this.fb.group({
+          name: [x.name],
+          amount: [""]
+        })
+      )
+    ));
+    this.dataSource = new ReceivePaymentDatasource(this.choices[this.type]);
+    this.listenToAmountChange();
+  }
+
+  createForm() {
+    this.form = this.fb.group({
+      amounts: ''
+    });
+  }
+
+  listenToAmountChange() {
+    const array = this.form.get('amounts') as FormArray;
+    this.choices[this.type].forEach(
+      (z, i) => array.controls[i].valueChanges.pipe(
+        distinctUntilChanged()
+      ).subscribe(x => {
+        this.choices[this.type].find(s => s.name == x.name).amount = (x.amount === "" ? 0 : parseInt(x.amount, 10));
+        this.balance = this.amount - this.choices[this.type].reduce((a, c) => a + c.amount, 0);
+      })
+    );
+  }
+
+
+  accept(): void {
+    this.dialogRef.close(this.choices[this.type]);
+  }
+}

bookie/src/app/sales/sales.module.ts

@@ -26,7 +26,8 @@ import { SalesHomeComponent } from './home/sales-home.component';
 import { BillService } from './bill.service';
 import { QuantityComponent } from './quantity/quantity.component';
 import { DiscountComponent } from "./discount/discount.component";
-import {BillTypeComponent} from "./bill-type/bill-type.component";
+import { BillTypeComponent } from "./bill-type/bill-type.component";
+import { ReceivePaymentComponent } from "./receive-payment/receive-payment.component";
 
 @NgModule({
   providers: [
@@ -40,6 +41,7 @@ import {BillTypeComponent} from "./bill-type/bill-type.component";
     ModifiersComponent,
     ProductsComponent,
     QuantityComponent,
+    ReceivePaymentComponent,
     RunningTablesComponent,
     SalesHomeComponent
   ],
@@ -66,7 +68,8 @@ import {BillTypeComponent} from "./bill-type/bill-type.component";
     BillTypeComponent,
     DiscountComponent,
     ModifiersComponent,
-    QuantityComponent
+    QuantityComponent,
+    ReceivePaymentComponent
   ]
 })
 export class SalesModule { }