database/migrations/1742737140035-create-shipping_zones-table.ts

@@ -0,0 +1,19 @@
+import type { Database } from '@stacksjs/database'
+import { sql } from '@stacksjs/database'
+
+export async function up(db: Database<any>) {
+  await db.schema
+    .createTable('shipping_zones')
+    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
+    .addColumn('uuid', 'text')
+    .addColumn('name', 'text', col => col.notNull())
+    .addColumn('countries', 'text')
+    .addColumn('regions', 'text')
+    .addColumn('postal_codes', 'text')
+    .addColumn('status', 'text', col => col.notNull())
+    .addColumn('shipping_method_id', 'integer', col =>
+      col.references('shipping_methods.id').onDelete('cascade'))
+    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
+    .addColumn('updated_at', 'timestamp')
+    .execute()
+}

database/migrations/1742726743476-create-shipping_methods-table.ts → database/migrations/1742737140208-create-shipping_methods-table.ts

@@ -9,8 +9,7 @@ export async function up(db: Database<any>) {
     .addColumn('name', 'text', col => col.notNull())
     .addColumn('description', 'text')
     .addColumn('base_rate', 'numeric', col => col.notNull())
-    .addColumn('free_shipping', 'text')
-    .addColumn('zones', 'text', col => col.notNull())
+    .addColumn('free_shipping', 'numeric')
     .addColumn('status', 'text', col => col.notNull())
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')

storage/framework/actions/src/ShippingRateDestroyOrmAction.ts

@@ -0,0 +1,17 @@
+import type { ShippingRateRequestType } from '@stacksjs/orm'
+import { Action } from '@stacksjs/actions'
+
+export default new Action({
+  name: 'ShippingRate Destroy',
+  description: 'ShippingRate Destroy ORM Action',
+  method: 'DELETE',
+  async handle(request: ShippingRateRequestType) {
+    const id = request.getParam('id')
+
+    const model = await ShippingRate.findOrFail(Number(id))
+
+    model.delete()
+
+    return 'Model deleted!'
+  },
+})

storage/framework/actions/src/ShippingRateIndexOrmAction.ts

@@ -0,0 +1,13 @@
+import { Action } from '@stacksjs/actions'
+import { response } from '@stacksjs/router'
+
+export default new Action({
+  name: 'ShippingRate Index',
+  description: 'ShippingRate Index ORM Action',
+  method: 'GET',
+  async handle() {
+    const results = ShippingRate.all()
+
+    return response.json(results)
+  },
+})

storage/framework/actions/src/ShippingRateShowOrmAction.ts

@@ -0,0 +1,17 @@
+import type { ShippingRateRequestType } from '@stacksjs/orm'
+import { Action } from '@stacksjs/actions'
+
+import { response } from '@stacksjs/router'
+
+export default new Action({
+  name: 'ShippingRate Show',
+  description: 'ShippingRate Show ORM Action',
+  method: 'GET',
+  async handle(request: ShippingRateRequestType) {
+    const id = request.getParam('id')
+
+    const model = await ShippingRate.findOrFail(Number(id))
+
+    return response.json(model)
+  },
+})

storage/framework/actions/src/ShippingRateStoreOrmAction.ts

@@ -0,0 +1,16 @@
+import type { ShippingRateRequestType } from '@stacksjs/orm'
+import { Action } from '@stacksjs/actions'
+
+import { response } from '@stacksjs/router'
+
+export default new Action({
+  name: 'ShippingRate Store',
+  description: 'ShippingRate Store ORM Action',
+  method: 'POST',
+  async handle(request: ShippingRateRequestType) {
+    await request.validate()
+    const model = await ShippingRate.create(request.all())
+
+    return response.json(model)
+  },
+})

storage/framework/actions/src/ShippingRateUpdateOrmAction.ts

@@ -0,0 +1,20 @@
+import type { ShippingRateRequestType } from '@stacksjs/orm'
+import { Action } from '@stacksjs/actions'
+
+import { response } from '@stacksjs/router'
+
+export default new Action({
+  name: 'ShippingRate Update',
+  description: 'ShippingRate Update ORM Action',
+  method: 'PATCH',
+  async handle(request: ShippingRateRequestType) {
+    await request.validate()
+
+    const id = request.getParam('id')
+    const model = await ShippingRate.findOrFail(Number(id))
+
+    const result = model.update(request.all())
+
+    return response.json(result)
+  },
+})

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

@@ -0,0 +1,13 @@
+import type { ShippingRateJsonResponse } from '../../../../orm/src/models/ShippingRate'
+import { db } from '@stacksjs/database'
+
+/**
+ * Fetch a shipping zone by ID
+ */
+export async function fetchById(id: number): Promise<ShippingRateJsonResponse | undefined> {
+  return await db
+    .selectFrom('shipping_rates')
+    .where('id', '=', id)
+    .selectAll()
+    .executeTakeFirst()
+}

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

@@ -0,0 +1,150 @@
+// Import dependencies
+import type { ShippingRateRequestType } from '@stacksjs/orm'
+import type { NewShippingRate, ShippingRateJsonResponse } from '../../../../orm/src/models/ShippingRate'
+import { randomUUIDv7 } from 'bun'
+import { db } from '@stacksjs/database'
+
+/**
+ * Create a new shipping rate
+ *
+ * @param request Shipping rate data to store
+ * @returns The newly created shipping rate record
+ */
+export async function store(request: ShippingRateRequestType): Promise<ShippingRateJsonResponse | undefined> {
+  // Validate the request data
+  await request.validate()
+
+  try {
+    // Prepare shipping rate data
+    const shippingRateData: NewShippingRate = {
+      method: request.get('method'),
+      zone: request.get('zone'),
+      weight_from: request.get<number>('weight_from'),
+      weight_to: request.get<number>('weight_to'),
+      rate: request.get<number>('rate'),
+      uuid: randomUUIDv7(),
+    }
+
+    // Insert the shipping rate
+    const result = await db
+      .insertInto('shipping_rates')
+      .values(shippingRateData)
+      .executeTakeFirst()
+
+    const rateId = Number(result.insertId) || Number(result.numInsertedOrUpdatedRows)
+
+    // Retrieve the newly created shipping rate
+    const shippingRate = await db
+      .selectFrom('shipping_rates')
+      .where('id', '=', rateId)
+      .selectAll()
+      .executeTakeFirst()
+
+    return shippingRate
+  }
+  catch (error) {
+    if (error instanceof Error) {
+      throw new TypeError(`Failed to create shipping rate: ${error.message}`)
+    }
+
+    throw error
+  }
+}
+
+/**
+ * Create multiple shipping rates at once
+ *
+ * @param requests Array of shipping rate data to store
+ * @returns Number of shipping rates created
+ */
+export async function bulkStore(requests: ShippingRateRequestType[]): Promise<number> {
+  if (!requests.length)
+    return 0
+
+  let createdCount = 0
+
+  try {
+    // Process each shipping rate
+    await db.transaction().execute(async (trx) => {
+      for (const request of requests) {
+        // Validate request data
+        request.validate()
+
+        // Prepare shipping rate data
+        const shippingRateData: NewShippingRate = {
+          method: request.get('method'),
+          zone: request.get('zone'),
+          weight_from: request.get<number>('weight_from'),
+          weight_to: request.get<number>('weight_to'),
+          rate: request.get<number>('rate'),
+          uuid: randomUUIDv7(),
+        }
+
+        // Insert the shipping rate
+        await trx
+          .insertInto('shipping_rates')
+          .values(shippingRateData)
+          .execute()
+
+        createdCount++
+      }
+    })
+
+    return createdCount
+  }
+  catch (error) {
+    if (error instanceof Error) {
+      throw new TypeError(`Failed to create shipping rates in bulk: ${error.message}`)
+    }
+
+    throw error
+  }
+}
+
+/**
+ * Format shipping rate options for dropdown menus or selectors
+ *
+ * @returns Array of formatted shipping rate options with id, method, zone, and rate
+ */
+export function formatShippingRateOptions(): Promise<{ id: number, method: string, zone: string, rate: number }[]> {
+  try {
+    return db
+      .selectFrom('shipping_rates')
+      .select(['id', 'method', 'zone', 'rate'])
+      .orderBy('method')
+      .execute()
+  }
+  catch (error) {
+    if (error instanceof Error) {
+      throw new TypeError(`Failed to format shipping rate options: ${error.message}`)
+    }
+
+    throw error
+  }
+}
+
+/**
+ * Get shipping rates for a specific method
+ *
+ * @param method The shipping method to filter by
+ * @returns List of shipping rates for the specified method
+ */
+export async function getShippingRatesByMethod(method: string): Promise<ShippingRateJsonResponse[]> {
+  try {
+    const rates = await db
+      .selectFrom('shipping_rates')
+      .selectAll()
+      .where('method', '=', method)
+      .orderBy('weight_from')
+      .execute()
+
+    return rates
+  }
+  catch (error) {
+    if (error instanceof Error) {
+      throw new TypeError(`Failed to get shipping rates by method: ${error.message}`)
+    }
+
+    throw error
+  }
+} 

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

@@ -10,4 +10,4 @@ export async function fetchById(id: number): Promise<ShippingMethodJsonResponse
     .where('id', '=', id)
     .selectAll()
     .executeTakeFirst()
-}
+}

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

