@bisondesk/core-sdk 1.0.655 → 1.0.656

package/lib/utils/deliveries.test.js

@@ -0,0 +1,34 @@
+import { DeliveryTypes } from '@bisondesk/core-sdk/types/quotes';
+import { expectTypeOf } from 'vitest';
+import { PurchaseDeliveryTypes, SalesDeliveryTypes, } from '../types/deliveries.js';
+import { isAddressDelivery } from './deliveries.js';
+test('purchase and sales contracts keep supplier drop-off and customer pick-up separate', () => {
+    expectTypeOf().not.toMatchTypeOf();
+    expectTypeOf().not.toMatchTypeOf();
+    expectTypeOf().toMatchTypeOf();
+    expectTypeOf().toMatchTypeOf();
+});
+test('the previous quote export keeps its four sales methods', () => {
+    expect(DeliveryTypes).toEqual(SalesDeliveryTypes);
+    expect(Object.values(DeliveryTypes)).toEqual(['park', 'address', 'port', 'portAndShip']);
+});
+test.each([
+    SalesDeliveryTypes.ADDRESS,
+    PurchaseDeliveryTypes.ADDRESS,
+])('reads the address fields for %s', (type) => {
+    const delivery = {
+        type,
+        address: { country: 'be', city: 'Gent' },
+        distanceKm: '100',
+        agreedPrice: '0',
+        technicalControlNeeded: false,
+    };
+    expect(isAddressDelivery(delivery)).toBe(true);
+});
+test('a supplier drop-off has no collection address', () => {
+    expect(isAddressDelivery({
+        type: PurchaseDeliveryTypes.DROP_OFF,
+        agreedPrice: '0',
+    })).toBe(false);
+});
+//# sourceMappingURL=deliveries.test.js.map

package/lib/utils/deliveries.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deliveries.test.js","sourceRoot":"/","sources":["utils/deliveries.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAKL,qBAAqB,EAErB,kBAAkB,GACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,IAAI,CAAC,mFAAmF,EAAE,GAAG,EAAE;IAC7F,YAAY,EAAuB,CAAC,GAAG,CAAC,aAAa,EAAqB,CAAC;IAC3E,YAAY,EAAsB,CAAC,GAAG,CAAC,aAAa,EAAwB,CAAC;IAC7E,YAAY,EAAuB,CAAC,aAAa,EAAwB,CAAC;IAC1E,YAAY,EAET,CAAC,aAAa,EAAwB,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wDAAwD,EAAE,GAAG,EAAE;IAClE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAClD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;AAC3F,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,IAAI,CAAC;IACR,kBAAkB,CAAC,OAAO;IAC1B,qBAAqB,CAAC,OAAO;CACrB,CAAC,CAAC,iCAAiC,EAAE,CAAC,IAAI,EAAE,EAAE;IACtD,MAAM,QAAQ,GACZ;QACE,IAAI;QACJ,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE;QACxC,UAAU,EAAE,KAAK;QACjB,WAAW,EAAE,GAAG;QAChB,sBAAsB,EAAE,KAAK;KAC9B,CAAC;IACJ,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;IACzD,MAAM,CACJ,iBAAiB,CAAC;QAChB,IAAI,EAAE,qBAAqB,CAAC,QAAQ;QACpC,WAAW,EAAE,GAAG;KACjB,CAAC,CACH,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAChB,CAAC,CAAC,CAAC","sourcesContent":["import { DeliveryTypes } from '@bisondesk/core-sdk/types/quotes';\nimport { expectTypeOf } from 'vitest';\nimport {\n  AddressDeliveryType,\n  DropOffDeliveryType,\n  PickUpDeliveryType,\n  PurchaseDeliveryType,\n  PurchaseDeliveryTypes,\n  SalesDeliveryType,\n  SalesDeliveryTypes,\n} from '../types/deliveries.js';\nimport { isAddressDelivery } from './deliveries.js';\n\ntest('purchase and sales contracts keep supplier drop-off and customer pick-up separate', () => {\n  expectTypeOf<DropOffDeliveryType>().not.toMatchTypeOf<SalesDeliveryType>();\n  expectTypeOf<PickUpDeliveryType>().not.toMatchTypeOf<PurchaseDeliveryType>();\n  expectTypeOf<AddressDeliveryType>().toMatchTypeOf<PurchaseDeliveryType>();\n  expectTypeOf<\n    AddressDeliveryType<PurchaseDeliveryTypes.ADDRESS>\n  >().toMatchTypeOf<PurchaseDeliveryType>();\n});\n\ntest('the previous quote export keeps its four sales methods', () => {\n  expect(DeliveryTypes).toEqual(SalesDeliveryTypes);\n  expect(Object.values(DeliveryTypes)).toEqual(['park', 'address', 'port', 'portAndShip']);\n});\n\ntest.each([\n  SalesDeliveryTypes.ADDRESS,\n  PurchaseDeliveryTypes.ADDRESS,\n] as const)('reads the address fields for %s', (type) => {\n  const delivery: AddressDeliveryType<SalesDeliveryTypes.ADDRESS | PurchaseDeliveryTypes.ADDRESS> =\n    {\n      type,\n      address: { country: 'be', city: 'Gent' },\n      distanceKm: '100',\n      agreedPrice: '0',\n      technicalControlNeeded: false,\n    };\n  expect(isAddressDelivery(delivery)).toBe(true);\n});\n\ntest('a supplier drop-off has no collection address', () => {\n  expect(\n    isAddressDelivery({\n      type: PurchaseDeliveryTypes.DROP_OFF,\n      agreedPrice: '0',\n    }),\n  ).toBe(false);\n});\n"]}

