Version Bump v11.0.2

The select table dialog was long and narrow.
The billtype was selection was also not showing properly.

barker/barker/__version__.py

@@ -1 +1 @@
-__version__ = "11.0.0"
+__version__ = "11.0.2"

barker/barker/routers/reports/bill_settlement_report.py

@@ -48,7 +48,7 @@ def settlements(s: date, f: date, db: Session) -> list[BillSettlementItem]:
             .join(Voucher.settlements)
             .join(Settlement.settle_option)
             .where(Voucher.date >= start_date, Voucher.date <= finish_date)
-            .order_by(Voucher.voucher_type)
+            .order_by(Voucher.voucher_type, Voucher.date)
         )
         .unique()
         .scalars()

barker/barker/routers/voucher/merge_move.py

@@ -1,3 +1,4 @@
+import traceback
 import uuid
 
 from datetime import datetime
@@ -11,6 +12,7 @@ from sqlalchemy.orm import Session
 
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionFuture
+from ...models.bill import Bill
 from ...models.kot import Kot
 from ...models.overview import Overview
 from ...models.settlement import Settlement
@@ -127,12 +129,14 @@ def merge_table(
             check_if_voucher_is_unprinted(data.voucher_id, db)
             check_if_voucher_is_unprinted(data.new_voucher_id, db)
             db.execute(update(Kot).where(Kot.voucher_id == data.voucher_id).values(voucher_id=data.new_voucher_id))
+            db.execute(delete(Bill).where(Bill.voucher_id == data.voucher_id))
             db.execute(delete(Overview).where(Overview.voucher_id == data.voucher_id))
             db.execute(delete(Settlement).where(Settlement.voucher_id == data.voucher_id))
             db.execute(delete(Voucher).where(Voucher.id == data.voucher_id))
             update_settlements([data.new_voucher_id], db)
             db.commit()
     except SQLAlchemyError as e:
+        traceback.print_exc()
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail=str(e),

barker/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "barker"
-version = "11.0.0"
+version = "11.0.2"
 description = "Point of Sale for a restaurant"
 authors = ["tanshu <git@tanshu.com>"]
 

bookie/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bookie",
-  "version": "11.0.0",
+  "version": "11.0.2",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

bookie/src/app/sales/bill-type/bill-type.component.html

@@ -1,3 +1,5 @@
+<h2 mat-dialog-title>Bill Type</h2>
+<mat-dialog-content>
   <div class="flex flex-row flex-wrap -mr-5 -mb-5">
     <mat-card
       class="flex flex-col square-button mr-5, mb-5"
@@ -24,6 +26,7 @@
       <h3 class="item-name">No Charge</h3>
     </mat-card>
   </div>
+</mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button mat-button [mat-dialog-close]="selectedVal">Done</button>

bookie/src/app/sales/choose-customer/choose-customer.component.html

@@ -1,4 +1,4 @@
-<h1 mat-dialog-title>Customer</h1>
+<h2 mat-dialog-title>Customer</h2>
 <mat-dialog-content>
   <form [formGroup]="form" class="flex flex-col">
     <div class="flex flex-row justify-around content-start items-start">

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

@@ -350,7 +350,6 @@ export class SalesHomeComponent {
   showChooseTableDialog(canChooseRunning: boolean): Observable<Table | undefined | null> {
     return this.dialog
       .open(TablesDialogComponent, {
-        // width: '750px',
         data: {
           list: this.tableService.running(),
           canChooseRunning,

bookie/src/app/sales/tables-dialog/tables-dialog.component.html

@@ -1,5 +1,6 @@
 <h2 mat-dialog-title>Tables</h2>
-<mat-dialog-content class="flex flex-row flex-wrap -mr-5 -mb-5">
+<mat-dialog-content>
+  <div class="flex flex-row flex-wrap -mr-5 -mb-5">
     <mat-card
       class="flex flex-col square-button mr-5, mb-5"
       matRipple
@@ -15,6 +16,7 @@
       <span class="center" *ngIf="table.date">{{ table.date }}</span>
       <span class="center" *ngIf="table.amount">{{ table.amount | currency : 'INR' }}</span>
     </mat-card>
+  </div>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
   <button mat-button [mat-dialog-close]="false">Cancel</button>

bookie/src/environments/environment.prod.ts

@@ -1,5 +1,5 @@
 export const environment = {
   production: true,
   ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
-  version: '11.0.0',
+  version: '11.0.2',
 };

bookie/src/environments/environment.ts

@@ -5,7 +5,7 @@
 export const environment = {
   production: false,
   ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
-  version: '11.0.0',
+  version: '11.0.2',
 };
 
 /*

frank/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "frank"
-version = "11.0.0"
+version = "11.0.2"
 description = "Point of Sale for a restaurant"
 authors = ["tanshu <git@tanshu.com>"]