@silexpert/core 1.0.107 → 1.0.109

package/ts/utils/commercialManagement/document.ts

@@ -31,7 +31,7 @@ type brandColorType = {
   primary700: string
 };
 
-export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoiceType, payload: CreateInvoiceDocument | CreatePreSaleDocument, shouldHideBrandName = false): ReadCommercialDocumentTemplate {
+export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoiceType, payload: CreateInvoiceDocument | CreatePreSaleDocument, shouldHideBrandName = false, nodeEnv = undefined): ReadCommercialDocumentTemplate {
   const products = _orderBy(payload.products.map((product) => productToReadProductEditing(product), 'reorder'));
   const vats = _orderBy(Object.values(_groupBy(products, 'vatFormatted')).map((v) => (vatToReadVatEditing(v)), 'value')).filter((v) => v.id !== Vat.MARGE.id);
   const thirdParty = thirdPartyToReadThirdPartyEditing(payload.thirdParty);
@@ -84,8 +84,8 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
       AccountingCategoryList.find((a) => a.id === payload.accountingCategory)
         ?.label ?? null,
     // @ts-ignore
-    brandColors: getBrandConfig({ objectWaited: 'colors' }) as brandColorType,
-    brandName: `${getBrandConfig({ objectWaited: 'name' })}`,
+    brandColors: getBrandConfig({ objectWaited: 'colors', nodeEnv }) as brandColorType,
+    brandName: `${getBrandConfig({ objectWaited: 'name', nodeEnv })}`,
     shouldHideBrandName,
   };
 
@@ -121,7 +121,7 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
   };
 }
 
-export function generateAdvanceDocument(payload: CreateInvoiceDocument, shouldHideBrandName = false): ReadCommercialDocumentTemplate {
+export function generateAdvanceDocument(payload: CreateInvoiceDocument, shouldHideBrandName = false, nodeEnv = undefined): ReadCommercialDocumentTemplate {
   if (!payload.deposit) throw new Error('Aucun acompte défini');
 
   const data: ReadDocumentEditing & { brandColors: brandColorType, brandName: string, shouldHideBrandName: boolean } = {
@@ -182,8 +182,8 @@ export function generateAdvanceDocument(payload: CreateInvoiceDocument, shouldHi
       AccountingCategoryList.find((a) => a.id === payload.accountingCategory)
         ?.label ?? null,
     // @ts-ignore
-    brandColors: getBrandConfig({ objectWaited: 'colors' }) as brandColorType,
-    brandName: `${getBrandConfig({ objectWaited: 'name' })}`,
+    brandColors: getBrandConfig({ objectWaited: 'colors', nodeEnv }) as brandColorType,
+    brandName: `${getBrandConfig({ objectWaited: 'name', nodeEnv })}`,
     shouldHideBrandName,
   };
 
@@ -213,7 +213,7 @@ export function generateAdvanceDocument(payload: CreateInvoiceDocument, shouldHi
   };
 }
 
-export function generateMailHeader(params: CreateMailHeader, shouldHideBrandName = false): ReadCommercialMailTemplate {
+export function generateMailHeader(params: CreateMailHeader, shouldHideBrandName = false, nodeEnv = undefined): ReadCommercialMailTemplate {
   dayjs.locale('fr');
   const data = {
     ...params.payload,
@@ -227,8 +227,7 @@ export function generateMailHeader(params: CreateMailHeader, shouldHideBrandName
     companyName: params.companyName,
     fileUrl: params.fileUrl,
     // @ts-ignore
-    brandColors: getBrandConfig({ objectWaited: 'colors' }) as brandColorType,
-    brandName: `${getBrandConfig({ objectWaited: 'name' })}`,
+    brandColors: getBrandConfig({ objectWaited: 'colors', nodeEnv }) as brandColorType,
     shouldHideBrandName,
   };
 

package/ts/utils/commercialManagement/templates/common.ts

@@ -388,7 +388,7 @@ export class CommercialDocumentMailHTML {
         </div>
       </div>
       <% if (!shouldHideBrandName) { %>
-      <div style="margin-top: 16px; width: fit-content; margin-left: auto; margin-right: auto; font-size: 14px;">
+      <div style="margin-top: 16px; width: fit-content; white-space: nowrap; margin-left: auto; margin-right: auto; font-size: 14px;">
         <div class="brand-tag" style="display: flex; line-height: 22px; height: 22px;">
           Généré par <% if (hostS3) { %><img src="<%= hostS3 %>config/logo-brand.png" alt="logo" style="max-height: 22px; margin-left: 8px;" /><% } %>
         </div>