chore: wip

Author: glennmichael123

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

@@ -1,5 +1,5 @@
 import type { GiftCardJsonResponse } from '../../../../orm/src/models/GiftCard'
-import type { FetchGiftCardsOptions, GiftCardResponse, GiftCardStats } from '../../types'
+import type { GiftCardStats } from '../../types'
 import { db, sql } from '@stacksjs/database'
 
 /**
@@ -39,12 +39,14 @@ export async function fetchByCode(code: string): Promise<GiftCardJsonResponse |
 /**
  * Fetch active gift cards (is_active = true and not expired)
  */
-export async function fetchActive(options: FetchGiftCardsOptions = {}): Promise<GiftCardResponse> {
-  return fetchPaginated({
-    ...options,
-    is_active: true,
-    status: 'ACTIVE',
-  })
+export async function fetchActive(): Promise<GiftCardJsonResponse> {
+  const giftCards = await db
+    .selectFrom('gift_cards')
+    .where('is_active', '=', true)
+    .selectAll()
+    .execute()
+
+  return giftCards
 }
 
 /**

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

@@ -1,6 +1,6 @@
+import type { OrderJsonResponse } from '../../../../orm/src/models/Order'
 import type {
   OrderStats,
-  OrderType,
   OrderTypeCount,
   StatusCount,
 } from '../../types'
@@ -9,7 +9,7 @@ import { db } from '@stacksjs/database'
 /**
  * Fetch all orders from the database with their items
  */
-export async function fetchAll(): Promise<OrderType[]> {
+export async function fetchAll(): Promise<OrderJsonResponse[]> {
   const orders = await db
     .selectFrom('orders')
     .selectAll()
@@ -33,7 +33,7 @@ export async function fetchAll(): Promise<OrderType[]> {
 /**
  * Fetch an order by ID
  */
-export async function fetchById(id: number): Promise<OrderType | undefined> {
+export async function fetchById(id: number): Promise<OrderJsonResponse | undefined> {
   const order = await db
     .selectFrom('orders')
     .where('id', '=', id)
@@ -352,7 +352,7 @@ export async function fetchDailyOrderTrends(daysRange: number = 30): Promise<{
     .execute()
 
   return dailyOrders.map(day => ({
-    date: day.created_at,
+    date: day.created_at!,
     order_count: Number(day.order_count || 0),
     revenue: Number(day.revenue || 0),
   }))

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

@@ -1,26 +1,26 @@
 // Export all order functions
 
-// Fetch operations
-export {
-  fetchAll,
-  fetchById,
-  fetchStats,
-  compareOrdersByPeriod,
-  calculateOrderMetrics,
-  fetchDailyOrderTrends
-} from './fetch'
-
 // Delete operations
 export {
+  bulkDestroy,
+  bulkSoftDelete,
   destroy,
   softDelete,
-  bulkDestroy,
-  bulkSoftDelete
 } from './destroy'
 
 // Export operations
 export {
-  exportOrders,
   downloadOrders,
-  storeOrdersExport
-} from './export'
+  exportOrders,
+  storeOrdersExport,
+} from './export'
+
+// Fetch operations
+export {
+  calculateOrderMetrics,
+  compareOrdersByPeriod,
+  fetchAll,
+  fetchById,
+  fetchDailyOrderTrends,
+  fetchStats,
+} from './fetch'

storage/framework/core/commerce/src/variants/destroy.ts

@@ -53,4 +53,4 @@ export async function bulkDestroy(ids: number[]): Promise<number> {
 
     throw error
   }
-}
+}

storage/framework/core/commerce/src/variants/index.ts

@@ -1,17 +1,17 @@
 export {
-    store, 
-    bulkStore,
-    formatVariantOptions,
-    generateVariantCombinations
-  } from './store'
-  
-  export {
-    update,
-    bulkUpdate,
-    updateStatus
-  } from './update'
-  
-  export {
-    destroy,
-    bulkDestroy
-  } from './destroy'
+  bulkDestroy,
+  destroy,
+} from './destroy'
+
+export {
+  bulkStore,
+  formatVariantOptions,
+  generateVariantCombinations,
+  store,
+} from './store'
+
+export {
+  bulkUpdate,
+  update,
+  updateStatus,
+} from './update'

storage/framework/core/commerce/src/variants/update.ts

@@ -1,7 +1,7 @@
 // Import dependencies
 import type { ProductVariantRequestType } from '@stacksjs/orm'
-import { db } from '@stacksjs/database'
 import type { ProductVariantJsonResponse } from '../../../../orm/src/models/ProductVariant'
+import { db } from '@stacksjs/database'
 
 /**
  * Update an existing product variant
@@ -82,7 +82,6 @@ export async function bulkUpdate(updates: Array<{
           updated_at: new Date(),
         }
 
-
         // Skip if no fields to update
         if (Object.keys(variantData).length === 0)
           continue
@@ -122,9 +121,9 @@ export async function updateStatus(id: number, status: string): Promise<boolean>
   try {
     const result = await db
       .updateTable('product_variants')
-      .set({ 
+      .set({
         status,
-        updated_at: new Date()
+        updated_at: new Date(),
       })
       .where('id', '=', id)
       .executeTakeFirst()
@@ -138,4 +137,4 @@ export async function updateStatus(id: number, status: string): Promise<boolean>
 
     throw error
   }
-}
+}

storage/framework/core/commerce/types.ts

@@ -1,4 +1,3 @@
-
 // Import the CustomerTable type from the ORM
 import type { CouponModel } from '../../orm/src/models/Coupon'
 import type {
@@ -59,7 +58,6 @@ export interface UpdateCustomerInput {
   user_id?: number
 }
 
-
 // Define the structure of an order item
 export interface OrderItem {
   product_id: string

storage/framework/defaults/models/ecommerce/GiftCard.ts

@@ -29,7 +29,7 @@ export default {
     observe: true,
   },
 
-  belongsTo: ['User'], // For purchaser_id
+  belongsTo: ['Customer'],
   hasMany: ['Order'],
 
   attributes: {

storage/framework/orm/src/models/GiftCard.ts

@@ -1,7 +1,7 @@
 import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
+import type { CustomerModel } from './Customer'
 import type { OrderModel } from './Order'
-import type { UserModel } from './User'
 import { randomUUIDv7 } from 'bun'
 import { cache } from '@stacksjs/cache'
 import { sql } from '@stacksjs/database'
@@ -10,11 +10,11 @@ import { dispatch } from '@stacksjs/events'
 
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
-import User from './User'
+import Customer from './Customer'
 
 export interface GiftCardsTable {
   id: Generated<number>
-  user_id: number
+  customer_id: number
   code: string
   initial_balance: number
   current_balance: number
@@ -149,12 +149,12 @@ export class GiftCardModel {
     return this.attributes.orders
   }
 
-  get user_id(): number {
-    return this.attributes.user_id
+  get customer_id(): number {
+    return this.attributes.customer_id
   }
 
-  get user(): UserModel | undefined {
-    return this.attributes.user
+  get customer(): CustomerModel | undefined {
+    return this.attributes.customer
   }
 
   get id(): number {
@@ -1846,12 +1846,12 @@ export class GiftCardModel {
       .execute()
   }
 
-  async userBelong(): Promise<UserModel> {
-    if (this.user_id === undefined)
+  async customerBelong(): Promise<CustomerModel> {
+    if (this.customer_id === undefined)
       throw new HttpError(500, 'Relation Error!')
 
-    const model = await User
-      .where('id', '=', this.user_id)
+    const model = await Customer
+      .where('id', '=', this.customer_id)
       .first()
 
     if (!model)
@@ -1931,8 +1931,8 @@ export class GiftCardModel {
       updated_at: this.updated_at,
 
       orders: this.orders,
-      user_id: this.user_id,
-      user: this.user,
+      customer_id: this.customer_id,
+      customer: this.customer,
       ...this.customColumns,
     }