chore: wip

Author: glennmichael123

storage/framework/core/commerce/src/customers/fetch.ts

@@ -4,7 +4,7 @@ import { db } from '@stacksjs/database'
 /**
  * Fetch a customer by ID
  */
-export async function fetchById(id: number | bigint): Promise<CustomerJsonResponse | undefined> {
+export async function fetchById(id: number): Promise<CustomerJsonResponse | undefined> {
   return await db
     .selectFrom('customers')
     .where('id', '=', id)

storage/framework/core/commerce/src/customers/store.ts

@@ -20,7 +20,7 @@ export async function store(data: NewCustomer): Promise<CustomerJsonResponse> {
 
     const insertId = result.insertId || Number(result.numInsertedOrUpdatedRows)
 
-    const customerResult = await fetchById(insertId) as CustomerJsonResponse
+    const customerResult = await fetchById(Number(insertId)) as CustomerJsonResponse
 
     return customerResult
   }

storage/framework/core/commerce/src/gift-cards/update.ts

@@ -1,6 +1,6 @@
 import type { GiftCardJsonResponse, GiftCardUpdate } from '@stacksjs/orm'
 import { db } from '@stacksjs/database'
-import { formatDate, toTimestamp } from '@stacksjs/orm'
+import { formatDate } from '@stacksjs/orm'
 import { fetchById } from './fetch'
 
 /**
@@ -78,7 +78,7 @@ export async function updateBalance(id: number, amount: number): Promise<GiftCar
       .updateTable('gift_cards')
       .set({
         current_balance: newBalance,
-        last_used_date: toTimestamp(new Date()),
+        last_used_date: formatDate(new Date()),
         status: newBalance === 0 ? 'USED' : 'ACTIVE',
         updated_at: formatDate(new Date()),
       })

storage/framework/core/commerce/src/orders/export.ts

@@ -61,6 +61,9 @@ async function fetchAllWithDetails(): Promise<OrderWithTotals[] | []> {
 
   const orderItemsMap = allOrderItems.reduce<Record<number, { totalItems: number, totalPrice: number }>>(
     (acc, item) => {
+      if (!item.order_id)
+        return acc // Skip items without order_id
+
       if (!acc[item.order_id]) {
         acc[item.order_id] = {
           totalItems: 0,

storage/framework/core/commerce/src/receipts/fetch.ts

@@ -1,5 +1,6 @@
 import type { ReceiptJsonResponse } from '@stacksjs/orm'
 import { db } from '@stacksjs/database'
+import { formatDate } from '@stacksjs/orm'
 
 /**
  * Fetch a print log by ID
@@ -27,8 +28,8 @@ export async function fetchAll(): Promise<ReceiptJsonResponse[]> {
  * @returns Object containing counts for each status and total
  */
 export async function fetchPrintJobStats(
-  startDate: number,
-  endDate: number,
+  startDate: Date,
+  endDate: Date,
 ): Promise<{
     total: number
     success: number
@@ -40,7 +41,7 @@ export async function fetchPrintJobStats(
   }> {
   const stats = await db
     .selectFrom('receipts')
-    .where('timestamp', '>=', startDate)
+    .where('timestamp', '>=', formatDate(startDate))
     .where('timestamp', '<=', endDate)
     .select([
       db.fn.count<number>('id').as('total'),
@@ -72,8 +73,8 @@ export async function fetchPrintJobStats(
  * @returns Object containing success rate percentage and detailed counts
  */
 export async function fetchSuccessRate(
-  startDate: number,
-  endDate: number,
+  startDate: Date,
+  endDate: Date,
 ): Promise<{
     successRate: number
     total: number
@@ -83,8 +84,8 @@ export async function fetchSuccessRate(
   }> {
   const stats = await db
     .selectFrom('receipts')
-    .where('timestamp', '>=', startDate)
-    .where('timestamp', '<=', endDate)
+    .where('timestamp', '>=', formatDate(startDate))
+    .where('timestamp', '<=', formatDate(endDate))
     .select([
       db.fn.count<number>('id').as('total'),
       db.fn.count<number>('id').filterWhere('status', '=', 'success').as('success'),
@@ -118,17 +119,17 @@ export async function fetchSuccessRate(
  * @returns Object containing total pages and average pages per receipt
  */
 export async function fetchPageStats(
-  startDate: number,
-  endDate: number,
+  startDate: Date,
+  endDate: Date,
 ): Promise<{
     totalPages: number
     averagePagesPerReceipt: number
     totalReceipts: number
   }> {
   const stats = await db
     .selectFrom('receipts')
-    .where('timestamp', '>=', startDate)
-    .where('timestamp', '<=', endDate)
+    .where('timestamp', '>=', formatDate(startDate))
+    .where('timestamp', '<=', formatDate(endDate))
     .select([
       db.fn.count<number>('id').as('totalReceipts'),
       db.fn.sum<number>('pages').as('totalPages'),
@@ -151,8 +152,8 @@ export async function fetchPageStats(
  * @returns Object containing average print time and related statistics
  */
 export async function fetchPrintTimeStats(
-  startDate: number,
-  endDate: number,
+  startDate: Date,
+  endDate: Date,
 ): Promise<{
     averageDuration: number
     minDuration: number
@@ -161,8 +162,8 @@ export async function fetchPrintTimeStats(
   }> {
   const stats = await db
     .selectFrom('receipts')
-    .where('timestamp', '>=', startDate)
-    .where('timestamp', '<=', endDate)
+    .where('timestamp', '>=', formatDate(startDate))
+    .where('timestamp', '<=', formatDate(endDate))
     .select([
       db.fn.count<number>('id').as('totalJobs'),
       db.fn.avg<number>('duration').as('averageDuration'),
@@ -187,8 +188,8 @@ export async function fetchPrintTimeStats(
  * @returns Object containing prints per hour statistics
  */
 export async function fetchPrintsPerHour(
-  startDate: number,
-  endDate: number,
+  startDate: Date,
+  endDate: Date,
 ): Promise<{
     totalPrints: number
     totalHours: number
@@ -200,13 +201,13 @@ export async function fetchPrintsPerHour(
   }> {
   const receipts = await db
     .selectFrom('receipts')
-    .where('timestamp', '>=', startDate)
-    .where('timestamp', '<=', endDate)
+    .where('timestamp', '>=', formatDate(startDate))
+    .where('timestamp', '<=', formatDate(endDate))
     .selectAll()
     .execute()
 
   const totalPrints = receipts.length
-  const totalHours = Math.ceil((endDate - startDate) / (1000 * 60 * 60))
+  const totalHours = Math.ceil((endDate.getTime() - startDate.getTime()) / (1000 * 60 * 60))
   const printsPerHour = totalHours > 0 ? Math.round(totalPrints / totalHours) : 0
 
   const hourlyBreakdown = Array.from({ length: 24 }, (_, i) => ({

storage/framework/core/commerce/src/receipts/printer.ts

@@ -31,24 +31,48 @@ interface Receipt {
 }
 
 class TSPIVPrinter implements PrinterDriver {
-  async print(receipt: Receipt): Promise<void> {
+  async print(printJob: PrintJob): Promise<void> {
     // eslint-disable-next-line no-console
-    console.log('TSP IV Printer: Printing receipt', receipt)
+    console.log('TSP IV Printer: Printing receipt', printJob.receipt)
     // Implement actual printing logic here
   }
 
-  async cleanUp(): Promise<void> {
+  async cleanUp(printer: Printer): Promise<void> {
     // eslint-disable-next-line no-console
     console.log('TSP IV Printer: Cleaning up print job...')
     // Implement actual cleanup logic here
   }
 
-  async checkStatus(): Promise<boolean> {
+  async checkStatus(printer: Printer): Promise<boolean> {
     // eslint-disable-next-line no-console
     console.log('TSP IV Printer: Checking online status...')
     // Implement actual status check logic here
     return true // Return actual status
   }
+
+  async findPrinters(): Promise<Printer[]> {
+    // eslint-disable-next-line no-console
+    console.log('TSP IV Printer: Finding printers...')
+    return [] // Return actual printers
+  }
+
+  async setup(printer: Printer): Promise<void> {
+    // eslint-disable-next-line no-console
+    console.log('TSP IV Printer: Setting up printer...')
+    // Implement actual setup logic here
+  }
+
+  async restart(): Promise<void> {
+    // eslint-disable-next-line no-console
+    console.log('TSP IV Printer: Restarting...')
+    // Implement actual restart logic here
+  }
+
+  async canInteractWithPrinter(printer: Printer): Promise<boolean> {
+    // eslint-disable-next-line no-console
+    console.log('TSP IV Printer: Checking if can interact with printer...')
+    return true // Return actual capability
+  }
 }
 
 // Export the TSP IV printer instance

storage/framework/core/commerce/src/shippings/shipping-rates/update.ts

@@ -86,15 +86,15 @@ export async function bulkUpdate(updates: Array<{
  * @param data The update data to apply
  * @returns Number of shipping rates updated
  */
-export async function updateByZone(zone: string, data: ShippingRateUpdate): Promise<number> {
+export async function updateByZone(zone: number, data: ShippingRateUpdate): Promise<number> {
   try {
     const result = await db
       .updateTable('shipping_rates')
       .set({
         ...data,
         updated_at: formatDate(new Date()),
       })
-      .where('zone', '=', zone)
+      .where('zone_id', '=', zone)
       .executeTakeFirst()
 
     return Number(result.numUpdatedRows)

storage/framework/defaults/models/commerce/ShippingRate.ts

@@ -11,10 +11,10 @@ export default {
     useUuid: true,
     useTimestamps: true,
     useSearch: {
-      displayable: ['id', 'method', 'zone', 'weightFrom', 'weightTo', 'rate'],
-      searchable: ['method', 'zone'],
-      sortable: ['method', 'zone', 'weightFrom', 'weightTo', 'rate', 'createdAt', 'updatedAt'],
-      filterable: ['method', 'zone'],
+      displayable: ['id', 'method', 'weightFrom', 'weightTo', 'rate'],
+      searchable: ['method'],
+      sortable: ['method', 'weightFrom', 'weightTo', 'rate', 'createdAt', 'updatedAt'],
+      filterable: ['method'],
     },
 
     useSeeder: {