chore: wip

Author: glennmichael123

storage/framework/core/commerce/types.ts

@@ -1,12 +1,41 @@
+// Import the CustomerTable type from the ORM
+import type {
+  CustomerJsonResponse,
+  CustomersTable,
+  CustomerType,
+  CustomerUpdate,
+  NewCustomer,
+} from '../../orm/src/models/Customer'
+
+// Re-export the types
+export type {
+  CustomerJsonResponse,
+  CustomersTable,
+  CustomerType,
+  CustomerUpdate,
+  NewCustomer,
+}
+
+// Define response structure for paginated customers
+export interface CustomerResponse {
+  data: CustomerJsonResponse[]
+  paging: {
+    total_records: number
+    page: number
+    total_pages: number
+  }
+  next_cursor: number | null
+}
+
 // Define the input for creating a customer
 export interface CreateCustomerInput {
   name: string
   email: string
   phone: string
   orders?: number
-  totalSpent?: number
-  lastOrder?: string
-  status?: 'Active' | 'Inactive'
+  total_spent?: number // Changed from totalSpent to match the schema
+  last_order?: string // Changed from lastOrder to match the schema
+  status?: string
   avatar?: string
   user_id?: number
 }
@@ -17,9 +46,9 @@ export interface UpdateCustomerInput {
   email?: string
   phone?: string
   orders?: number
-  totalSpent?: number
-  lastOrder?: string
-  status?: 'Active' | 'Inactive'
+  total_spent?: number // Changed from totalSpent to match the schema
+  last_order?: string // Changed from lastOrder to match the schema
+  status?: string
   avatar?: string
   user_id?: number
 }

storage/framework/defaults/models/Order.ts

