@silexpert/core 1.1.358 → 1.1.360

package/ts/utils/brands.ts

@@ -5,41 +5,168 @@ import { BrandComptalib } from '../types/Enum/BrandComptalib';
 import { BrandPourcentage } from '../types/Enum/BrandPourcentage';
 import { BrandStatutsExpress } from '../types/Enum/BrandStatutsExpress';
 import { BrandAnytime } from '../types/Enum/BrandAnytime';
+import { SaleContract } from '..';
 
-type brand = {
+export type Brand = {
   idTypeBrand: number,
+  name: string;
+  commercialName?: string;
+  urlS3?: string;
+  logoS3?: string;
+  lightLogoS3?: string;
+  privacyPolicy?: string;
+  recaptcha?: { secretKey: string; };
+  urlApi1?: string;
+  urlClient?: string;
+  urlApp?: string;
   colors: {
     primary: string,
+    primary50?: string;
+    primary100?: string;
+    primary300?: string;
+    primary500?: string;
+    primary700?: string;
+    footerColor?: string;
+    sendContract?: string;
   },
-  listMails: {
-    bonjour: string,
+  listMails?: {
+    administratif?: string;
+    app?: string;
+    bonjour?: string;
+    contact: string;
+    facturation?: string;
+    feedback?: string;
+    gestion?: string;
+    juridique?: string;
+    informatique?: string;
+    msd?: string;
+    noreply?: string;
+    qualite?: string;
+    paiement?: string;
+    rh?: string;
+    social?: string;
+    support?: string;
+    tva?: string;
+    wb?: string;
   },
-  listPhones: {
-    contact: string,
+  listPhones?: {
+    contact: string;
+    qualite: string;
+    social?: string;
+    juridique: string;
+  },
+  companyInformation?: {
+    ape: string;
+    bp: string;
+    city: string;
+    montantCapital: string;
+    nomRaisonSociale: string;
+    ECName?: string;
+    ECOrderCity: string;
+    ECDepartment?: string,
+    ECPosition?: string;
+    phone: string;
+    postalAddress: string;
+    rcs: string;
+    statut: string;
+    zipCode: string;
+  };
+  recaptchaSecretKey?: string;
+  idPrestationsListHidden?: number[];
+  idPrestationsListAuthorized?: number[];
+  logoUrl?: string;
+  miniLogoUrl?: string;
+  hiddenPages?: [],
+  urlApi2?: string;
+  urlExpert?: string;
+  bank?: {
+    IBAN: string;
+    BIC: string;
+    Name: string;
+    Id: string;
+    codeEtablissement?: string;
+    codeGuichet?: string;
+    numeroCompte?: string;
+    cleRib?: string;
+  },
+  internalInvoicing?: {
+    lastUsedNumber?: number;
+    statut: string;
+    name: string;
+    address: string;
+    zipCode: string;
+    city: string;
+    country: string;
+    montantCapital: string;
+    siret: string;
+    ape: string;
+    rcs: string;
+    phone: string;
+    vatIntracom: string;
+    email: string;
+  },
+  webmail?: {
+    domains: string[];
   },
-  name: string,
-  urlApi1?: string,
-  urlClient?: string,
-  urlApp?: string,
   offices?: {
-    LAXOU: {
-      id : number,
+    LAXOU?: {
+      id: number,
+      name: string;
+    },
+    PARIS?: {
+      id: number,
+      name: string;
+    },
+    MARSEILLE?: {
+      id: number,
+      name: string;
+    },
+    EPINAL?: {
+      id: number,
+      name: string;
+    },
+    HOME_OFFICE?: {
+      id: number,
+      name: string;
+    },
+    NICE?: {
+      id: number,
+      name: string;
     },
-    HOME_OFFICE: {
-      id : number,
-    }
   },
+  salesContractConfig?: SaleContract[],
 };
 
 const allBrands = ['Legalstart', 'Comptalib', 'Clementine', 'Pourcentage', 'StatutsExpress', 'Anytime'] as const;
 type BrandList = typeof allBrands[number];
 
-type getBrandConfigParams = {
+const listEnvEnum: { 
+  BrandClementine: Brand[];
+  BrandLegalstart: Brand[];
+  BrandComptalib: Brand[];
+  BrandPourcentage: Brand[];
+  BrandStatutsExpress: Brand[];
+  BrandAnytime: Brand[];
+} = {
+  BrandClementine,
+  BrandLegalstart,
+  BrandComptalib,
+  BrandPourcentage,
+  BrandStatutsExpress,
+  BrandAnytime,
+};
+
+type GetBrandConfigParam = {
   idTypeBrand?: number,
   objectWaited?: string,
   nodeEnv?: string
 };
 
+type GetBrandParam = {
+  idTypeBrand?: number,
+  nodeEnv?: string
+};
+
 const getBrandNameByNodeEnv = (nodeEnv?: string): BrandList => {
   const env = nodeEnv ?? process.env.NODE_ENV ?? process.env.API_HOST;
   if (env) {
@@ -68,12 +195,10 @@ const isItThisEnv = (brandList: BrandList, nodeEnv?: string): boolean => {
   return getBrandNameByNodeEnv(env) === brandList;
 };
 
-const getAllBrandByNodeEnv = (nodeEnv?: string): Array<brand> => {
+const getAllBrandByNodeEnv = (nodeEnv?: string): Array<Brand> => {
   const nodeEnvUsed = nodeEnv ?? process.env.NODE_ENV;
   const currentEnvName = getBrandNameByNodeEnv(nodeEnvUsed);
-  const listEnvEnum = {
-    BrandClementine, BrandLegalstart, BrandComptalib, BrandPourcentage, BrandStatutsExpress, BrandAnytime,
-  };
+
   // @ts-ignore
   const currentConfigFile:brand[] = listEnvEnum[`Brand${currentEnvName}`];
 
@@ -82,29 +207,56 @@ const getAllBrandByNodeEnv = (nodeEnv?: string): Array<brand> => {
   return brand;
 };
 
-const getBrandConfig = (params: getBrandConfigParams): brand => {
+
+function getBrand(params?: GetBrandParam): Brand {
+
+  let brand: Brand | undefined;
+
+  const { nodeEnv, idTypeBrand } = params ?? {};
+  const nodeEnvUsed = nodeEnv ?? process.env.NODE_ENV;
+
+  const currentEnvName = getBrandNameByNodeEnv(nodeEnvUsed);
+
+  const currentConfigFile: Brand[] = listEnvEnum[`Brand${currentEnvName}`];
+
+  if (idTypeBrand) {
+    brand = currentConfigFile.find((b: Brand) => b.idTypeBrand === idTypeBrand);
+  }
+
+  if (!brand) {
+    // Si aucune brand trouvée, on passe par défaut la première brand de la liste
+    [brand] = currentConfigFile.sort((a: Brand, b: Brand) => a.idTypeBrand - b.idTypeBrand);
+  }
+
+  return brand;
+}
+
+/**
+ * @deprecated use getBrand()
+ */
+const getBrandConfig = (params: GetBrandConfigParam): Brand => {
+  
   const {
     idTypeBrand = null, objectWaited = null, nodeEnv,
   } = params;
   let brand;
+
   const nodeEnvUsed = nodeEnv ?? process.env.NODE_ENV;
   const currentEnvName = getBrandNameByNodeEnv(nodeEnvUsed);
-  const listEnvEnum = {
-    BrandClementine, BrandLegalstart, BrandComptalib, BrandPourcentage, BrandStatutsExpress, BrandAnytime,
-  };
+  
   // @ts-ignore
   const currentConfigFile:brand[] = listEnvEnum[`Brand${currentEnvName}`];
 
   if (idTypeBrand) {
     // Récupération de la brand via idTypeBrand
-    brand = currentConfigFile.find((b: brand) => b.idTypeBrand === idTypeBrand);
+    brand = currentConfigFile.find((b: Brand) => b.idTypeBrand === idTypeBrand);
   }
   // else if (idSociety) {
   // Récupération de la brand via l'idSociety -> impossible directement depuis le core (pas d'accès au resources, ni au token pour l'appel via fetch)
 
   if (!brand) {
     // Si aucune brand trouvée, on passe par défaut la première brand de la liste
-    [brand] = currentConfigFile.sort((a: brand, b: brand) => a.idTypeBrand - b.idTypeBrand);
+    [brand] = currentConfigFile.sort((a: Brand, b: Brand) => a.idTypeBrand - b.idTypeBrand);
   }
 
   if (objectWaited) {
@@ -112,7 +264,7 @@ const getBrandConfig = (params: getBrandConfigParams): brand => {
     let objectToReturn = getLodash(brand, objectWaited);
     // Si aucun attribut trouvé, on renvoit celui de Clementine par défaut
     if (!objectToReturn) {
-      const brandDefault = currentConfigFile.find((b: brand) => b.name === currentEnvName);
+      const brandDefault = currentConfigFile.find((b: Brand) => b.name === currentEnvName);
       objectToReturn = getLodash(brandDefault, objectWaited);
     }
     return objectToReturn;
@@ -135,9 +287,7 @@ const getBrandByEmail = (email: string): 'Legalstart' | 'Comptalib' | 'Clementin
 const getSubBrandList = (nodeEnv?: string): Array<object> => {
   const nodeEnvUsed = nodeEnv ?? process.env.NODE_ENV;
   const currentEnvName = getBrandNameByNodeEnv(nodeEnvUsed);
-  const listEnvEnum = {
-    BrandClementine, BrandLegalstart, BrandComptalib, BrandPourcentage, BrandStatutsExpress, BrandAnytime,
-  };
+
   // @ts-ignore
   const currentConfigFile: brand[] = listEnvEnum[`Brand${currentEnvName}`];
 
@@ -145,5 +295,5 @@ const getSubBrandList = (nodeEnv?: string): Array<object> => {
 };
 
 export {
-  getBrandConfig, isItThisEnv, getAllBrandByNodeEnv, getBrandNameByNodeEnv, getBrandByEmail, getSubBrandList,
+  getBrandConfig, isItThisEnv, getAllBrandByNodeEnv, getBrandNameByNodeEnv, getBrandByEmail, getSubBrandList, getBrand,
 };

package/ts/utils/vat/3310/century23.ts

@@ -17,6 +17,10 @@ export function getCerfa3310Century23Payload(accountingEntries: IAccountingEntry
   const shouldHaveVatCode = isDefined(payload.setting?.tvaCode) && isDefined(payload.society.siret);
   const vats = Object.values(Vat);
 
+  const isVatControl = Object.values(payload.vatControl ?? {}).filter(v => isDefined(v)).length > 0;
+  // On désactive les automatismes des déclarations précédentes dans le contrôle de TVA
+  if (isVatControl) payload.previousVatDeclaration = null;
+
   const frenchVat = vats.filter((v) => !v.isVatImportation && !v.isVatIntracom).map((v) => v.id);
   const withTaxVat = vats.filter((v) => v.value > 0).map((v) => v.id);
   const intracomVat = vats.filter((v) => v.isVatIntracom && !v.isVatImportation).map((v) => v.id);