@open-mercato/core 0.4.9-develop-97d4cca067 → 0.4.9-develop.1013.aa3a9dea92

package/src/modules/shipping_carriers/lib/shipment-wizard/types.ts

@@ -0,0 +1,76 @@
+export type Provider = {
+  providerKey: string
+}
+
+export type Address = {
+  countryCode: string
+  postalCode: string
+  city: string
+  line1: string
+  line2?: string
+}
+
+export type PackageDimension = {
+  weightKg: number
+  lengthCm: number
+  widthCm: number
+  heightCm: number
+}
+
+export type ShippingRate = {
+  serviceCode: string
+  serviceName: string
+  amount: number
+  currencyCode: string
+  estimatedDays?: number
+}
+
+export type DocumentAddress = {
+  id: string
+  purpose: string | null
+  address_line1: string
+  address_line2?: string | null
+  city?: string | null
+  postal_code?: string | null
+  country?: string | null
+}
+
+export type LabelFormat = 'pdf' | 'zpl' | 'png'
+
+export type WizardStep = 'provider' | 'configure' | 'confirm'
+
+export type AddressFieldsProps = {
+  prefix: string
+  address: Address
+  onChange: (address: Address) => void
+  disabled?: boolean
+}
+
+export type PackageEditorProps = {
+  packages: PackageDimension[]
+  onChange: (packages: PackageDimension[]) => void
+  disabled?: boolean
+}
+
+export type ContactInfo = {
+  phone: string
+  email: string
+}
+
+export type ContactFieldsProps = {
+  prefix: string
+  contact: ContactInfo
+  onChange: (contact: ContactInfo) => void
+  disabled?: boolean
+}
+
+export type DropOffPoint = {
+  id: string
+  name: string
+  type: string
+  city: string
+  postalCode: string
+  street: string
+  latitude?: number
+  longitude?: number
+}

package/src/modules/shipping_carriers/lib/shipping-service.ts

@@ -4,6 +4,8 @@ import type { CredentialsService } from '../../integrations/lib/credentials-serv
 import { CarrierShipment } from '../data/entities'
 import { emitShippingEvent } from '../events'
 import { getShippingAdapter } from './adapter-registry'