@@ -0,0 +1,27 @@
+// Functions from destroy.ts
+export {
+  bulkDestroy,
+  bulkSoftDelete,
+  destroy,
+  softDelete,
+} from './destroy'
+
+// Functions from fetch.ts
+export {
+  fetchById,
+} from './fetch'
+
+// Functions from store.ts
+export {
+  bulkStore,
+  formatShippingOptions,
+  getActiveShippingMethods,
+  store,
+} from './store'
+
+// Functions from update.ts
+export {
+  update,
+  updatePricing,
+  updateStatus,
+} from './update'

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

@@ -31,7 +31,7 @@ export async function store(request: ShippingMethodRequestType): Promise<Shippin
       .values(shippingData)
       .executeTakeFirst()
 
-    const shippingId = Number(result.insertId)
+    const shippingId = Number(result.insertId) || Number(result.numInsertedOrUpdatedRows)
 
     // Retrieve the newly created shipping method
     const shippingMethod = await db

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

@@ -31,13 +31,6 @@ export async function update(id: number, request: ShippingMethodRequestType): Pr
     status: request.get('status'),
   }
 
-  // Remove undefined values
-  Object.keys(updateData).forEach((key) => {
-    if (updateData[key as keyof typeof updateData] === undefined) {
-      delete updateData[key as keyof typeof updateData]
-    }
-  })
-
   // If no fields to update, just return the existing shipping method
   if (Object.keys(updateData).length === 0) {
     return existingMethod

storage/framework/core/commerce/src/tests/shipping.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it } from 'bun:test'
 import { refreshDatabase } from '@stacksjs/testing'
 import { bulkDestroy, bulkSoftDelete, destroy, softDelete } from '../shipping/destroy'
