diff --git a/src/notifications/monthlyReport.hbs b/src/notifications/monthlyReport.hbs index 29dfae79d423a3cefff2d65ce5342e5b49ae12d8..bce1313b6182d34ed9da8b18b1962314be2458ec 100644 --- a/src/notifications/monthlyReport.hbs +++ b/src/notifications/monthlyReport.hbs @@ -28,19 +28,17 @@ Bonjour {{username}}, </mj-text> {{#if comparisonExist }} - <mj-text color="white" font-weight="700" font-size="18px">Votre bilan {{currentMonth}} {{currentYear}} est prêt. Voilà l’évolution de vos consommations :</mj-text> + <mj-text color="white" font-weight="700" font-size="18px">Votre bilan {{currentMonth}} {{currentYear}} est prêt. Voilà l’évolution de vos consommations :</mj-text> {{#if yearComparisonExist }} <mj-text color="white" font-weight="400" font-size="18px"> Par rapport au mois - <span class="bold gold">{{currentMonth}} {{previousYear}}</span> - , vous avez consommé :{{{yearComparisonText}}} + <span class="bold gold">{{currentMonth}} {{previousYear}}</span>, vous avez consommé :{{{yearComparisonText}}} </mj-text> {{/if}} {{#if monthComparisonExist }} <mj-text color="white" font-weight="400" font-size="18px"> Par rapport au mois - <span class="bold gold">{{previousMonth}} {{currentYear}}</span> - , vous avez consommé :{{{monthComparisonText}}} + <span class="bold gold">{{previousMonth}} {{previousMonthYear}}</span>, vous avez consommé :{{{monthComparisonText}}} </mj-text> {{/if}} {{/if}} diff --git a/src/targets/services/monthlyReportNotification.ts b/src/targets/services/monthlyReportNotification.ts index 276c47cac6d62fac31d5fe143bb8d346c543b493..15ef813bea62cb904cd3cebcc577d41450ed3d47 100644 --- a/src/targets/services/monthlyReportNotification.ts +++ b/src/targets/services/monthlyReportNotification.ts @@ -280,6 +280,7 @@ const monthlyReportNotification = async ({ currentMonth: getMonthNameWithPrep(date), previousYear: date.year - 1, currentYear: date.year, + previousMonthYear: date.month === 1 ? date.year - 1 : date.year, consoImageUrl: baseUrl + '/assets/multifluidConsumption.png', feedbackImageUrl: baseUrl + '/assets/feedback.png', })