1

src/modules/first-leg/api/firstLeg.ts

@@ -238,6 +238,7 @@ export interface MerchantFirstLegOrderRow {
   inboundCode: string | null
   channelName: string | null
   destinationType: ApiDestinationType | null
+  pickupMethod: ApiPickupMethod | null
   customerName: string | null
   receivingCompanyName: string | null
   specificationModel: string | null

src/modules/first-leg/store/firstLegOrders.test.mjs

@@ -12,13 +12,14 @@ test('maps the first-leg aggregate list fields without loading detail rows', ()
   assert.match(apiSource, /cargoes\?: Array<\{ skuNo\?: string \| null \}>/)
   assert.match(apiSource, /apiRequest<PageResult<MerchantFirstLegOrderRow>>/)
   assert.match(storeSource, /function mapFirstLegOrderRow/)
-  for (const field of ['inboundId', 'inboundCode', 'channelName', 'destinationWarehouseName', 'packageCount', 'expressCompany', 'trackingNo', 'totalGrossWeightKg', 'totalNetWeightKg', 'totalVolumeCbm', 'totalQuantity', 'remark', 'shipmentId', 'referenceId', 'createdAt']) {
+  for (const field of ['inboundId', 'inboundCode', 'channelName', 'destinationWarehouseName', 'pickupMethod', 'packageCount', 'expressCompany', 'trackingNo', 'totalGrossWeightKg', 'totalNetWeightKg', 'totalVolumeCbm', 'totalQuantity', 'remark', 'shipmentId', 'referenceId', 'createdAt']) {
     assert.match(storeSource, new RegExp(`row\\.${field}`))
   }
   assert.match(storeSource, /row\.skuNos/)
   assert.match(storeSource, /row\.cargoes/)
   assert.match(storeSource, /chargeableWeightKg: null/)
   assert.match(storeSource, /chargeableVolumeCbm: null/)
+  assert.match(apiSource, /pickupMethod: ApiPickupMethod \\| null/)
   assert.match(storeSource, /orderResult\.value\.records\.map\(mapFirstLegOrderRow\)/)
   assert.match(storeSource, /orderResult\.value\.records\.map\(\(item\) => mapUnifiedOrderRow\(item, warehouses\.value\)\)/)
 })

src/modules/first-leg/store/firstLegOrders.ts

@@ -398,7 +398,7 @@ function mapFirstLegOrderRow(row: MerchantFirstLegOrderRow): FirstLegOrder {
       inboundId: row.inboundId == null ? '' : String(row.inboundId), inboundCode: row.inboundCode ?? '',
     },
     createdAt: row.createdAt, updatedAt: row.createdAt, tradeTerm: '', destinationCountryCode: '', destinationWarehouseId: '',
-    destinationWarehouseName: row.destinationWarehouseName ?? '', pickupMethod: 'SELF_EXPRESS', channelCode: '',
+    destinationWarehouseName: row.destinationWarehouseName ?? '', pickupMethod: row.pickupMethod ?? 'SELF_EXPRESS', channelCode: '',
     channelName: row.channelName ?? '', pricingTaxMode: 'TAX_INCLUDED', carrierId: '', carrierName: '', taxMode: 'BUY_DECLARATION',
     customsInspection: false, destinationType: row.destinationType ?? 'PRIVATE', amazonWarehouseCode: '',
     shipmentId: row.shipmentId ?? row.internationalOrderNo ?? '', requestedPickupAt: '', receivingTime: '', submittedAt: '', completedAt: '',