Skip to content
Snippets Groups Projects
Commit 6f60a3f0 authored by Rémi PAILHAREY's avatar Rémi PAILHAREY 🍽️
Browse files

fix(newsletter): previous month year in January

parent 37934325
Branches
Tags
2 merge requests!11132.8 Release,!1107fix(newsletter): previous month year in January
...@@ -28,19 +28,17 @@ ...@@ -28,19 +28,17 @@
Bonjour {{username}}, Bonjour {{username}},
</mj-text> </mj-text>
{{#if comparisonExist }} {{#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&nbsp;:</mj-text>
{{#if yearComparisonExist }} {{#if yearComparisonExist }}
<mj-text color="white" font-weight="400" font-size="18px"> <mj-text color="white" font-weight="400" font-size="18px">
Par rapport au mois Par rapport au mois
<span class="bold gold">{{currentMonth}} {{previousYear}}</span> <span class="bold gold">{{currentMonth}} {{previousYear}}</span>, vous avez consommé&nbsp;:{{{yearComparisonText}}}
, vous avez consommé :{{{yearComparisonText}}}
</mj-text> </mj-text>
{{/if}} {{/if}}
{{#if monthComparisonExist }} {{#if monthComparisonExist }}
<mj-text color="white" font-weight="400" font-size="18px"> <mj-text color="white" font-weight="400" font-size="18px">
Par rapport au mois Par rapport au mois
<span class="bold gold">{{previousMonth}} {{currentYear}}</span> <span class="bold gold">{{previousMonth}} {{previousMonthYear}}</span>, vous avez consommé&nbsp;:{{{monthComparisonText}}}
, vous avez consommé :{{{monthComparisonText}}}
</mj-text> </mj-text>
{{/if}} {{/if}}
{{/if}} {{/if}}
......
...@@ -280,6 +280,7 @@ const monthlyReportNotification = async ({ ...@@ -280,6 +280,7 @@ const monthlyReportNotification = async ({
currentMonth: getMonthNameWithPrep(date), currentMonth: getMonthNameWithPrep(date),
previousYear: date.year - 1, previousYear: date.year - 1,
currentYear: date.year, currentYear: date.year,
previousMonthYear: date.month === 1 ? date.year - 1 : date.year,
consoImageUrl: baseUrl + '/assets/multifluidConsumption.png', consoImageUrl: baseUrl + '/assets/multifluidConsumption.png',
feedbackImageUrl: baseUrl + '/assets/feedback.png', feedbackImageUrl: baseUrl + '/assets/feedback.png',
}) })
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment