Version Bump v15.1.3

barker/barker/__version__.py

@@ -1 +1 @@
-__version__ = "15.1.0"
+__version__ = "15.1.3"

barker/barker/routers/guest_book.py

@@ -121,7 +121,7 @@ def show_list(
     guest_book: list[schemas.GuestBookListItem] = []
     count = 0
     for i, item in enumerate(db.execute(list_).scalars().all()):
-        status = GuestBookType(item.type_.name) if item.status is None else GuestBookType(item.status.status.name)
+        item_status = GuestBookType(item.type_.name) if item.status is None else GuestBookType(item.status.status.name)
         if item.type_ != GuestBookType.booking:
             count += item.pax
         gbli = schemas.GuestBookListItem(
@@ -134,7 +134,7 @@ def show_list(
             booking_date=item.booking_date,
             arrival_date=item.arrival_date,
             last_edit_date=item.last_edit_date,
-            status=status,
+            status=item_status,
             table_id=None if item.status is None else item.status.food_table.id,
             voucher_id=None if item.status is None else item.status.voucher_id,
             table_name=None if item.status is None else item.status.food_table.name,

barker/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "barker"
-version = "15.1.0"
+version = "15.1.3"
 description = "Point of Sale for a restaurant"
 requires-python = ">=3.14"
 authors = [{ name = "tanshu", email = "git@tanshu.com" }]

barker/uv.lock

@@ -231,7 +231,7 @@ wheels = [
 
 [[package]]
 name = "barker"
-version = "15.1.0"
+version = "15.1.3"
 source = { editable = "." }
 dependencies = [
     { name = "aiohttp" },

bookie/angular.json

@@ -32,7 +32,9 @@
                 "input": "public"
               }
             ],
-            "styles": ["src/styles.sass"],
+            "styles": [
+              "src/styles.sass"
+            ],
             "allowedCommonJsDependencies": [
               "typed-function",
               "javascript-natural-sort",
@@ -46,8 +48,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "500kb",
-                  "maximumError": "1mb"
+                  "maximumWarning": "1000kb",
+                  "maximumError": "2mb"
                 },
                 {
                   "type": "anyComponentStyle",
@@ -86,14 +88,19 @@
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
           }
         }
       }
     }
   },
   "cli": {
-    "schematicCollections": ["@angular-eslint/schematics"],
+    "schematicCollections": [
+      "@angular-eslint/schematics"
+    ],
     "analytics": false
   },
   "schematics": {

bookie/package.json

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

bookie/src/app/app.environment.ts

@@ -1,7 +1,7 @@
 export const environment = {
   production: true,
   ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
-  version: '15.1.0',
+  version: '15.1.3',
 };
 
 export const dateFormat = {

bookie/src/app/core/auth.interceptor.ts

@@ -10,6 +10,11 @@ import { AuthService } from '../auth/auth.service';
 import { ConfirmDialogComponent } from '../shared/confirm-dialog/confirm-dialog.component';
 
 export const authInterceptor: HttpInterceptorFn = (req, next) => {
+  const authService = inject(AuthService);
+  const snackBar = inject(MatSnackBar);
+  const dialog = inject(MatDialog);
+  const router = inject(Router);
+
   return next(req).pipe(
     catchError((err) => {
       // We don't want to refresh token for some requests like login or refresh token itself
@@ -18,34 +23,36 @@ export const authInterceptor: HttpInterceptorFn = (req, next) => {
         // We do another check to see if refresh token failed
         // In this case we want to logout user and to redirect it to login page
         if (req.url.includes('/refresh')) {
-          inject(AuthService).logout();
+          authService.logout();
         }
         return throwError(() => err);
       }
       // If error status is different than 401 we want to skip refresh token
       // So we check that and throw the error if it's the case
       if (err.status !== 401) {
-        const error = err.error.message || err.error.detail || err.statusText;
+        const error = err.error?.message || err.error?.detail || err.statusText || err;
         return throwError(() => error);
       }
       // auto logout if 401 response returned from api
-      inject(AuthService).logout();
-      inject(MatSnackBar).open('User has been logged out', 'Danger');
-      const dialogRef = inject(MatDialog).open(ConfirmDialogComponent, {
-        width: '250px',
-        data: {
-          title: 'Logged out!',
-          content:
-            'You have been logged out.\n' +
-            'You can press Cancel to stay on page and login in another tab to resume here, ' +
-            'or you can press Ok to navigate to the login page.',
-        },
-      });
-      dialogRef.afterClosed().subscribe((result: boolean) => {
-        if (result) {
-          inject(Router).navigate(['login']);
-        }
-      });
+      authService.logout();
+      if (dialog.openDialogs.length === 0) {
+        snackBar.open('User has been logged out', 'Danger');
+        const dialogRef = dialog.open(ConfirmDialogComponent, {
+          width: '350px',
+          data: {
+            title: 'Logged out!',
+            content:
+              'You have been logged out.\n' +
+              'You can press Cancel to stay on page and login in another tab to resume here, ' +
+              'or you can press Ok to navigate to the login page.',
+          },
+        });
+        dialogRef.afterClosed().subscribe((result: boolean) => {
+          if (result) {
+            router.navigate(['/login']);
+          }
+        });
+      }
       return throwError(() => err);
     }),
   );

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

@@ -37,25 +37,36 @@ export class BillService {
 
   public grossAmount = computed(() =>
     this.math.halfRoundEven(
-      this.data().reduce((t, k) => k.inventories.reduce((a, c) => a + c.price * c.quantity, 0) + t, 0),
+      this.data().reduce(
+        (t, k) => k.inventories.filter((c) => !c.parentId).reduce((a, c) => a + c.price * c.quantity, 0) + t,
+        0,
+      ),
+      2,
     ),
   );
 
   public hhAmount = computed(() =>
     this.math.halfRoundEven(
       this.data().reduce(
-        (t, k) => k.inventories.reduce((a, c) => a + (c.isHappyHour ? c.price : 0) * c.quantity, 0) + t,
+        (t, k) =>
+          k.inventories.filter((c) => !c.parentId).reduce((a, c) => a + (c.isHappyHour ? c.price : 0) * c.quantity, 0) +
+          t,
         0,
       ),
+      2,
     ),
   );
 
   public discountAmount = computed(() =>
     this.math.halfRoundEven(
       this.data().reduce(
-        (t, k) => k.inventories.reduce((a, c) => a + (c.isHappyHour ? 0 : c.price) * c.quantity * c.discount, 0) + t,
+        (t, k) =>
+          k.inventories
+            .filter((c) => !c.parentId)
+            .reduce((a, c) => a + (c.isHappyHour ? 0 : c.price) * c.quantity * c.discount, 0) + t,
         0,
       ),
+      2,
     ),
   );
 
@@ -63,16 +74,36 @@ export class BillService {
     this.math.halfRoundEven(
       this.data().reduce(
         (t, k) =>
-          k.inventories.reduce(
-            (a, c) => a + (c.isHappyHour ? 0 : c.price) * c.quantity * (1 - c.discount) * c.taxRate,
-            0,
-          ) + t,
+          k.inventories
+            .filter((c) => !c.parentId)
+            .reduce((a, c) => a + (c.isHappyHour ? 0 : c.price) * c.quantity * (1 - c.discount) * c.taxRate, 0) + t,
         0,
       ),
+      2,
+    ),
+  );
+
+  public amount = computed(() =>
+    this.math.halfRoundEven(
+      this.data().reduce(
+        (t, k) =>
+          k.inventories
+            .filter((c) => !c.parentId)
+            .reduce(
+              (a, c) =>
+                a +
+                this.math.halfRoundEven(
+                  (c.isHappyHour ? 0 : c.price) * c.quantity * (1 - c.discount) * (1 + c.taxRate),
+                  2,
+                ),
+              0,
+            ) + t,
+        0,
+      ),
+      0,
     ),
   );
 
-  public amount = computed(() => this.grossAmount() - this.discountAmount() + this.taxAmount());
   public selection = new SelectionModel<string>(true, []);
   private updateTable = signal<boolean>(true);
   private allowDeactivate = signal<boolean>(false);

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

@@ -1,63 +1,57 @@
-@if (customersResource.isLoading()) {
-  <app-skeleton-loader type="card" [count]="1" />
-} @else if (customersResource.error()) {
-  <app-error-state (retryAction)="customersResource.reload()" />
-} @else {
-  <h2 mat-dialog-title>Customer</h2>
-  <mat-dialog-content>
-    <form class="flex-col">
-      <div class="row-container">
-        <mat-form-field class="flex-auto">
-          <mat-label>Phone</mat-label>
-          <input
-            matInput
-            type="text"
-            [formField]="form.phone"
-            [matAutocomplete]="auto"
-            autocomplete="off"
-            cdkFocusInitial
-          />
-        </mat-form-field>
-        <mat-autocomplete
-          #auto="matAutocomplete"
-          autoActiveFirstOption
-          [displayWith]="displayFn"
-          (optionSelected)="selected($event)"
-        >
-          @for (customer of customers(); track customer) {
-            <mat-option [value]="customer">{{ customer.name }} - {{ customer.phone }}</mat-option>
+<h2 mat-dialog-title>Customer</h2>
+<mat-dialog-content>
+  <form class="flex-col">
+    <div class="row-container">
+      <mat-form-field class="flex-auto">
+        <mat-label>Phone</mat-label>
+        <input
+          matInput
+          type="text"
+          [formField]="form.phone"
+          [matAutocomplete]="auto"
+          autocomplete="off"
+          cdkFocusInitial
+        />
+      </mat-form-field>
+      <mat-autocomplete
+        #auto="matAutocomplete"
+        autoActiveFirstOption
+        [displayWith]="displayFn"
+        (optionSelected)="selected($event)"
+      >
+        @for (customer of customers(); track customer) {
+          <mat-option [value]="customer">{{ customer.name }} - {{ customer.phone }}</mat-option>
+        }
+      </mat-autocomplete>
+    </div>
+    <div class="row-container">
+      <mat-form-field class="flex-auto">
+        <mat-label>Name</mat-label>
+        <input matInput [value]="formModel().name" readonly />
+      </mat-form-field>
+    </div>
+    <div class="row-container">
+      <mat-form-field class="flex-auto">
+        <mat-label>Address</mat-label>
+        <textarea matInput [value]="formModel().address" readonly> </textarea>
+      </mat-form-field>
+    </div>
+    <div class="row-container">
+      <mat-checkbox [checked]="formModel().printInBill" [disabled]="true">Print in Bill?</mat-checkbox>
+    </div>
+    <p></p>
+    <div class="discounts">
+      <ul>
+        @for (r of formModel().discounts; track r.id) {
+          @if (r.discount > 0) {
+            <li>{{ r.name }} - {{ r.discount | percent: '1.2-2' }}</li>
           }
-        </mat-autocomplete>
-      </div>
-      <div class="row-container">
-        <mat-form-field class="flex-auto">
-          <mat-label>Name</mat-label>
-          <input matInput [value]="formModel().name" readonly />
-        </mat-form-field>
-      </div>
-      <div class="row-container">
-        <mat-form-field class="flex-auto">
-          <mat-label>Address</mat-label>
-          <textarea matInput [value]="formModel().address" readonly> </textarea>
-        </mat-form-field>
-      </div>
-      <div class="row-container">
-        <mat-checkbox [checked]="formModel().printInBill" [disabled]="true">Print in Bill?</mat-checkbox>
-      </div>
-      <p></p>
-      <div class="discounts">
-        <ul>
-          @for (r of formModel().discounts; track r.id) {
-            @if (r.discount > 0) {
-              <li>{{ r.name }} - {{ r.discount | percent: '1.2-2' }}</li>
-            }
-          }
-        </ul>
-      </div>
-    </form>
-  </mat-dialog-content>
-  <mat-dialog-actions align="end">
-    <button mat-button [mat-dialog-close]="false">Cancel</button>
-    <button type="button" mat-raised-button color="primary" (click)="save()">Select</button>
-  </mat-dialog-actions>
-}
+        }
+      </ul>
+    </div>
+  </form>
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-button [mat-dialog-close]="false">Cancel</button>
+  <button type="button" mat-raised-button color="primary" (click)="save()">Select</button>
+</mat-dialog-actions>

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

@@ -13,8 +13,6 @@ import { MatInputModule } from '@angular/material/input';
 import { Customer } from '../../core/customer';
 import { CustomerDiscount } from '../../core/customer-discount';
 import { CustomerService } from '../../customers/customer.service';
-import { ErrorStateComponent } from '../../shared/error-state/error-state.component';
-import { SkeletonLoaderComponent } from '../../shared/skeleton-loader/skeleton-loader.component';
 
 export interface ChooseCustomerFormData {
   id: string;
@@ -40,8 +38,6 @@ export interface ChooseCustomerFormData {
     MatOptionModule,
     PercentPipe,
     FormField,
-    ErrorStateComponent,
-    SkeletonLoaderComponent,
   ],
 })
 export class ChooseCustomerComponent {
@@ -66,7 +62,8 @@ export class ChooseCustomerComponent {
   form = form(this.formModel);
 
   phoneSignal = computed(() => {
-    return this.formModel().phone;
+    const p = this.formModel().phone;
+    return typeof p === 'string' ? p.trim() : null;
   });
 
   debouncedPhone = debounced(this.phoneSignal, 150);

frank/ansible/frank.yml

@@ -16,4 +16,5 @@
       when: var_file is defined
 
   roles:
+    - printer
     - frank

frank/ansible/roles/printer/handlers/main.yml

@@ -0,0 +1,2 @@
+- name: Reload udev
+  ansible.builtin.shell: udevadm control --reload-rules && udevadm trigger --action=change

frank/ansible/roles/printer/tasks/main.yml

@@ -0,0 +1,7 @@
+- name: Add udev rule for usb printer systemd tag
+  copy:
+    dest: /etc/udev/rules.d/99-usb-printers.rules
+    content: |
+      SUBSYSTEM=="usbmisc", KERNEL=="lp*", TAG+="systemd"
+    mode: "0644"
+  notify: Reload udev