Merge branch 'hotfix/1.0.1' into develop

Robert-2 · Dec 9, 2024 · f6e6c57 · f6e6c57
2 parents 7357e3b + 8387af3
commit f6e6c57
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ Tous les changements notables sur le projet sont documentés dans ce fichier.
 
 Ce projet adhère au principe du [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.0.1 (2024-12-09)
+
+- Corrige un problème avec l'affichage des remises de matériel dans les devis et factures.
+
 ## 1.0.0 (2024-12-06)
 
 - Ajoute une popup avec plus d'informations sur le matériel au survol de la référence et du nom du matériel sur le listing du matériel.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.0
+1.0.1
diff --git a/client/src/themes/default/pages/Schedule/pages/index.ts b/client/src/themes/default/pages/Schedule/pages/index.ts
@@ -9,7 +9,9 @@ const pages: RouteConfig[] = [
         name: 'schedule',
         path: '',
         redirect: () => {
-            const { default_bookings_view: defaultBookingsView } = store.getters['auth/user'];
+            const defaultBookingsView = store.getters['auth/isLogged']
+                ? store.getters['auth/user'].default_bookings_view
+                : 'calendar';
             return { name: `schedule:${defaultBookingsView}` };
         },
     },

diff --git a/server/src/App/Services/Auth/JWT.php b/server/src/App/Services/Auth/JWT.php
@@ -119,7 +119,7 @@ public static function registerSessionToken(User $user): string
         $cookieName = Config::get('auth.cookie');
         $shouldSecureCookie = Config::isSslEnabled();
 
-        setcookie($cookieName, '', [
+        setcookie($cookieName, $token, [
             'expires' => 0,
             'path' => '/',
             'secure' => $shouldSecureCookie,

diff --git a/server/src/views/pdf/estimate.twig b/server/src/views/pdf/estimate.twig
@@ -344,7 +344,7 @@
                 </td>
                 {%- if not isLegacy ~%}
                 <td class="center">
-                    {{ material.discount_rate|format_percent_number({max_fraction_digit: 4}, locale=locale) }}
+                    {{ material.discount_rate.dividedBy(100, 6)|format_percent_number({max_fraction_digit: 4}, locale=locale) }}
                 </td>
                 {%- endif ~%}
                 <td class="right">

diff --git a/server/src/views/pdf/invoice.twig b/server/src/views/pdf/invoice.twig
@@ -331,7 +331,7 @@
                 </td>
                 {%- if not isLegacy ~%}
                 <td class="center">
-                    {{ material.discount_rate|format_percent_number({max_fraction_digit: 4}, locale=locale) }}
+                    {{ material.discount_rate.dividedBy(100, 6)|format_percent_number({max_fraction_digit: 4}, locale=locale) }}
                 </td>
                 {%- endif ~%}
                 <td class="right">

diff --git a/server/tests/fixtures/snapshots/EstimateTest__testToPdf__2.html b/server/tests/fixtures/snapshots/EstimateTest__testToPdf__2.html
@@ -339,7 +339,7 @@ <h2>Mat&eacute;riel</h2>
                     4,81&nbsp;&euro;
                 </td>
                 <td class="center">
-                    5&#8239;000&nbsp;%
+                    50&nbsp;%
                 </td>
                 <td class="right">
                     4,81&nbsp;&euro;

diff --git a/server/tests/fixtures/snapshots/EstimatesTest__testDownloadPdf__1.html b/server/tests/fixtures/snapshots/EstimatesTest__testDownloadPdf__1.html
@@ -339,7 +339,7 @@ <h2>Materials</h2>
                     &euro;4.81
                 </td>
                 <td class="center">
-                    5,000%
+                    50%
                 </td>
                 <td class="right">
                     &euro;4.81

diff --git a/server/tests/fixtures/snapshots/InvoiceTest__testToPdf__4.html b/server/tests/fixtures/snapshots/InvoiceTest__testToPdf__4.html
@@ -337,7 +337,7 @@ <h2>Materials</h2>
                     &euro;44.63
                 </td>
                 <td class="center">
-                    1,000%
+                    10%
                 </td>
                 <td class="right">
                     &euro;80.33

diff --git a/server/tests/fixtures/snapshots/InvoiceTest__testToPdf__5.html b/server/tests/fixtures/snapshots/InvoiceTest__testToPdf__5.html
@@ -337,7 +337,7 @@ <h2>Materials</h2>
                     &euro;44.63
                 </td>
                 <td class="center">
-                    1,000%
+                    10%
                 </td>
                 <td class="right">
                     &euro;80.33