+import type { UnifiedShipmentStatus } from './adapter'
+import { isValidShippingTransition, ShipmentCancelNotAllowedError } from './status-sync'
 
 export function createShippingCarrierService(deps: {
   em: EntityManager
@@ -46,6 +48,8 @@ export function createShippingCarrierService(deps: {
       origin: { countryCode: string; postalCode: string; city: string; line1: string; line2?: string }
       destination: { countryCode: string; postalCode: string; city: string; line1: string; line2?: string }
       packages: Array<{ weightKg: number; lengthCm: number; widthCm: number; heightCm: number }>
+      receiverPhone?: string
+      receiverEmail?: string
       organizationId: string
       tenantId: string
     }) {
@@ -53,11 +57,16 @@ export function createShippingCarrierService(deps: {
         organizationId: input.organizationId,
         tenantId: input.tenantId,
       })
+      const mergedCredentials = {
+        ...credentials,
+        ...(input.receiverPhone !== undefined ? { receiverPhone: input.receiverPhone } : {}),
+        ...(input.receiverEmail !== undefined ? { receiverEmail: input.receiverEmail } : {}),
+      }
       return adapter.calculateRates({
         origin: input.origin,
         destination: input.destination,
         packages: input.packages,
-        credentials,
+        credentials: mergedCredentials,
       })
     },
 
@@ -69,6 +78,12 @@ export function createShippingCarrierService(deps: {
       packages: Array<{ weightKg: number; lengthCm: number; widthCm: number; heightCm: number }>
       serviceCode: string
       labelFormat?: 'pdf' | 'zpl' | 'png'
+      senderPhone?: string
+      senderEmail?: string
+      receiverPhone?: string
+      receiverEmail?: string
+      targetPoint?: string
+      c2cSendingMethod?: string
       organizationId: string
       tenantId: string
     }) {
@@ -76,13 +91,22 @@ export function createShippingCarrierService(deps: {
         organizationId: input.organizationId,
         tenantId: input.tenantId,
       })
+      const mergedCredentials = {
+        ...credentials,
+        ...(input.senderPhone !== undefined ? { senderPhone: input.senderPhone } : {}),
+        ...(input.senderEmail !== undefined ? { senderEmail: input.senderEmail } : {}),
+        ...(input.receiverPhone !== undefined ? { receiverPhone: input.receiverPhone } : {}),
+        ...(input.receiverEmail !== undefined ? { receiverEmail: input.receiverEmail } : {}),
+        ...(input.targetPoint !== undefined ? { targetPoint: input.targetPoint } : {}),
+        ...(input.c2cSendingMethod !== undefined ? { c2cSendingMethod: input.c2cSendingMethod } : {}),
+      }
       const created = await adapter.createShipment({
         orderId: input.orderId,
         origin: input.origin,
         destination: input.destination,
         packages: input.packages,
         serviceCode: input.serviceCode,
-        credentials,
+        credentials: mergedCredentials,
         labelFormat: input.labelFormat,
       })
       const shipment = em.create(CarrierShipment, {
@@ -138,7 +162,7 @@ export function createShippingCarrierService(deps: {
         : null
       const tracking = await adapter.getTracking({
         shipmentId: shipment?.carrierShipmentId ?? input.shipmentId,
-        trackingNumber: input.trackingNumber,
+        trackingNumber: input.trackingNumber ?? shipment?.trackingNumber,
         credentials,
       })
       if (shipment) {
@@ -159,6 +183,9 @@ export function createShippingCarrierService(deps: {
     }) {
       const scope = { organizationId: input.organizationId, tenantId: input.tenantId }
       const shipment = await findShipmentOrThrow(input.shipmentId, scope)
+      if (!isValidShippingTransition(shipment.unifiedStatus as UnifiedShipmentStatus, 'cancelled')) {
+        throw new ShipmentCancelNotAllowedError(shipment.unifiedStatus)
+      }
       const { adapter, credentials } = await resolveAdapter(input.providerKey, {
         organizationId: input.organizationId,
         tenantId: input.tenantId,
@@ -198,6 +225,29 @@ export function createShippingCarrierService(deps: {
         scope,
       )
     },
+
+    async searchDropOffPoints(input: {
+      providerKey: string
+      query?: string
+      type?: string
+      postCode?: string
+      organizationId: string
+      tenantId: string
+    }) {
+      const { adapter, credentials } = await resolveAdapter(input.providerKey, {
+        organizationId: input.organizationId,
+        tenantId: input.tenantId,
+      })
+      if (!adapter.searchDropOffPoints) {
+        throw new Error(`Provider ${input.providerKey} does not support drop-off point search`)
+      }
+      return adapter.searchDropOffPoints({
+        query: input.query,
+        type: input.type,
+        postCode: input.postCode,
+        credentials,
+      })
+    },
   }
 }
 

package/src/modules/shipping_carriers/lib/status-sync.ts

@@ -2,6 +2,13 @@ import type { UnifiedShipmentStatus } from './adapter'
 import type { CarrierShipment } from '../data/entities'
 import type { ShippingEventId } from '../events'
 
+export class ShipmentCancelNotAllowedError extends Error {
+  constructor(status: string) {
+    super(`Shipment cannot be cancelled in its current status: ${status}`)
+    this.name = 'ShipmentCancelNotAllowedError'
+  }
+}
+
 const VALID_SHIPPING_TRANSITIONS: Record<string, UnifiedShipmentStatus[]> = {
   label_created: ['picked_up', 'in_transit', 'cancelled'],
   picked_up: ['in_transit', 'cancelled'],