diff --git a/src/notifications/monthlyReport.hbs b/src/notifications/monthlyReport.hbs index fa907c871fb17b13aa4cc2d8bb413339f0e2ae8c..b08c1b51c63e5f15f214d803aed00a5a3af8da55 100644 --- a/src/notifications/monthlyReport.hbs +++ b/src/notifications/monthlyReport.hbs @@ -44,32 +44,40 @@ </mj-social> </mj-column> </mj-section> - <mj-section background-color="radial-gradient(96.2% 96.2% at 50% 3.8%, #343641 0%, #1B1C22 100%)"> - <mj-column> - <mj-text css-class="title" color="white" font-weight="900" font-size="24px" align="center" > - L'info du mois - </mj-text> - <mj-image src="{{infoImage}}" width="82px" alt="nouveauté"></mj-image> - <mj-text color="white" font-weight="400" font-size="18px" css-class="custom-link">{{{infoText}}}</mj-text> - {{#if isServiceNews}} - <mj-divider css-class="m-divider"></mj-divider> - <mj-text css-class="title custom-link" color="white" font-weight="900" font-size="24px" align="center" > - {{newsTitle}} - </mj-text> - <mj-text color="white" font-weight="400" font-size="18px" css-class="custom-link" >{{{newsContent}}}</mj-text> - {{/if}} - {{#if isPoll}} - <mj-divider css-class="m-divider"></mj-divider> - <mj-text css-class="title " color="white" font-weight="900" font-size="24px" align="center" > - Votre avis nous intéresse - </mj-text> - <mj-text color="white" font-weight="400" font-size="18px" css-class="custom-link" >{{{pollText}}}</mj-text> - <mj-button color="black" background-color="#F1C017" css-class="button" font-size="20px" font-weight="700" > - <a href="{{pollUrl}}" style="text-decoration: none; color: black">C'est parti !</a> - </mj-button> - {{/if}} - </mj-column> - </mj-section> + {{#if isContent}} + <mj-section background-color="radial-gradient(96.2% 96.2% at 50% 3.8%, #343641 0%, #1B1C22 100%)"> + <mj-column> + {{#if isInfo}} + <mj-text css-class="title" color="white" font-weight="900" font-size="24px" align="center" > + L'info du mois + </mj-text> + <mj-image src="{{infoImage}}" width="82px" alt="nouveauté"></mj-image> + <mj-text color="white" font-weight="400" font-size="18px" css-class="custom-link">{{{infoText}}}</mj-text> + {{/if}} + {{#if divider1}} + <mj-divider css-class="m-divider"></mj-divider> + {{/if}} + {{#if isServiceNews}} + <mj-text css-class="title custom-link" color="white" font-weight="900" font-size="24px" align="center" > + {{newsTitle}} + </mj-text> + <mj-text color="white" font-weight="400" font-size="18px" css-class="custom-link" >{{{newsContent}}}</mj-text> + {{/if}} + {{#if divider2}} + <mj-divider css-class="m-divider"></mj-divider> + {{/if}} + {{#if isPoll}} + <mj-text css-class="title " color="white" font-weight="900" font-size="24px" align="center" > + Votre avis nous intéresse + </mj-text> + <mj-text color="white" font-weight="400" font-size="18px" css-class="custom-link" >{{{pollText}}}</mj-text> + <mj-button color="black" background-color="#F1C017" css-class="button" font-size="20px" font-weight="700" > + <a href="{{pollUrl}}" style="text-decoration: none; color: black">C'est parti !</a> + </mj-button> + {{/if}} + </mj-column> + </mj-section> + {{/if}} <mj-section background-color="#121212"> <mj-column vertical-align="middle"> <mj-image src={{feedbackImageUrl}} width="53px" align="center" alt="feedback"></mj-image> diff --git a/src/targets/services/monthlyReportNotification.ts b/src/targets/services/monthlyReportNotification.ts index 6771e90748250d44d55d645baef101b45f0a3030..6475330793078c4903710f9b870a5fda9969fa2e 100644 --- a/src/targets/services/monthlyReportNotification.ts +++ b/src/targets/services/monthlyReportNotification.ts @@ -245,12 +245,14 @@ const monthlyReportNotification = async ({ const consumptionText = await buildConsumptionText(client) - const isPoll: boolean = - monthlyReport.question !== '' && monthlyReport.link !== '' + const isInfo: boolean = monthlyReport.info !== '' const isServiceNews: boolean = monthlyReport.newsTitle !== '' && monthlyReport.newsContent !== '' + const isPoll: boolean = + monthlyReport.question !== '' && monthlyReport.link !== '' + const date = DateTime.local() .setZone('utc', { keepLocalTime: true }) .minus({ month: 1 }) @@ -271,7 +273,11 @@ const monthlyReportNotification = async ({ monthlyReport.image !== '' ? baseUrl + monthlyReport.image : baseUrl + '/assets/astuce.png', + isContent: isInfo || isServiceNews || isPoll, + isInfo: isInfo, + divider1: (isInfo && isServiceNews) || (isInfo && isPoll), isServiceNews: isServiceNews, + divider2: isServiceNews && isPoll, isPoll: isPoll, newsTitle: monthlyReport.newsTitle.replace(/{cozyUrl}/g, appLink + '#/'), newsContent: monthlyReport.newsContent.replace(