package/lib/utils/transports.d.ts

@@ -1,7 +1,7 @@
 import { Opportunity } from '../types/opportunities.js';
 import { SearchTransport, Transport } from '../types/transports.js';
 import { VehiclePurchase } from '../types/vehicles.js';
-export declare const isPurchaseTransport: (transport: Transport) => boolean;
+export declare const isPurchaseTransport: (transport: Pick<Transport, 'type'>) => boolean;
 export declare const isTransportCompleted: (transport: Transport, context: {
     opportunity?: Opportunity;
     purchase?: VehiclePurchase;

package/lib/utils/transports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transports.d.ts","sourceRoot":"/","sources":["utils/transports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAiB,MAAM,wBAAwB,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AASvD,eAAO,MAAM,mBAAmB,cAAe,SAAS,KAAG,OACZ,CAAC;AAchD,eAAO,MAAM,oBAAoB,cACpB,SAAS,WACX;IAAE,WAAW,CAAC,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,EAAE,eAAe,CAAA;CAAE,KACjE,OAMF,CAAC;AAGF,eAAO,MAAM,0BAA0B,WAAY,eAAe,KAAG,OAIjE,CAAC"}
+{"version":3,"file":"transports.d.ts","sourceRoot":"/","sources":["utils/transports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAiB,MAAM,wBAAwB,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAOvD,eAAO,MAAM,mBAAmB,cAAe,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,KAAG,OAC1B,CAAC;AAchD,eAAO,MAAM,oBAAoB,cACpB,SAAS,WACX;IAAE,WAAW,CAAC,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,EAAE,eAAe,CAAA;CAAE,KACjE,OAMF,CAAC;AAGF,eAAO,MAAM,0BAA0B,WAAY,eAAe,KAAG,OAIjE,CAAC"}

package/lib/utils/transports.js.map

@@ -1 +1 @@
-{"version":3,"file":"transports.js","sourceRoot":"/","sources":["utils/transports.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAQnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,SAAoB,EAAW,EAAE,CACnE,SAAS,CAAC,IAAI,KAAK,aAAa,CAAC,YAAY,CAAC;AAchD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,SAAoB,EACpB,OAAkE,EACzD,EAAE;IACX,IAAI,SAAS,CAAC,IAAI,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;QAClD,OAAO,OAAO,CAAC,WAAW,EAAE,WAAW,IAAI,IAAI,CAAC;IAClD,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,IAAI,IAAI,IAAI,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC1E,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,MAAuB,EAAW,EAAE,CAC7E,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE;IACrC,WAAW,EAAE,MAAM,CAAC,WAAW;IAC/B,QAAQ,EAAE,MAAM,CAAC,QAAQ;CAC1B,CAAC,CAAC","sourcesContent":["import { Opportunity } from '../types/opportunities.js';\nimport { SearchTransport, Transport, TransportType } from '../types/transports.js';\nimport { VehiclePurchase } from '../types/vehicles.js';\nimport { hasPurchaseArrived } from './vehicles.js';\n\n/**\n * Which side of the trade the transport serves. Both purchase types answer yes: a pick-up we drive\n * and a drop-off the supplier drives differ only in who is behind the wheel, and every rule that\n * asks this question — what it costs, whose money moved, which papers it needs — is the same for\n * both.\n */\nexport const isPurchaseTransport = (transport: Transport): boolean =>\n  transport.type !== TransportType.SaleDelivery;\n\n/**\n * A transport is finished when the journey it describes has demonstrably happened: the customer has\n * the vehicle for a sale delivery, the vehicle is on our park for a purchase. From then on\n * the record is history and the server refuses edits to it.\n *\n * Not the same thing as the transport's own `doneAt`. Delivery can be declared on the opportunity\n * (a CMR, a delivery confirmation) and arrival on the purchase, without the transport ever being\n * moved — and reversing either of those is what unlocks the transport again, which a status stamped\n * on the transport itself could not express.\n *\n * Shared so the board, the drawer and the server all answer the question the same way.\n */\nexport const isTransportCompleted = (\n  transport: Transport,\n  context: { opportunity?: Opportunity; purchase?: VehiclePurchase },\n): boolean => {\n  if (transport.type === TransportType.SaleDelivery) {\n    return context.opportunity?.deliveredAt != null;\n  }\n\n  return context.purchase != null && hasPurchaseArrived(context.purchase);\n};\n\n/** The same question asked of a search document, which already carries both sides. */\nexport const isSearchTransportCompleted = (record: SearchTransport): boolean =>\n  isTransportCompleted(record.transport, {\n    opportunity: record.opportunity,\n    purchase: record.purchase,\n  });\n"]}
+{"version":3,"file":"transports.js","sourceRoot":"/","sources":["utils/transports.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAMnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,SAAkC,EAAW,EAAE,CACjF,SAAS,CAAC,IAAI,KAAK,aAAa,CAAC,YAAY,CAAC;AAchD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,SAAoB,EACpB,OAAkE,EACzD,EAAE;IACX,IAAI,SAAS,CAAC,IAAI,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;QAClD,OAAO,OAAO,CAAC,WAAW,EAAE,WAAW,IAAI,IAAI,CAAC;IAClD,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,IAAI,IAAI,IAAI,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC1E,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,MAAuB,EAAW,EAAE,CAC7E,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE;IACrC,WAAW,EAAE,MAAM,CAAC,WAAW;IAC/B,QAAQ,EAAE,MAAM,CAAC,QAAQ;CAC1B,CAAC,CAAC","sourcesContent":["import { Opportunity } from '../types/opportunities.js';\nimport { SearchTransport, Transport, TransportType } from '../types/transports.js';\nimport { VehiclePurchase } from '../types/vehicles.js';\nimport { hasPurchaseArrived } from './vehicles.js';\n\n/**\n * Both purchase types bring a vehicle to our park: we collect a pickup, and the supplier brings\n * a drop-off. They share the purchase payment and arrival rules.\n */\nexport const isPurchaseTransport = (transport: Pick<Transport, 'type'>): boolean =>\n  transport.type !== TransportType.SaleDelivery;\n\n/**\n * A transport is finished when the journey it describes has demonstrably happened: the customer has\n * the vehicle for a sale delivery, the vehicle is on our park for a purchase. From then on\n * the record is history and the server refuses edits to it.\n *\n * Not the same thing as the transport's own `doneAt`. Delivery can be declared on the opportunity\n * (a CMR, a delivery confirmation) and arrival on the purchase, without the transport ever being\n * moved — and reversing either of those is what unlocks the transport again, which a status stamped\n * on the transport itself could not express.\n *\n * Shared so the board, the drawer and the server all answer the question the same way.\n */\nexport const isTransportCompleted = (\n  transport: Transport,\n  context: { opportunity?: Opportunity; purchase?: VehiclePurchase },\n): boolean => {\n  if (transport.type === TransportType.SaleDelivery) {\n    return context.opportunity?.deliveredAt != null;\n  }\n\n  return context.purchase != null && hasPurchaseArrived(context.purchase);\n};\n\n/** The same question asked of a search document, which already carries both sides. */\nexport const isSearchTransportCompleted = (record: SearchTransport): boolean =>\n  isTransportCompleted(record.transport, {\n    opportunity: record.opportunity,\n    purchase: record.purchase,\n  });\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bisondesk/core-sdk",
-  "version": "1.0.655",
+  "version": "1.0.656",
   "description": "",
   "type": "module",
   "author": "TheTruckCompany",

package/src/types/deliveries.ts

@@ -0,0 +1,92 @@
+import { LocationValue } from '@bisondesk/commons-sdk/types';
+
+/** Supplier collection keeps the existing address value in stored transports. */
+export enum PurchaseDeliveryTypes {
+  ADDRESS = 'address',
+  DROP_OFF = 'park',
+}
+
+export enum SalesDeliveryTypes {
+  PICK_UP = 'park',
+  ADDRESS = 'address',
+  PORT = 'port',
+  PORT_AND_SHIP = 'portAndShip',
+}
+
+export enum SpoilerInfo {
+  MOUNT = 'mount',
+  UNMOUNT = 'unmount',
+  NO_ACTION = 'noAction',
+}
+
+export enum TransportationMode {
+  BY_ROAD = 'byRoad',
+  ON_LOW_BED = 'onLowBed',
+}
+
+type BaseDeliveryType = {
+  agreedPrice: string;
+  spoiler?: SpoilerInfo;
+  stackingVehicleNeeded?: boolean;
+  detailsStacking?: string;
+};
+
+export type PickUpDeliveryType = BaseDeliveryType & {
+  type: SalesDeliveryTypes.PICK_UP;
+  urgent: boolean;
+  transportationMode?: TransportationMode;
+  detailsBorderCrossing?: string;
+  technicalControlNeeded: boolean;
+  insuranceNeeded: boolean;
+  transitPlateBelgiumNeeded: boolean;
+  transitPlateAustriaNeeded: boolean;
+  licensePlateNeeded: boolean;
+  dateOfPickUpByCustomer?: string;
+};
+
+/** The supplier brings the vehicle to our park without a collection address or distance. */
+export type DropOffDeliveryType = BaseDeliveryType & {
+  type: PurchaseDeliveryTypes.DROP_OFF;
+};
+
+export type AddressDeliveryType<
+  T extends SalesDeliveryTypes.ADDRESS | PurchaseDeliveryTypes.ADDRESS = SalesDeliveryTypes.ADDRESS,
+> = BaseDeliveryType & {
+  type: T;
+  address: LocationValue;
+  distanceKm: string;
+  technicalControlNeeded: boolean;
+};
+
+export type PortDeliverytype = BaseDeliveryType & {
+  type: SalesDeliveryTypes.PORT | SalesDeliveryTypes.PORT_AND_SHIP;
+  portOriginId: string;
+  portDestination?: string;
+  shippingCompany?: string;
+  portToPortCostPrice: string;
+  parkToPortCostPrice?: string;
+  portToPortMargin: string;
+  ets?: string;
+  eta?: string;
+  etd?: string;
+  shipClosingDate?: string;
+  bookingRef?: string;
+  deliveryLocation?: string;
+};
+
+export type SalesDeliveryType = PickUpDeliveryType | AddressDeliveryType | PortDeliverytype;
+
+/** Earlier SDKs also used the sales address enum for purchase collection. Both store address. */
+export type PurchaseDeliveryType =
+  | AddressDeliveryType<SalesDeliveryTypes.ADDRESS | PurchaseDeliveryTypes.ADDRESS>
+  | DropOffDeliveryType;
+
+export type DeliveryLocationValue = Omit<LocationValue, 'addressLine1' | 'city'> & {
+  addressLine1: string;
+  city: string;
+};
+
+export type DeliveryRoutesRequest = {
+  origin: DeliveryLocationValue;
+  destination: DeliveryLocationValue;
+};

package/src/types/quotes.ts

@@ -1,5 +1,6 @@
-import { AttachmentValue, LocationValue } from '@bisondesk/commons-sdk/types';
+import { AttachmentValue } from '@bisondesk/commons-sdk/types';
 import { OpportunityType } from '../constants.js';
+import { SalesDeliveryType } from './deliveries.js';
 import {
   CustomLeasingQuoteExtraInput,
   CustomSalesQuoteExtraInput,
@@ -33,24 +34,6 @@ export enum QuoteMetricsScore {
   NEUTRAL = 'neutral',
   GOOD = 'good',
 }
-export enum DeliveryTypes {
-  PICK_UP = 'pickUp',
-  ADDRESS = 'address',
-  PORT = 'port',
-  PORT_AND_SHIP = 'portAndShip',
-}
-
-export enum SpoilerInfo {
-  MOUNT = 'mount',
-  UNMOUNT = 'unmount',
-  NO_ACTION = 'noAction',
-}
-
-export enum TransportationMode {
-  BY_ROAD = 'byRoad',
-  ON_LOW_BED = 'onLowBed',
-}
-
 export enum SelfFinancingType {
   OWN_FINANCING = 'own_financing',
   ALREADY_FINANCED = 'already_financed',
@@ -148,49 +131,6 @@ export type LeasingCalculatorInput = BaseQuoteCalculatorInput & {
   customRequests: CustomLeasingQuoteExtraInput[];
 };
 
-type BaseDeliveryType = {
-  agreedPrice: string;
-  spoiler?: SpoilerInfo;
-  stackingVehicleNeeded?: boolean;
-  detailsStacking?: string;
-};
-
-export type PickUpDeliveryType = BaseDeliveryType & {
-  type: DeliveryTypes.PICK_UP;
-  urgent: boolean;
-  transportationMode?: TransportationMode;
-  detailsBorderCrossing?: string;
-  technicalControlNeeded: boolean;
-  insuranceNeeded: boolean;
-  transitPlateBelgiumNeeded: boolean;
-  transitPlateAustriaNeeded: boolean;
-  licensePlateNeeded: boolean;
-  dateOfPickUpByCustomer?: string;
-};
-
-export type AddressDeliveryType = BaseDeliveryType & {
-  type: DeliveryTypes.ADDRESS;
-  address: LocationValue;
-  distanceKm: string;
-  technicalControlNeeded: boolean;
-};
-
-export type PortDeliverytype = BaseDeliveryType & {
-  type: DeliveryTypes.PORT | DeliveryTypes.PORT_AND_SHIP;
-  portOriginId: string;
-  portDestination?: string;
-  shippingCompany?: string;
-  portToPortCostPrice: string;
-  parkToPortCostPrice?: string;
-  portToPortMargin: string;
-  ets?: string;
-  eta?: string;
-  etd?: string;
-  shipClosingDate?: string;
-  bookingRef?: string;
-  deliveryLocation?: string;
-};
-
 // Sent by the Frontend to bootstrap the calculator
 export type SalesCalculatorDefaultInput = Omit<BaseQuoteCalculatorInput, 'vehicle'> & {
   vehicle: Omit<BaseQuoteCalculatorInput['vehicle'], 'vatRate'>;
@@ -206,7 +146,7 @@ export type SalesCalculatorInput = BaseQuoteCalculatorInput & {
     internetPrice?: string;
     comissionCost: string;
   };
-  delivery?: PickUpDeliveryType | AddressDeliveryType | PortDeliverytype;
+  delivery?: SalesDeliveryType;
   extras: SalesQuoteExtraInput[];
   customRequests: CustomSalesQuoteExtraInput[];
   financing?: {
@@ -418,16 +358,6 @@ export type CalculatorSalesIO = {
 };
 export type CalculatorQuoteIO = CalculatorLeasingIO | CalculatorSalesIO;
 
-export type DeliveryLocationValue = Omit<LocationValue, 'addressLine1' | 'city'> & {
-  addressLine1: string;
-  city: string;
-};
-
-export type DeliveryRoutesRequest = {
-  origin: DeliveryLocationValue;
-  destination: DeliveryLocationValue;
-};
-
 export type NewQuoteValidator = {
   userId: string;
   countryCode: string;
@@ -442,3 +372,17 @@ export type QuoteValidator = NewQuoteValidator & {
 export type QuoteValidatorUpdate = {
   canValidateOwn: boolean;
 };
+
+export type {
+  AddressDeliveryType,
+  DeliveryLocationValue,
+  DeliveryRoutesRequest,
+  PickUpDeliveryType,
+  PortDeliverytype,
+} from './deliveries.js';
+/** @deprecated Import delivery types from ./deliveries.js. */
+export {
+  SalesDeliveryTypes as DeliveryTypes,
+  SpoilerInfo,
+  TransportationMode,
+} from './deliveries.js';

package/src/types/transports.ts

@@ -1,13 +1,14 @@
 import { GPSCoord, NextList, PaginatedList } from '@bisondesk/commons-sdk/types';
 import { Organization } from './crm.js';
-import { BaseEvent } from './internal-events.js';
-import { Opportunity, OpportunityPaymentStatus } from './opportunities.js';
 import {
   AddressDeliveryType,
-  DeliveryTypes,
   PickUpDeliveryType,
   PortDeliverytype,
-} from './quotes.js';
+  PurchaseDeliveryType,
+  SalesDeliveryTypes,
+} from './deliveries.js';
+import { BaseEvent } from './internal-events.js';
+import { Opportunity, OpportunityPaymentStatus } from './opportunities.js';
 import { BaseSearchRequest, SortOrder } from './search.js';
 import { DataRecord, ReferenceData } from './utils.js';
 import { Vehicle, VehiclePurchase } from './vehicles.js';
@@ -59,13 +60,6 @@ export enum TransportPriority {
   Urgent = 'URGENT',
 }
 
-export const TransportSalesDeliveryType = {
-  Address: DeliveryTypes.ADDRESS,
-  Port: DeliveryTypes.PORT,
-  PortAndShip: DeliveryTypes.PORT_AND_SHIP,
-  PickUp: DeliveryTypes.PICK_UP,
-} as const;
-
 /**
  * The customer collects the vehicle. Nothing is driven anywhere, but the papers still have to be
  * arranged and paid for — transit plates, technical control, insurance — which is why it is a
@@ -76,11 +70,7 @@ export const TransportSalesDeliveryType = {
  */
 export type TransportPickUpDeliveryType = Omit<PickUpDeliveryType, 'dateOfPickUpByCustomer'>;
 
-export type TransportSalesDeliveryType = (
-  | PortDeliverytype
-  | AddressDeliveryType
-  | TransportPickUpDeliveryType
-) & {
+type TransportDeliveryExtras = {
   cleaningNeeded?: boolean;
   driver?: string;
   transportCompany?: string;
@@ -89,14 +79,22 @@ export type TransportSalesDeliveryType = (
   stackingVehicleCostPrice?: string; // overrides the stacking rate from the delivery settings
 };
 
-export type TransportPurchaseDeliveryType = AddressDeliveryType & {
-  cleaningNeeded?: boolean;
-  driver?: string;
-  transportCompany?: string;
-  date?: string; // Pick-up (purchase) | Delivery (OPP) (leaves parking)
-  adminCost?: string; // user-entered administrative cost summed into totalCostExclVat
-  stackingVehicleCostPrice?: string; // overrides the stacking rate from the delivery settings
-};
+export type TransportSalesDeliveryType = (
+  | PortDeliverytype
+  | AddressDeliveryType
+  | TransportPickUpDeliveryType
+) &
+  TransportDeliveryExtras;
+
+export type TransportPurchaseDeliveryType = PurchaseDeliveryType & TransportDeliveryExtras;
+
+/** @deprecated Use SalesDeliveryTypes from ./deliveries.js. */
+export const TransportSalesDeliveryType = {
+  Address: SalesDeliveryTypes.ADDRESS,
+  Port: SalesDeliveryTypes.PORT,
+  PortAndShip: SalesDeliveryTypes.PORT_AND_SHIP,
+  PickUp: SalesDeliveryTypes.PICK_UP,
+} as const;
 
 export type Transport = {
   id: string;
@@ -181,6 +179,8 @@ export enum TransportActions {
  * server writes into the delivery it ends up with.
  */
 export type TransportUpdate = {
+  /** Changes the purchase method and the purchase agreement together. */
+  type?: TransportPurchaseType;
   delivery?: TransportSalesDeliveryType | TransportPurchaseDeliveryType;
   notes?: string | null;
   adminApproved?: boolean;

package/src/types/vehicle-sales.ts

@@ -1,8 +1,9 @@
 import { LocationValue } from '@bisondesk/commons-sdk/locations';
 import { Organization } from './crm.js';
+import { SalesDeliveryType } from './deliveries.js';
 import { BaseEvent } from './internal-events.js';
 import { Opportunity, VehicleSaleDealStatus, VehicleSaleLogisticsStatus } from './opportunities.js';
-import { DeliveryTypes, Quote } from './quotes.js';
+import { Quote } from './quotes.js';
 import { DataRecord } from './utils.js';
 
 export enum VehicleSaleInfoActions {
@@ -31,7 +32,7 @@ export type VehicleSaleInfoBff = {
   client?: Organization;
   delivery?: {
     address?: LocationValue;
-    type: DeliveryTypes;
+    type: SalesDeliveryType['type'];
   };
 };
 

package/src/utils/deliveries.test.ts

@@ -0,0 +1,50 @@
+import { DeliveryTypes } from '@bisondesk/core-sdk/types/quotes';
+import { expectTypeOf } from 'vitest';
+import {
+  AddressDeliveryType,
+  DropOffDeliveryType,
+  PickUpDeliveryType,
+  PurchaseDeliveryType,
+  PurchaseDeliveryTypes,
+  SalesDeliveryType,
+  SalesDeliveryTypes,
+} from '../types/deliveries.js';
+import { isAddressDelivery } from './deliveries.js';
+
+test('purchase and sales contracts keep supplier drop-off and customer pick-up separate', () => {
+  expectTypeOf<DropOffDeliveryType>().not.toMatchTypeOf<SalesDeliveryType>();
+  expectTypeOf<PickUpDeliveryType>().not.toMatchTypeOf<PurchaseDeliveryType>();
+  expectTypeOf<AddressDeliveryType>().toMatchTypeOf<PurchaseDeliveryType>();
+  expectTypeOf<
+    AddressDeliveryType<PurchaseDeliveryTypes.ADDRESS>
+  >().toMatchTypeOf<PurchaseDeliveryType>();
+});
+
+test('the previous quote export keeps its four sales methods', () => {
+  expect(DeliveryTypes).toEqual(SalesDeliveryTypes);
+  expect(Object.values(DeliveryTypes)).toEqual(['park', 'address', 'port', 'portAndShip']);
+});
+
+test.each([
+  SalesDeliveryTypes.ADDRESS,
+  PurchaseDeliveryTypes.ADDRESS,
+] as const)('reads the address fields for %s', (type) => {
+  const delivery: AddressDeliveryType<SalesDeliveryTypes.ADDRESS | PurchaseDeliveryTypes.ADDRESS> =
+    {
+      type,
+      address: { country: 'be', city: 'Gent' },
+      distanceKm: '100',
+      agreedPrice: '0',
+      technicalControlNeeded: false,
+    };
+  expect(isAddressDelivery(delivery)).toBe(true);
+});
+
+test('a supplier drop-off has no collection address', () => {
+  expect(
+    isAddressDelivery({
+      type: PurchaseDeliveryTypes.DROP_OFF,
+      agreedPrice: '0',
+    }),
+  ).toBe(false);
+});

package/src/utils/deliveries.ts

@@ -0,0 +1,13 @@
+import {
+  AddressDeliveryType,
+  PurchaseDeliveryType,
+  PurchaseDeliveryTypes,
+  SalesDeliveryType,
+  SalesDeliveryTypes,
+} from '../types/deliveries.js';
+
+/** Purchase collection and sales delivery share the same stored address fields. */
+export const isAddressDelivery = (
+  delivery?: PurchaseDeliveryType | SalesDeliveryType,
+): delivery is AddressDeliveryType<PurchaseDeliveryTypes.ADDRESS | SalesDeliveryTypes.ADDRESS> =>
+  delivery?.type === PurchaseDeliveryTypes.ADDRESS || delivery?.type === SalesDeliveryTypes.ADDRESS;

package/src/utils/transports.ts

@@ -4,12 +4,10 @@ import { VehiclePurchase } from '../types/vehicles.js';
 import { hasPurchaseArrived } from './vehicles.js';
 
 /**
- * Which side of the trade the transport serves. Both purchase types answer yes: a pick-up we drive
- * and a drop-off the supplier drives differ only in who is behind the wheel, and every rule that
- * asks this question — what it costs, whose money moved, which papers it needs — is the same for
- * both.
+ * Both purchase types bring a vehicle to our park: we collect a pickup, and the supplier brings
+ * a drop-off. They share the purchase payment and arrival rules.
  */
-export const isPurchaseTransport = (transport: Transport): boolean =>
+export const isPurchaseTransport = (transport: Pick<Transport, 'type'>): boolean =>
   transport.type !== TransportType.SaleDelivery;
 
 /**