Version Bump v15.1.6

barker/barker/__version__.py

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

barker/pyproject.toml

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

bookie/package.json

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

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

@@ -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

@@ -79,6 +79,7 @@ export class ChooseCustomerComponent {
 
   save() {
     const customer = this.getItem();
+    console.log(customer);
     const promise = this.ser.saveOrUpdate(customer);
     promise.subscribe((x) => this.dialogRef.close(x));
   }
@@ -96,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/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/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/split-bill/split-bill.component.html

@@ -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

@@ -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>