mid

bookie/src/app/sales/bills/bills-datasource.ts

@@ -0,0 +1,52 @@
+import { DataSource } from '@angular/cdk/collections';
+import { map, Observable, tap } from 'rxjs';
+
+import { BillRow } from './bill-row';
+import { Kot } from './kot';
+
+export class BillsDataSource extends DataSource<BillRow> {
+  private data: Kot[] = [];
+  constructor(private readonly dataObs: Observable<Kot[]>) {
+    super();
+  }
+
+  connect(): Observable<BillRow[]> {
+    return this.dataObs.pipe(
+      tap((x) => {
+        this.data = x;
+      }),
+      map((d) =>
+        d.flatMap((k) => {
+          const kotRow: BillRow = new BillRow({ kind: 'kot', kot: k, id: k.id! });
+          const rows: BillRow[] = [];
+          for (const inv of k.inventories) {
+            if (!inv.id) {
+              inv.clientId = inv.clientId || crypto.randomUUID();
+            }
+            rows.push(new BillRow({ kind: 'inv', kot: k, inv, id: `${k.id}-${inv.id || inv.clientId}` }));
+            if (inv.type === 'bundle') {
+              for (const child of inv.children) {
+                if (!child.id) {
+                  child.clientId = child.clientId || crypto.randomUUID();
+                }
+                child.parentId = inv.id || inv.clientId;
+                rows.push(
+                  new BillRow({
+                    kind: 'child',
+                    kot: k,
+                    parent: inv,
+                    inv: child,
+                    id: `${k.id}-${child.id || child.clientId}`,
+                  }),
+                );
+              }
+            }
+          }
+          return [kotRow, ...rows];
+        }),
+      ),
+    );
+  }
+
+  disconnect() {}
+}

bookie/src/app/sales/bills/bills.component.ts

@@ -1,5 +1,5 @@
 import { CommonModule, CurrencyPipe } from '@angular/common';
-import { Component, OnInit, inject, input, effect } from '@angular/core';
+import { Component, OnInit, inject, computed, effect, input } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDialog } from '@angular/material/dialog';
@@ -24,9 +24,11 @@ import { QuantityComponent } from '../quantity/quantity.component';
 import { TablesDialogComponent } from '../tables-dialog/tables-dialog.component';
 import { Bill } from './bill';
 import { BillRow } from './bill-row';
+import { BillsDataSource } from './bills-datasource';
 import { Inventory } from './inventory';
 import { Kot } from './kot';
 import { VoucherType } from './voucher-type';
+import { VoucherService } from './voucher.service';
 
 @Component({
   selector: 'app-bills',
@@ -52,10 +54,27 @@ export class BillsComponent implements OnInit {
   private auth = inject(AuthService);
   bs = inject(BillService);
   private tSer = inject(TableService);
-  updateTable = input.required<boolean>();
-  item = input.required<Bill>();
+  private voucherService = inject(VoucherService);
+
+  table = input<string | null>(null);
+  guest = input<string | null>(null);
+  voucher = input<string | null>(null);
+  bill = input<string | null>(null);
+
+  updateTable = computed(() => this.bill() !== null && this.voucher() !== null);
+
+  dataSource: BillsDataSource = new BillsDataSource(this.bs.dataObs);
+
+  billResource = this.voucherService.getFromBill(this.bill);
+
+  tableResource = this.voucherService.getFromTable(this.table, this.voucher, this.guest);
+
+  idResource = this.voucherService.getFromId(this.voucher);
+
+  item = computed(
+    () => this.billResource.value() ?? this.tableResource.value() ?? this.idResource.value() ?? new Bill(),
+  );
 
-  dataSource = this.bs.dataObs;
   /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
   kotColumns: string[] = ['selectKot', 'infoKot', 'kotActions'];
   displayedColumns: string[] = ['selectInv', 'infoInv', 'quantity'];
@@ -266,7 +285,10 @@ export class BillsComponent implements OnInit {
 
   constructor() {
     effect(() => {
-      this.bs.loadData(this.item(), this.updateTable());
+      const bill = this.item();
+      if (bill) {
+        this.bs.loadData(bill, this.updateTable());
+      }
     });
   }
 }

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

@@ -1,5 +1,5 @@
 import { HttpParams, HttpClient, httpResource, HttpResourceRef } from '@angular/common/http';
-import { Injectable, inject } from '@angular/core';
+import { Injectable, inject, Signal } from '@angular/core';
 import { Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
@@ -19,41 +19,50 @@ export class VoucherService {
   private http = inject(HttpClient);
   private log = inject(ErrorLoggerService);
 
-  get(id: string): HttpResourceRef<Bill | undefined> {
-    return httpResource<Bill>(() => `${url}/from-id/${id}`);
+  get(id: Signal<string | null | undefined>): HttpResourceRef<Bill | undefined> {
+    return httpResource<Bill>(() => {
+      const i = id();
+      return i ? `${url}/from-id/${i}` : undefined;
+    });
   }
 
-  getFromTable(tableId: string, voucherId: string | null, guestId: string | null): Observable<Bill> {
-    let params = new HttpParams();
-    if (voucherId !== null) {
-      params = params.set('v', voucherId);
-    }
-    if (guestId !== null) {
-      params = params.set('g', guestId);
-    }
+  getFromTable(
+    tableId: Signal<string | null | undefined>,
+    voucherId: Signal<string | null | undefined>,
+    guestId: Signal<string | null | undefined>,
+  ): HttpResourceRef<Bill | undefined> {
+    return httpResource<Bill>(() => {
+      const tId = tableId();
+      if (!tId) return undefined;
 
-    return this.http
-      .get<Bill>(`${url}/from-table/${tableId}`, { params })
-      .pipe(
-        catchError(
-          this.log.handleError(
-            serviceName,
-            `getFromTable tableId=${tableId} voucherId=${voucherId} guestId=${guestId}`,
-          ),
-        ),
-      ) as Observable<Bill>;
+      const searchParams = new URLSearchParams();
+      const vId = voucherId();
+      if (vId !== null && vId !== undefined) {
+        searchParams.set('v', vId);
+      }
+      const gId = guestId();
+      if (gId !== null && gId !== undefined) {
+        searchParams.set('g', gId);
+      }
+
+      const query = searchParams.toString();
+      return `${url}/from-table/${tId}${query ? '?' + query : ''}`;
+    });
   }
 
-  getFromBill(billId: string): Observable<Bill> {
-    return this.http
-      .get<Bill>(`${url}/from-bill/${billId}`)
-      .pipe(catchError(this.log.handleError(serviceName, `getFromBill billId=${billId}`))) as Observable<Bill>;
+  getFromBill(billId: Signal<string | null | undefined>): HttpResourceRef<Bill | undefined> {
+    return httpResource<Bill>(() => {
+      const id = billId();
+      console.log(id);
+      return id ? `${url}/from-bill/${id}` : undefined;
+    });
   }
 
-  getFromId(voucherId: string): Observable<Bill> {
-    return this.http
-      .get<Bill>(`${url}/from-id/${voucherId}`)
-      .pipe(catchError(this.log.handleError(serviceName, `getFromId voucherId=${voucherId}`))) as Observable<Bill>;
+  getFromId(voucherId: Signal<string | null | undefined>): HttpResourceRef<Bill | undefined> {
+    return httpResource<Bill>(() => {
+      const id = voucherId();
+      return id ? `${url}/from-id/${id}` : undefined;
+    });
   }
 
   save(voucher: Bill, voucherType: VoucherType, guestBookId: string | null, updateTable: boolean): Observable<boolean> {