Version Bump v15.1.6

.vscode/launch.json

@@ -29,9 +29,9 @@
             "args": [
                 "barker.main:app",
                 "--host",
-                "127.0.0.1",
+                "0.0.0.0",
                 "--port",
-                "8000",
+                "9995",
                 "--reload"
             ],
             "cwd": "${workspaceFolder}/barker",

barker/barker/__version__.py

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

barker/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "barker"
-version = "15.1.3"
+version = "15.1.6"
 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.3"
+version = "15.1.6"
 source = { editable = "." }
 dependencies = [
     { name = "aiohttp" },

bookie/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bookie",
-  "version": "15.1.3",
+  "version": "15.1.6",
   "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.3',
+  version: '15.1.6',
 };
 
 export const dateFormat = {

bookie/src/app/beer-sale-report/beer-sale-report.component.html

@@ -42,13 +42,13 @@
         <mat-form-field class="flex-auto">
           <mat-label>Sale Category</mat-label>
           <mat-select [formField]="form.saleCategory">
-            @for (sc of saleCategories(); track sc) {
+            @for (sc of saleCategories(); track sc.id) {
               <mat-option [value]="sc.id">
                 {{ sc.name }}
               </mat-option>
             }
           </mat-select>
-          @for (error of form.saleCategory().errors(); track error) {
+          @for (error of form.saleCategory().errors(); track $index) {
             <mat-error>{{ error.message }}</mat-error>
           }
         </mat-form-field>

bookie/src/app/bundles/bundle-detail/bundle-detail-dialog.component.html

@@ -1,39 +1,33 @@
-@if (productsResource.isLoading()) {
-  <app-skeleton-loader type="card" [count]="1" />
-} @else if (productsResource.error()) {
-  <app-error-state (retryAction)="productsResource.reload()" />
-} @else {
-  <h1 mat-dialog-title>Edit Bundle Item</h1>
+<h1 mat-dialog-title>Edit Bundle Item</h1>
 
-  <div mat-dialog-content>
-    <form>
-      <mat-form-field class="w-full">
-        <mat-label>Item</mat-label>
-        <input matInput type="text" [formField]="form.product" [matAutocomplete]="autoP" />
-        <mat-autocomplete #autoP="matAutocomplete" [displayWith]="displayFn">
-          @for (p of products(); track p) {
-            <mat-option [value]="p">{{ p.name }}</mat-option>
-          }
-        </mat-autocomplete>
+<div mat-dialog-content>
+  <form>
+    <mat-form-field class="w-full">
+      <mat-label>Item</mat-label>
+      <input matInput type="text" [formField]="form.product" [matAutocomplete]="autoP" />
+      <mat-autocomplete #autoP="matAutocomplete" [displayWith]="displayFn">
+        @for (p of products(); track p.id) {
+          <mat-option [value]="p">{{ p.name }}</mat-option>
+        }
+      </mat-autocomplete>
+    </mat-form-field>
+
+    <div class="flex flex-row flex-wrap gap-3">
+      <mat-form-field class="flex-auto">
+        <mat-label>Quantity</mat-label>
+        <input matInput type="number" [formField]="form.quantity" />
       </mat-form-field>
 
-      <div class="flex flex-row flex-wrap gap-3">
-        <mat-form-field class="flex-auto">
-          <mat-label>Quantity</mat-label>
-          <input matInput type="number" [formField]="form.quantity" />
-        </mat-form-field>
+      <mat-form-field class="flex-auto">
+        <mat-label>Sale Price</mat-label>
+        <input matInput type="number" [formField]="form.salePrice" />
+      </mat-form-field>
+      <mat-checkbox [formField]="form.printInBill" class="flex-auto">Print in Bill?</mat-checkbox>
+    </div>
+  </form>
+</div>
 
-        <mat-form-field class="flex-auto">
-          <mat-label>Sale Price</mat-label>
-          <input matInput type="number" [formField]="form.salePrice" />
-        </mat-form-field>
-        <mat-checkbox [formField]="form.printInBill" class="flex-auto">Print in Bill?</mat-checkbox>
-      </div>
-    </form>
-  </div>
-
-  <div mat-dialog-actions>
-    <button mat-raised-button color="warn" [mat-dialog-close]="false">Cancel</button>
-    <button type="button" mat-raised-button color="primary" (click)="accept()">Ok</button>
-  </div>
-}
+<div mat-dialog-actions>
+  <button mat-raised-button color="warn" [mat-dialog-close]="false">Cancel</button>
+  <button type="button" mat-raised-button color="primary" (click)="accept()">Ok</button>
+</div>

bookie/src/app/bundles/bundle-detail/bundle-detail-dialog.component.ts

@@ -10,8 +10,6 @@ import { MatInputModule } from '@angular/material/input';
 
 import { ProductQuery } from '../../core/product-query';
 import { ProductService } from '../../product/product.service';
-import { ErrorStateComponent } from '../../shared/error-state/error-state.component';
-import { SkeletonLoaderComponent } from '../../shared/skeleton-loader/skeleton-loader.component';
 import { BundleItem } from '../bundle';
 
 export interface BundleDetailDialogFormData {
@@ -35,8 +33,6 @@ export interface BundleDetailDialogFormData {
     MatFormFieldModule,
     MatInputModule,
     FormField,
-    ErrorStateComponent,
-    SkeletonLoaderComponent,
   ],
 })
 export class BundleDetailDialogComponent {
@@ -62,12 +58,15 @@ export class BundleDetailDialogComponent {
     return typeof p === 'string' ? p.trim() : '';
   });
 
-  debouncedProduct = debounced(this.productSignal, 150);
+  debouncedProduct = debounced(this.productSignal, 300);
 
   productsResource = this.productSer.query(this.debouncedProduct.value);
-  products = computed(() => {
-    if (!this.debouncedProduct.value()) return [];
-    return this.productsResource.value() ?? [];
+  products = linkedSignal<ProductQuery[] | undefined, ProductQuery[]>({
+    source: () => this.productsResource.value(),
+    computation: (newVal, previous) => {
+      if (!this.debouncedProduct.value()) return [];
+      return newVal ?? previous?.value ?? [];
+    },
   });
 
   displayFn(product?: ProductQuery | string): string {

bookie/src/app/bundles/bundle-detail/bundle-detail.component.html

@@ -28,7 +28,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Menu Category</mat-label>
         <mat-select [formField]="form.menuCategory">
-          @for (mc of menuCategories(); track mc) {
+          @for (mc of menuCategories(); track mc.id) {
             <mat-option [value]="mc">
               {{ mc.name }}
             </mat-option>
@@ -39,7 +39,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Sale Category</mat-label>
         <mat-select [formField]="form.saleCategory">
-          @for (sc of saleCategories(); track sc) {
+          @for (sc of saleCategories(); track sc.id) {
             <mat-option [value]="sc">
               {{ sc.name }}
             </mat-option>
@@ -71,7 +71,7 @@
           [value]="displayFn(formModel().addRow.sku)"
         />
         <mat-autocomplete #autoItem="matAutocomplete" [displayWith]="displayFn">
-          @for (p of itemProducts(); track p) {
+          @for (p of itemProducts(); track p.id) {
             <mat-option [value]="p">{{ p.name }}</mat-option>
           }
         </mat-autocomplete>

bookie/src/app/bundles/bundle-detail/bundle-detail.component.ts

@@ -109,11 +109,15 @@ export class BundleDetailComponent {
     return typeof v === 'string' ? v : null;
   });
 
-  debouncedItemProduct = debounced(this.itemProductSearch, 150);
+  debouncedItemProduct = debounced(this.itemProductSearch, 300);
 
   itemProductsResource = this.productSer.query(this.debouncedItemProduct.value);
-  itemProducts = computed(() => {
-    return this.itemProductsResource.value() ?? [];
+  itemProducts = linkedSignal<ProductQuery[] | undefined, ProductQuery[]>({
+    source: () => this.itemProductsResource.value(),
+    computation: (newVal, previous) => {
+      if (!this.debouncedItemProduct.value()) return [];
+      return newVal ?? previous?.value ?? [];
+    },
   });
 
   displayedColumns = ['name', 'quantity', 'salePrice', 'printInBill', 'action'];

bookie/src/app/bundles/bundle-list/bundle-list.component.html

@@ -25,7 +25,7 @@
         <mat-label>Menu Category</mat-label>
         <mat-select [formField]="form.menuCategory">
           <mat-option [value]="null">-- All Bundles --</mat-option>
-          @for (mc of menuCategoriesResource.value(); track mc) {
+          @for (mc of menuCategoriesResource.value(); track mc.id) {
             <mat-option [value]="mc.id">
               {{ mc.name }}
             </mat-option>
@@ -73,7 +73,7 @@
       <mat-header-cell *matHeaderCellDef>Items</mat-header-cell>
       <mat-cell *matCellDef="let row">
         <div class="items-list">
-          @for (item of row.items; track item) {
+          @for (item of row.items; track item.id) {
             <mat-icon>
               {{ item.printInBill ? 'visibility' : 'visibility_off' }}
             </mat-icon>

bookie/src/app/cashier-report/cashier-report.component.html

@@ -46,7 +46,7 @@
         <mat-label>Cashier</mat-label>
         <mat-select [formField]="form.cashier">
           <mat-option [value]="null">-- Cashier --</mat-option>
-          @for (ac of cashiers(); track ac) {
+          @for (ac of cashiers(); track ac.id) {
             <mat-option [value]="ac.id">
               {{ ac.name }}
             </mat-option>

bookie/src/app/customers/customer-detail/customer-detail.component.html

@@ -28,7 +28,7 @@
     </div>
     <mat-divider></mat-divider>
     <div class="discounts">
-      @for (r of item().discounts; track r; let i = $index) {
+      @for (r of item().discounts; track r.id; let i = $index) {
         <div class="row-container">
           <mat-form-field class="flex-auto">
             <mat-label>Discount on {{ r.name }}</mat-label>

bookie/src/app/customers/customer-list/customer-list.component.html

@@ -50,7 +50,7 @@
       <mat-header-cell *matHeaderCellDef>Discounts</mat-header-cell>
       <mat-cell *matCellDef="let row">
         <ul>
-          @for (discount of row.discounts; track discount) {
+          @for (discount of row.discounts; track discount.id) {
             <li>{{ discount.name }} - {{ discount.discount | percent: '1.2-2' }}</li>
           }
         </ul>

bookie/src/app/devices/device-detail/device-detail.component.html

@@ -15,7 +15,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Section</mat-label>
         <mat-select [formField]="form.section">
-          @for (s of sections(); track s) {
+          @for (s of sections(); track s.id) {
             <mat-option [value]="s.id">
               {{ s.name }}
             </mat-option>

bookie/src/app/guest-book/guest-book-detail/guest-book-detail.component.html

@@ -22,7 +22,7 @@
         [displayWith]="displayFn"
         (optionSelected)="selected($event)"
       >
-        @for (customer of customers(); track customer) {
+        @for (customer of customers(); track customer.id) {
           <mat-option [value]="customer">{{ customer.name }} - {{ customer.phone }}</mat-option>
         }
       </mat-autocomplete>

bookie/src/app/guest-book/guest-book-detail/guest-book-detail.component.ts

@@ -95,12 +95,15 @@ export class GuestBookDetailComponent {
     return typeof p === 'string' ? p.trim() : (p as Customer).phone;
   });
 
-  debouncedPhone = debounced(this.phoneSignal, 150);
+  debouncedPhone = debounced(this.phoneSignal, 300);
 
   customersResource = this.customerService.autocomplete(computed(() => this.debouncedPhone.value()));
-  customers = computed(() => {
-    if (!this.debouncedPhone.value()) return [];
-    return this.customersResource.value() ?? [];
+  customers = linkedSignal<Customer[] | undefined, Customer[]>({
+    source: () => this.customersResource.value(),
+    computation: (newVal, previous) => {
+      if (!this.debouncedPhone.value()) return [];
+      return newVal ?? previous?.value ?? [];
+    },
   });
 
   constructor() {

bookie/src/app/header-footer/header-footer.component.html

@@ -8,7 +8,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Header / Footer</mat-label>
         <mat-select [formField]="form.id" (selectionChange)="show($event)">
-          @for (s of list(); track s) {
+          @for (s of list(); track s.id) {
             <mat-option [value]="s.id">
               {{ s.name }}
             </mat-option>

bookie/src/app/modifier-categories/modifier-category-list/modifier-category-list.component.html

@@ -47,12 +47,12 @@
       <mat-header-cell *matHeaderCellDef>Products</mat-header-cell>
       <mat-cell *matCellDef="let row">
         <ul>
-          @for (mc of row.menuCategories; track mc) {
+          @for (mc of row.menuCategories; track mc.id) {
             <li>
               {{ mc.name }}
               @if (!mc.enabled) {
                 <ul>
-                  @for (p of mc.skus; track p) {
+                  @for (p of mc.skus; track p.id) {
                     <li>{{ p.name }}</li>
                   }
                 </ul>

bookie/src/app/modifiers/modifier-detail/modifier-detail.component.html

@@ -24,13 +24,13 @@
       <mat-form-field class="flex-auto">
         <mat-label>Category</mat-label>
         <mat-select [formField]="form.modifierCategory">
-          @for (mc of modifierCategories(); track mc) {
+          @for (mc of modifierCategories(); track mc.id) {
             <mat-option [value]="mc.id">
               {{ mc.name }}
             </mat-option>
           }
         </mat-select>
-        @for (error of form.modifierCategory().errors(); track error) {
+        @for (error of form.modifierCategory().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>

bookie/src/app/product/product-detail/product-detail-dialog.component.html

@@ -5,7 +5,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Units</mat-label>
         <input matInput [formField]="form.units" />
-        @for (error of form.units().errors(); track error) {
+        @for (error of form.units().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>
@@ -13,7 +13,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Fraction</mat-label>
         <input matInput type="number" [formField]="form.fraction" />
-        @for (error of form.fraction().errors(); track error) {
+        @for (error of form.fraction().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>
@@ -21,7 +21,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Yield</mat-label>
         <input matInput type="number" [formField]="form.productYield" />
-        @for (error of form.productYield().errors(); track error) {
+        @for (error of form.productYield().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>
@@ -29,7 +29,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Cost Price</mat-label>
         <input matInput type="number" [formField]="form.costPrice" />
-        @for (error of form.costPrice().errors(); track error) {
+        @for (error of form.costPrice().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>
@@ -37,7 +37,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Sale Price</mat-label>
         <input matInput type="number" [formField]="form.salePrice" />
-        @for (error of form.salePrice().errors(); track error) {
+        @for (error of form.salePrice().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>
@@ -45,7 +45,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Menu Category</mat-label>
         <mat-select [formField]="form.menuCategory">
-          @for (mc of menuCategories; track mc) {
+          @for (mc of menuCategories; track mc.id) {
             <mat-option [value]="mc.id">
               {{ mc.name }}
             </mat-option>

bookie/src/app/product/product-detail/product-detail.component.html

@@ -19,7 +19,7 @@
       <mat-form-field class="basis-3-4">
         <mat-label>Sale Category</mat-label>
         <mat-select [formField]="form.saleCategory">
-          @for (sc of saleCategories(); track sc) {
+          @for (sc of saleCategories(); track sc.id) {
             <mat-option [value]="sc.id">
               {{ sc.name }}
             </mat-option>
@@ -35,7 +35,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Units</mat-label>
         <input matInput [formField]="form.addRow.units" />
-        @for (error of form.addRow.units().errors(); track error) {
+        @for (error of form.addRow.units().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>
@@ -43,7 +43,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Fraction</mat-label>
         <input matInput type="number" [formField]="form.addRow.fraction" />
-        @for (error of form.addRow.fraction().errors(); track error) {
+        @for (error of form.addRow.fraction().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>
@@ -51,7 +51,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Yield</mat-label>
         <input matInput type="number" [formField]="form.addRow.productYield" />
-        @for (error of form.addRow.productYield().errors(); track error) {
+        @for (error of form.addRow.productYield().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>
@@ -59,7 +59,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Cost Price</mat-label>
         <input matInput type="number" [formField]="form.addRow.costPrice" />
-        @for (error of form.addRow.costPrice().errors(); track error) {
+        @for (error of form.addRow.costPrice().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>
@@ -67,7 +67,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Sale Price</mat-label>
         <input matInput type="number" [formField]="form.addRow.salePrice" />
-        @for (error of form.addRow.salePrice().errors(); track error) {
+        @for (error of form.addRow.salePrice().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>
@@ -75,13 +75,13 @@
       <mat-form-field class="flex-auto">
         <mat-label>Menu Category</mat-label>
         <mat-select [formField]="form.addRow.menuCategory">
-          @for (mc of menuCategories(); track mc) {
+          @for (mc of menuCategories(); track mc.id) {
             <mat-option [value]="mc.id">
               {{ mc.name }}
             </mat-option>
           }
         </mat-select>
-        @for (error of form.addRow.menuCategory().errors(); track error) {
+        @for (error of form.addRow.menuCategory().errors(); track $index) {
           <mat-error>{{ error.message }}</mat-error>
         }
       </mat-form-field>

bookie/src/app/product/product-list/product-list.component.html

@@ -32,7 +32,7 @@
         <mat-label>Menu Category</mat-label>
         <mat-select [formField]="form.menuCategory">
           <mat-option [value]="null">-- All Products --</mat-option>
-          @for (mc of menuCategoriesResource.value(); track mc) {
+          @for (mc of menuCategoriesResource.value(); track mc.id) {
             <mat-option [value]="mc.id">
               {{ mc.name }}
             </mat-option>
@@ -54,7 +54,7 @@
       <mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
       <mat-cell *matCellDef="let row">
         <ul>
-          @for (sku of row.skus; track sku) {
+          @for (sku of row.skus; track sku.id) {
             <li>
               <a [routerLink]="['/products', row.id]">{{ row.name }} ({{ sku.units }})</a>
             </li>
@@ -68,7 +68,7 @@
       <mat-header-cell *matHeaderCellDef class="right">Price</mat-header-cell>
       <mat-cell *matCellDef="let row" class="right">
         <ul>
-          @for (sku of row.skus; track sku) {
+          @for (sku of row.skus; track sku.id) {
             <li>
               {{ sku.salePrice | currency: 'INR' }}
             </li>
@@ -82,7 +82,7 @@
       <mat-header-cell *matHeaderCellDef>Menu Category</mat-header-cell>
       <mat-cell *matCellDef="let row">
         <ul>
-          @for (sku of row.skus; track sku) {
+          @for (sku of row.skus; track sku.id) {
             <li>
               {{ sku.menuCategory.name }}
             </li>
@@ -102,7 +102,7 @@
       <mat-header-cell *matHeaderCellDef>Details</mat-header-cell>
       <mat-cell *matCellDef="let row">
         <ul>
-          @for (sku of row.skus; track sku) {
+          @for (sku of row.skus; track sku.id) {
             <li layout="row">
               <div>
                 <mat-icon>
@@ -127,7 +127,7 @@
       <mat-header-cell *matHeaderCellDef class="right">Quantity</mat-header-cell>
       <mat-cell *matCellDef="let row" class="right">
         <ul>
-          @for (sku of row.skus; track sku) {
+          @for (sku of row.skus; track sku.id) {
             <li>{{ sku.fraction | number: '1.2-2' }}{{ row.fractionUnits }}</li>
           }
         </ul>

bookie/src/app/roles/role-detail/role-detail.component.html

@@ -15,7 +15,7 @@
     <div class="two-col">
       <div class="col">
         <h3>Permissions</h3>
-        @for (p of form.permissions; track p; let i = $index) {
+        @for (p of form.permissions; track p.id().value() || i; let i = $index) {
           <div class="row-container">
             <mat-checkbox
               [formField]="p.enabled"
@@ -29,7 +29,7 @@
 
       <div class="col">
         <h3>Includes Roles</h3>
-        @for (r of form.includedRoles; track r; let i = $index) {
+        @for (r of form.includedRoles; track r.id().value() || i; let i = $index) {
           <div class="row-container">
             <mat-checkbox [formField]="r.enabled" class="flex-auto">{{ r.name().value() }}</mat-checkbox>
           </div>

bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html

@@ -22,7 +22,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Tax</mat-label>
         <mat-select [formField]="form.tax">
-          @for (t of taxes(); track t) {
+          @for (t of taxes(); track t.id) {
             <mat-option [value]="t.id">
               {{ t.name }}
             </mat-option>

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

@@ -4,7 +4,7 @@
       <mat-form-field class="flex-auto basis-15">
         <mat-label>Regime</mat-label>
         <mat-select [formField]="form.regime">
-          @for (r of regimes; track r) {
+          @for (r of regimes; track r.id) {
             <mat-option [value]="r">
               {{ r.name }}
             </mat-option>

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

@@ -30,7 +30,7 @@
     </mat-card>
   </div>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button mat-button [mat-dialog-close]="selectedVal">Done</button>
 </mat-dialog-actions>

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

@@ -19,7 +19,7 @@
         [displayWith]="displayFn"
         (optionSelected)="selected($event)"
       >
-        @for (customer of customers(); track customer) {
+        @for (customer of customers(); track customer.id) {
           <mat-option [value]="customer">{{ customer.name }} - {{ customer.phone }}</mat-option>
         }
       </mat-autocomplete>
@@ -27,22 +27,22 @@
     <div class="row-container">
       <mat-form-field class="flex-auto">
         <mat-label>Name</mat-label>
-        <input matInput [value]="formModel().name" readonly />
+        <input matInput [formField]="form.name" />
       </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>
+        <textarea matInput [formField]="form.address"> </textarea>
       </mat-form-field>
     </div>
     <div class="row-container">
-      <mat-checkbox [checked]="formModel().printInBill" [disabled]="true">Print in Bill?</mat-checkbox>
+      <mat-checkbox [formField]="form.printInBill">Print in Bill?</mat-checkbox>
     </div>
     <p></p>
     <div class="discounts">
       <ul>
-        @for (r of formModel().discounts; track r.id) {
+        @for (r of form().value().discounts; track r.id) {
           @if (r.discount > 0) {
             <li>{{ r.name }} - {{ r.discount | percent: '1.2-2' }}</li>
           }
@@ -51,7 +51,7 @@
     </div>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <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

@@ -66,15 +66,20 @@ export class ChooseCustomerComponent {
     return typeof p === 'string' ? p.trim() : null;
   });
 
-  debouncedPhone = debounced(this.phoneSignal, 150);
+  debouncedPhone = debounced(this.phoneSignal, 300);
 
   customersResource = this.ser.autocomplete(this.debouncedPhone.value);
-  customers = computed(() => {
-    return this.customersResource.value() ?? [];
+  customers = linkedSignal<Customer[] | undefined, Customer[]>({
+    source: () => this.customersResource.value(),
+    computation: (newVal, previous) => {
+      if (!this.debouncedPhone.value()) return [];
+      return newVal ?? previous?.value ?? [];
+    },
   });
 
   save() {
     const customer = this.getItem();
+    console.log(customer);
     const promise = this.ser.saveOrUpdate(customer);
     promise.subscribe((x) => this.dialogRef.close(x));
   }
@@ -92,15 +97,15 @@ export class ChooseCustomerComponent {
   }
 
   getItem(): Customer {
-    const formModel = this.formModel();
+    const formValue = this.form().value();
 
     return new Customer({
-      id: formModel.id,
-      name: formModel.name ?? '',
-      phone: formModel.phone ?? '',
-      address: formModel.address ?? '',
-      printInBill: formModel.printInBill ?? false,
-      discounts: formModel.discounts.map((item) => ({ ...item })),
+      id: formValue.id,
+      name: formValue.name ?? '',
+      phone: formValue.phone ?? '',
+      address: formValue.address ?? '',
+      printInBill: formValue.printInBill ?? false,
+      discounts: formValue.discounts.map((item) => ({ ...item })),
     });
   }
 }

bookie/src/app/sales/discount/discount.component.html

@@ -16,7 +16,7 @@
             <input matInput type="number" [formField]="form.discounts[i].discount" autocomplete="off" />
             <span matTextSuffix>%</span>
             <mat-hint>Cust: {{ row.customer | percent: '1.2-2' }}</mat-hint>
-            <mat-hint align="end">Max: {{ row.limit | percent: '1.2-2' }}</mat-hint>
+            <mat-hint>Max: {{ row.limit | percent: '1.2-2' }}</mat-hint>
           </mat-form-field>
         </mat-cell>
       </ng-container>
@@ -26,7 +26,7 @@
     </mat-table>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button type="button" mat-button (click)="accept()" color="primary">Ok</button>
 </mat-dialog-actions>

bookie/src/app/sales/menu-categories/menu-categories.component.html

@@ -7,7 +7,7 @@
     <mat-card class="flex-col square-button warn" matRipple [routerLink]="['../']" queryParamsHandling="preserve">
       <h3>Back</h3>
     </mat-card>
-    @for (item of list(); track item) {
+    @for (item of list(); track item.id) {
       <mat-card
         class="primary flex-col square-button"
         matRipple

bookie/src/app/sales/modifiers/modifiers.component.html

@@ -30,6 +30,6 @@
     }
   </mat-tab-group>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="selected()">Done</button>
 </mat-dialog-actions>

bookie/src/app/sales/products/products.component.html

@@ -12,7 +12,7 @@
     >
       <h3>Back</h3>
     </mat-card>
-    @for (item of list(); track item) {
+    @for (item of list(); track item.id) {
       <mat-card
         class="flex-col square-button"
         matRipple

bookie/src/app/sales/reason/reason.component.html

@@ -26,7 +26,7 @@
     </mat-table>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button type="button" mat-button (click)="accept()" color="primary" [disabled]="!selected">Ok</button>
 </mat-dialog-actions>

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

@@ -6,7 +6,12 @@
   <h2 mat-dialog-title>Receive Payment</h2>
   <mat-dialog-content>
     <form class="flex-col">
-      <mat-table #table [dataSource]="dataSource()" [style.visibility]="this.displayTable() ? 'visible' : 'hidden'">
+      <mat-table
+        #table
+        [dataSource]="formModel().amounts"
+        [trackBy]="trackByRow"
+        [style.visibility]="displayTable() ? 'visible' : 'hidden'"
+      >
         <!-- Name Column -->
         <ng-container matColumnDef="name">
           <mat-header-cell *matHeaderCellDef class="bold">Amount</mat-header-cell>
@@ -16,7 +21,7 @@
         <!-- Amount Column -->
         <ng-container matColumnDef="amount">
           <mat-header-cell *matHeaderCellDef class="center bold" class="flex-auto">{{
-            amount | currency: 'INR'
+            data.amount | currency: 'INR'
           }}</mat-header-cell>
           <mat-cell *matCellDef="let row; let i = index" class="center flex-auto">
             <mat-form-field>
@@ -29,7 +34,7 @@
         <mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
         <mat-footer-row *matFooterRowDef="displayedColumns"></mat-footer-row>
       </mat-table>
-      <mat-form-field class="flex-auto" [style.visibility]="this.displayReason() ? 'visible' : 'hidden'">
+      <mat-form-field class="flex-auto" [style.visibility]="displayReason() ? 'visible' : 'hidden'">
         <mat-label>Reason</mat-label>
         <input
           type="text"
@@ -43,7 +48,7 @@
       </mat-form-field>
     </form>
   </mat-dialog-content>
-  <mat-dialog-actions align="end">
+  <mat-dialog-actions>
     <button mat-button [mat-dialog-close]>Cancel</button>
     <button type="button" mat-button (click)="accept()" color="primary" [disabled]="!!balance()">Ok</button>
   </mat-dialog-actions>

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

@@ -1,7 +1,7 @@
 import { CdkScrollableModule } from '@angular/cdk/scrolling';
 import { CurrencyPipe } from '@angular/common';
-import { Component, computed, effect, inject, signal } from '@angular/core';
-import { FormField, form } from '@angular/forms/signals';
+import { Component, computed, inject, linkedSignal, signal } from '@angular/core';
+import { form, FormField } from '@angular/forms/signals';
 import { MatButtonModule } from '@angular/material/button';
 import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -15,10 +15,7 @@ import { SkeletonLoaderComponent } from '../../shared/skeleton-loader/skeleton-l
 import { VoucherType } from '../bills/voucher-type';
 
 export interface ReceivePaymentFormData {
-  amounts: {
-    name: string;
-    amount: number;
-  }[];
+  amounts: ReceivePaymentItem[];
   son: string;
 }
 
@@ -47,59 +44,45 @@ export class ReceivePaymentComponent {
     amount: number;
   }>(MAT_DIALOG_DATA);
 
-  typeSignal = signal<VoucherType | undefined>(this.data.type);
+  type = this.data.type;
+
+  typeSignal = signal<VoucherType | undefined>(this.type);
   settleOptionsResource = this.ser.listForType(this.typeSignal);
 
-  choices = signal<ReceivePaymentItem[]>([]);
-  choicesWithAmount = computed(() => {
-    const amounts = this.formModel().amounts;
-    return this.choices().map((c, i) => ({ ...c, amount: amounts[i]?.amount ?? 0 }));
-  });
+  displayReason = computed(() => this.settleOptionsResource.value()?.some((n) => n.hasReason) ?? false);
+  displayTable = computed(() => (this.settleOptionsResource.value()?.length ?? 0) > 1);
 
-  type: VoucherType;
-  amount: number;
-  balance = computed(() => {
-    return this.amount - this.formModel().amounts.reduce((a, c) => a + (c.amount ?? 0), 0);
-  });
-
-  reason = '';
-  displayReason = signal<boolean | undefined>(undefined);
-  displayTable = signal<boolean | undefined>(undefined);
-  formModel = signal<ReceivePaymentFormData>({
-    amounts: [],
-    son: '',
+  formModel = linkedSignal({
+    source: () => this.settleOptionsResource.value(),
+    computation: (options): ReceivePaymentFormData => {
+      if (!options) {
+        return { amounts: [], son: '' };
+      }
+      const isTable = options.length > 1;
+      return {
+        amounts: options.map(
+          (y) =>
+            ({
+              ...y,
+              amount: !isTable ? this.data.amount : 0,
+            }) as ReceivePaymentItem,
+        ),
+        son: '',
+      };
+    },
   });
 
   form = form(this.formModel);
 
-  dataSource = this.choicesWithAmount;
+  balance = computed(() => {
+    return this.data.amount - this.formModel().amounts.reduce((a, c) => a + (c.amount ?? 0), 0);
+  });
 
   displayedColumns = ['name', 'amount'];
 
-  constructor() {
-    const data = this.data;
-    this.type = data.type;
-    this.amount = data.amount;
-    this.displayReason.set(false);
-    this.displayTable.set(false);
+  reason = '';
 
-    effect(() => {
-      const x = this.settleOptionsResource.value();
-      if (!x) return;
-      this.displayReason.set(x.reduce((o, n) => o || n.hasReason, false));
-      this.displayTable.set(x.length > 1);
-      const isTable = x.length > 1;
-      const choices = x.map((y) => ({ ...y, amount: !isTable ? this.amount : 0 }) as ReceivePaymentItem);
-      this.choices.set(choices);
-      this.formModel.update((f) => ({
-        ...f,
-        amounts: x.map((y) => ({
-          name: y.name,
-          amount: !isTable ? this.amount : 0,
-        })),
-      }));
-    });
-  }
+  trackByRow = (_: number, row: ReceivePaymentItem) => row.id ?? row.name ?? _;
 
   select(reason: string) {
     this.reason = reason.trim();
@@ -107,7 +90,7 @@ export class ReceivePaymentComponent {
   }
 
   accept(): void {
-    this.dialogRef.close({ choices: this.choicesWithAmount(), reason: this.reason });
+    this.dialogRef.close({ choices: this.formModel().amounts, reason: this.formModel().son.trim() || this.reason });
   }
 
   maxAmount(row: ReceivePaymentItem, index: number) {

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

@@ -6,7 +6,7 @@
   <h2>Running Tables</h2>
 
   <div class="tables-grid">
-    @for (table of list(); track table) {
+    @for (table of list(); track table.id) {
       <mat-card
         class="flex-col square-button"
         matRipple

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

@@ -2,7 +2,7 @@
 <mat-dialog-content>
   <form class="flex-col">
     <div>
-      @for (sc of list(); track sc; let i = $index) {
+      @for (sc of list(); track sc.id; let i = $index) {
         <div class="row-container">
           <mat-checkbox [formField]="form.saleCategories[i].saleCategory" class="flex-auto">{{ sc.name }}</mat-checkbox>
         </div>
@@ -10,7 +10,7 @@
     </div>
   </form>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button type="button" mat-button (click)="accept()" color="primary">Ok</button>
 </mat-dialog-actions>

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

@@ -1,7 +1,7 @@
 <h2 mat-dialog-title>Tables</h2>
 <mat-dialog-content>
   <div class="tables-grid">
-    @for (table of list.value(); track table) {
+    @for (table of list.value(); track table.id) {
       <mat-card
         class="flex-col square-button"
         matRipple
@@ -23,7 +23,7 @@
     }
   </div>
 </mat-dialog-content>
-<mat-dialog-actions align="end">
+<mat-dialog-actions>
   <button mat-button [mat-dialog-close]="false">Cancel</button>
   <button type="button" mat-button (click)="accept()" color="primary">Ok</button>
 </mat-dialog-actions>

bookie/src/app/section-printers/section-printer.component.html

@@ -9,7 +9,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Section</mat-label>
         <mat-select [formField]="form.section" (selectionChange)="show($event)">
-          @for (s of sections(); track s) {
+          @for (s of sections(); track s.id) {
             <mat-option [value]="s.id">
               {{ s.name }}
             </mat-option>
@@ -33,7 +33,7 @@
             <mat-label>Printer</mat-label>
             <mat-select [formField]="form.saleCategories[i].printer">
               <mat-option [value]="null">-- Default --</mat-option>
-              @for (p of printers(); track p) {
+              @for (p of printers(); track p.id) {
                 <mat-option [value]="p.id">
                   {{ p.name }}
                 </mat-option>

bookie/src/app/settle-option/settle-option-detail/settle-option-detail.component.html

@@ -15,7 +15,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Voucher Type</mat-label>
         <mat-select [formField]="form.voucherType">
-          @for (vt of voucherTypes; track vt) {
+          @for (vt of voucherTypes; track vt.id) {
             <mat-option [value]="vt.id">
               {{ vt.name }}
             </mat-option>
@@ -25,7 +25,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Reporting Level</mat-label>
         <mat-select [formField]="form.reportingLevel">
-          @for (rl of reportingLevel; track rl) {
+          @for (rl of reportingLevel; track rl.id) {
             <mat-option [value]="rl.id">
               {{ rl.name }}
             </mat-option>

bookie/src/app/tables/table-detail/table-detail.component.html

@@ -21,7 +21,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Section</mat-label>
         <mat-select [formField]="form.section">
-          @for (s of sections(); track s) {
+          @for (s of sections(); track s.id) {
             <mat-option [value]="s.id">
               {{ s.name }}
             </mat-option>

bookie/src/app/taxes/tax-detail/tax-detail.component.html

@@ -23,7 +23,7 @@
       <mat-form-field class="flex-auto">
         <mat-label>Regime</mat-label>
         <mat-select [formField]="form.regime">
-          @for (reg of regimes(); track reg) {
+          @for (reg of regimes(); track reg.id) {
             <mat-option [value]="reg.id">
               {{ reg.name }}
             </mat-option>

bookie/src/app/temporal-product/temporal-product-detail/temporal-product-detail.component.html

@@ -22,7 +22,7 @@
           <mat-form-field class="flex-auto">
             <mat-label>Sale Category</mat-label>
             <mat-select [formField]="productForm.saleCategory">
-              @for (sc of saleCategories(); track sc) {
+              @for (sc of saleCategories(); track sc.id) {
                 <mat-option [value]="sc.id">
                   {{ sc.name }}
                 </mat-option>
@@ -131,7 +131,7 @@
           <mat-form-field class="flex-auto">
             <mat-label>Menu Category</mat-label>
             <mat-select [formField]="skuForm.menuCategory">
-              @for (mc of menuCategories(); track mc) {
+              @for (mc of menuCategories(); track mc.id) {
                 <mat-option [value]="mc.id">
                   {{ mc.name }}
                 </mat-option>

bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html

@@ -14,7 +14,7 @@
         <mat-label>Menu Category</mat-label>
         <mat-select [formField]="form.menuCategory">
           <mat-option [value]="null">-- All Products --</mat-option>
-          @for (mc of menuCategoriesResource.value(); track mc) {
+          @for (mc of menuCategoriesResource.value(); track mc.id) {
             <mat-option [value]="mc.id">
               {{ mc.name }}
             </mat-option>
@@ -25,7 +25,7 @@
         <mat-label>Sale Category</mat-label>
         <mat-select [formField]="form.saleCategory">
           <mat-option [value]="null">-- All Products --</mat-option>
-          @for (mc of saleCategoriesResource.value(); track mc) {
+          @for (mc of saleCategoriesResource.value(); track mc.id) {
             <mat-option [value]="mc.id">
               {{ mc.name }}
             </mat-option>
@@ -40,7 +40,7 @@
       <mat-header-cell *matHeaderCellDef>Products</mat-header-cell>
       <mat-cell *matCellDef="let row">
         <ul>
-          @for (p of row.products; track p) {
+          @for (p of row.products; track p.versionId) {
             <li>
               <a [routerLink]="['/temporal-products', p.id]">
                 <b>{{ p.name }}</b>
@@ -61,7 +61,7 @@
       <mat-header-cell *matHeaderCellDef>Skus</mat-header-cell>
       <mat-cell *matCellDef="let row">
         <ul>
-          @for (s of row.skus; track s) {
+          @for (s of row.skus; track s.versionId) {
             <li>
               {{ s.units }}
             </li>

bookie/src/app/update-product-prices/update-product-prices.component.html

@@ -21,7 +21,7 @@
       <mat-form-field class="flex-auto basis-2-5">
         <mat-label>Menu Category</mat-label>
         <mat-select [formField]="form.menuCategory">
-          @for (s of menuCategories(); track s) {
+          @for (s of menuCategories(); track s.id) {
             <mat-option [value]="s.id">
               {{ s.name }}
             </mat-option>

bookie/src/app/users/user-detail/user-detail.component.html

@@ -23,7 +23,7 @@
     </div>
     <mat-divider></mat-divider>
     <div>
-      @for (r of form.roles; track r; let i = $index) {
+      @for (r of form.roles; track r.id().value() || i; let i = $index) {
         <div class="row-container">
           <mat-checkbox [formField]="r.enabled" class="flex-auto">{{ r.name().value() }}</mat-checkbox>
         </div>