@@ -34,16 +34,6 @@ export default {
   hasMany: ['Order'],
 
   attributes: {
-    customer_id: {
-      required: true,
-      order: 1,
-      fillable: true,
-      validation: {
-        rule: schema.string(),
-      },
-      factory: (faker: Faker) => faker.string.uuid(),
-    },
-
     status: {
       required: true,
       order: 2,

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

@@ -25,7 +25,6 @@ export interface OrdersTable {
   user?: UserModel
   coupon_id?: number
   coupon?: CouponModel
-  customer_id?: string
   status?: string
   total_amount?: number
   tax_amount?: number
@@ -76,7 +75,7 @@ interface QueryOptions {
 
 export class OrderModel {
   private readonly hidden: Array<keyof OrderJsonResponse> = []
-  private readonly fillable: Array<keyof OrderJsonResponse> = ['customer_id', 'status', 'total_amount', 'tax_amount', 'discount_amount', 'delivery_fee', 'tip_amount', 'order_type', 'delivery_address', 'special_instructions', 'estimated_delivery_time', 'applied_coupon_id', 'order_items', 'uuid', 'customer_id', 'gift_card_id', 'coupon_id']
+  private readonly fillable: Array<keyof OrderJsonResponse> = ['status', 'total_amount', 'tax_amount', 'discount_amount', 'delivery_fee', 'tip_amount', 'order_type', 'delivery_address', 'special_instructions', 'estimated_delivery_time', 'applied_coupon_id', 'order_items', 'uuid', 'customer_id', 'gift_card_id', 'coupon_id']
   private readonly guarded: Array<keyof OrderJsonResponse> = []
   protected attributes: Partial<OrderJsonResponse> = {}
   protected originalAttributes: Partial<OrderJsonResponse> = {}
@@ -182,10 +181,6 @@ export class OrderModel {
     return this.attributes.uuid
   }
 
-  get customer_id(): string | undefined {
-    return this.attributes.customer_id
-  }
-
   get status(): string | undefined {
     return this.attributes.status
   }
@@ -246,10 +241,6 @@ export class OrderModel {
     this.attributes.uuid = value
   }
 
-  set customer_id(value: string) {
-    this.attributes.customer_id = value
-  }
-
   set status(value: string) {
     this.attributes.status = value
   }
@@ -1238,14 +1229,6 @@ export class OrderModel {
     return instance
   }
 
-  static whereCustomerId(value: string): OrderModel {
-    const instance = new OrderModel(null)
-
-    instance.selectFromQuery = instance.selectFromQuery.where('customer_id', '=', value)
-
-    return instance
-  }
-
   static whereStatus(value: string): OrderModel {
     const instance = new OrderModel(null)
 
@@ -1899,7 +1882,6 @@ export class OrderModel {
     const output: Partial<OrderJsonResponse> = {
 
       id: this.id,
-      customer_id: this.customer_id,
       status: this.status,
       total_amount: this.total_amount,
       tax_amount: this.tax_amount,
@@ -1972,13 +1954,6 @@ export async function remove(id: number): Promise<void> {
     .execute()
 }
 
-export async function whereCustomerId(value: string): Promise<OrderModel[]> {
-  const query = DB.instance.selectFrom('orders').where('customer_id', '=', value)
-  const results = await query.execute()
-
-  return results.map((modelItem: OrderModel) => new OrderModel(modelItem))
-}
-
 export async function whereStatus(value: string): Promise<OrderModel[]> {
   const query = DB.instance.selectFrom('orders').where('status', '=', value)
   const results = await query.execute()

storage/framework/requests/OrderRequest.ts

@@ -13,7 +13,6 @@ interface CustomAttributes {
 }
 interface RequestDataOrder {
   id: number
-  customer_id: string
   status: string
   total_amount: number
   tax_amount: number
@@ -34,7 +33,6 @@ interface RequestDataOrder {
 }
 export class OrderRequest extends Request<RequestDataOrder> implements OrderRequestType {
   public id = 1
-  public customer_id = ''
   public status = ''
   public total_amount = 0
   public tax_amount = 0

storage/framework/server-auto-imports.json

@@ -244,4 +244,4 @@
     "transactionRequest": true,
     "userRequest": true
   }
-}
+}

storage/framework/types/attributes.ts

@@ -76,7 +76,6 @@ export interface Attributes {
   expiry_date: string
   last_used_date: string
   template_id: string
-  customer_id: string
   total_amount: number
   tax_amount: number
   discount_amount: number

storage/framework/types/requests.d.ts

@@ -483,7 +483,6 @@ export interface GiftCardRequestType extends Request {
 
 interface RequestDataOrder {
   id: number
-  customer_id: string
   status: string
   total_amount: number
   tax_amount: number
@@ -504,11 +503,10 @@ interface RequestDataOrder {
 }
 export interface OrderRequestType extends Request {
   validate: (attributes?: CustomAttributes) => void
-  get: ((key: 'id') => number) & ((key: 'customer_id' | 'status' | 'order_type' | 'delivery_address' | 'special_instructions' | 'estimated_delivery_time' | 'applied_coupon_id' | 'order_items') => string) & ((key: 'total_amount' | 'tax_amount' | 'discount_amount' | 'delivery_fee' | 'tip_amount') => number) & ((key: 'customer_id') => string) & ((key: 'gift_card_id') => string) & ((key: 'coupon_id') => string)
+  get: ((key: 'id') => number) & ((key: 'status' | 'order_type' | 'delivery_address' | 'special_instructions' | 'estimated_delivery_time' | 'applied_coupon_id' | 'order_items') => string) & ((key: 'total_amount' | 'tax_amount' | 'discount_amount' | 'delivery_fee' | 'tip_amount') => number) & ((key: 'customer_id') => string) & ((key: 'gift_card_id') => string) & ((key: 'coupon_id') => string)
 
   all: () => RequestDataOrder
   id: number
-  customer_id: string
   status: string
   total_amount: number
   tax_amount: number

storage/framework/types/server-auto-imports.d.ts

@@ -244,4 +244,4 @@ declare global {
   const teamRequest: typeof import('./../requests')['teamRequest']
   const transactionRequest: typeof import('./../requests')['transactionRequest']
   const userRequest: typeof import('./../requests')['userRequest']
-}
+}