-import { fetchById, fetchByUuid } from '../shipping/fetch'
+import { fetchById } from '../shipping/fetch'
 import { bulkStore, formatShippingOptions, getActiveShippingMethods, store } from '../shipping/store'
 import { update, updatePricing, updateStatus } from '../shipping/update'
 
@@ -135,7 +135,7 @@ describe('Shipping Methods Module', () => {
         description: 'Initial description',
         base_rate: 1000,
         free_shipping: 5000,
-        status: 'active', 
+        status: 'active',
       }
 
       // Create the shipping method
@@ -390,33 +390,6 @@ describe('Shipping Methods Module', () => {
   })
 
   describe('fetch', () => {
-    it('should fetch a shipping method by UUID', async () => {
-      // Create a shipping method
-      const requestData = {
-        name: 'UUID Test Shipping',
-        base_rate: 1000,
-        status: 'active',
-      }
-
-      const request = new TestRequest(requestData)
-      const method = await store(request as any)
-
-      expect(method?.uuid).toBeDefined()
-      const uuid = method?.uuid
-
-      // Make sure we have a valid UUID before proceeding
-      expect(uuid).toBeDefined()
-      if (!uuid) {
-        throw new Error('Failed to create test shipping method with UUID')
-      }
-
-      // Fetch by UUID
-      const fetchedMethod = await fetchByUuid(uuid)
-      expect(fetchedMethod).toBeDefined()
-      expect(fetchedMethod?.uuid).toBe(uuid)
-      expect(fetchedMethod?.name).toBe('UUID Test Shipping')
-    })
-
     it('should get active shipping methods only', async () => {
       // Create an active shipping method
       const activeRequest = new TestRequest({