@bisondesk/core-sdk 1.0.609 → 1.0.611

package/src/types/users.ts

@@ -6,49 +6,46 @@ import {
 } from '@bisondesk/commons-sdk/types';
 import { OpportunityType } from '../constants.js';
 
-export type NewUserRequest = {
+type BaseUser = {
   email: string;
   firstName: string;
   googleEmail?: string;
   jobTitle?: string;
-  landline?: PhoneNumberRawValue; // landline phone number
   language: string;
   lastName: string;
-  phone: PhoneNumberRawValue;
   picture?: AttachmentValue;
   roles: AppRoles[];
   preferredBranchIds?: string[];
   preferredOpportunityTypes?: OpportunityType[];
 };
 
-export type ValidNewUserRequest = Omit<NewUserRequest, 'phone' | 'landline'> & {
-  phone: PhoneNumberValue;
-  landline?: PhoneNumberValue;
+export type NewUserRequest = BaseUser & {
+  landline?: PhoneNumberRawValue;
+  phone: PhoneNumberRawValue;
+  twilioPhoneNumber?: PhoneNumberRawValue; // Twilio caller ID used when placing calls
 };
 
-export type UpdateUserRequest = Omit<User, 'phone' | 'landline'> & {
-  phone: PhoneNumberRawValue | PhoneNumberValue;
-  landline?: PhoneNumberRawValue | PhoneNumberValue;
+export type ValidNewUserRequest = BaseUser & {
+  landline?: PhoneNumberValue;
+  phone: PhoneNumberValue;
+  twilioPhoneNumber?: PhoneNumberValue;
 };
 
-export type User = {
+export type User = BaseUser & {
   active: boolean;
   createdAt: string;
-  email: string;
-  firstName: string;
-  googleEmail?: string;
   id: string;
-  jobTitle?: string;
-  landline?: PhoneNumberValue; // landline phone number
-  language: string;
-  lastName: string;
+  landline?: PhoneNumberValue;
   phone: PhoneNumberValue;
-  picture?: AttachmentValue;
   roleActions?: TopLevelActions[]; // auto-generated based on the roles provided in the request
-  roles: AppRoles[];
   updatedAt: string;
-  preferredBranchIds?: string[];
-  preferredOpportunityTypes?: OpportunityType[];
+  twilioPhoneNumber?: PhoneNumberValue; // Twilio caller ID used when placing calls
+};
+
+export type UpdateUserRequest = Omit<User, 'phone' | 'landline' | 'twilioPhoneNumber'> & {
+  phone: PhoneNumberRawValue | PhoneNumberValue;
+  landline?: PhoneNumberRawValue | PhoneNumberValue;
+  twilioPhoneNumber?: PhoneNumberRawValue | PhoneNumberValue;
 };
 
 // Short version of the User entity, with only the properties

package/src/types/vehicles.ts

@@ -260,6 +260,7 @@ export type SearchVehicle = {
     dealStatus?: VehiclePurchaseDealStatus;
     logisticsStatus?: VehiclePurchaseLogisticsStatus;
     purchasedBy?: string;
+    purchaseAgreedAt?: string;
     parkingName?: string;
     organizationId: string;
     organizationExternalId?: number;

package/src/utils/accounting.test.ts

@@ -1,5 +1,10 @@
 import { Branch, Tenant } from '../types/tenants.js';
-import { branchHasAccounting, branchProvider, tenantHasAccounting } from './accounting.js';
+import {
+  branchHasAccounting,
+  branchHasAccountingInTenant,
+  branchProvider,
+  tenantHasAccounting,
+} from './accounting.js';
 
 const makeBranch = (overrides: Partial<Branch> = {}): Branch => ({
   id: 'b1',
@@ -87,3 +92,24 @@ describe('tenantHasAccounting', () => {
     expect(tenantHasAccounting(undefined)).toBe(false);
   });
 });
+
+describe('branchHasAccountingInTenant', () => {
+  it('resolves per branch in a mixed tenant', () => {
+    const tenant = makeTenant([
+      makeBranch({ id: 'odoo-branch', accounting: 'odoo' }),
+      makeBranch({ id: 'plain-branch' }),
+    ]);
+    expect(branchHasAccountingInTenant(tenant, 'odoo-branch')).toBe(true);
+    expect(branchHasAccountingInTenant(tenant, 'plain-branch')).toBe(false);
+  });
+
+  it('ignores the deprecated tenant-wide flag and resolves per branch', () => {
+    const tenant = makeTenant([makeBranch({ id: 'plain-branch' })], { exactAccounting: true });
+    expect(branchHasAccountingInTenant(tenant, 'plain-branch')).toBe(false);
+  });
+
+  it('is false for an unknown branch or missing tenant', () => {
+    expect(branchHasAccountingInTenant(makeTenant([makeBranch()]), 'nope')).toBe(false);
+    expect(branchHasAccountingInTenant(undefined, 'b1')).toBe(false);
+  });
+});

package/src/utils/accounting.ts

@@ -22,3 +22,19 @@ export const tenantHasAccounting = (tenant: Tenant | undefined): boolean => {
   }
   return tenant.branches.some((b) => branchHasAccounting(b));
 };
+
+/**
+ * Whether a specific branch books through an accounting integration. Resolves
+ * purely per branch — a tenant can mix accounting and non-accounting branches.
+ * Accounting is carried on the branch (`accounting`, or the deprecated
+ * `exactAccounting`), so the tenant-wide flag is not consulted.
+ */
+export const branchHasAccountingInTenant = (
+  tenant: Tenant | undefined,
+  branchId: string,
+): boolean => {
+  if (tenant == null) {
+    return false;
+  }
+  return branchHasAccounting(tenant.branches.find((b) => b.id === branchId));
+};