replaced invoice value access

kimai · Nov 21, 2024 · bd08b04 · bd08b04
1 parent bf94ca3
commit bd08b04
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Version 2.7.0
+
+Compatibility: requires minimum Kimai 2.15.0
+
+- Replaced disallowed invoice value access
+
 ## Version 2.6.0
 
 Compatibility: requires minimum Kimai 2.15.0

diff --git a/Resources/invoices/demo.html.twig b/Resources/invoices/demo.html.twig
@@ -101,9 +101,9 @@
                                     {{ entry.activity.name }} / {{ entry.project.name }}
                                 {% endif %}
                             </td>
-                            <td nowrap class="text-nowrap text-right">{{ rate|money(model.calculator.currency) }}</td>
+                            <td nowrap class="text-nowrap text-right">{{ rate|money(invoice['invoice.currency']) }}</td>
                             <td nowrap class="text-nowrap text-right">{{ duration }}</td>
-                            <td nowrap class="text-nowrap text-right">{{ entry.rate|money(model.calculator.currency) }}</td>
+                            <td nowrap class="text-nowrap text-right">{{ entry.rate|money(invoice['invoice.currency']) }}</td>
                         </tr>
                     {% endfor %}
                     </tbody>
@@ -112,20 +112,20 @@
                         <td colspan="4" class="text-right">
                             {{ 'invoice.subtotal'|trans }}
                         </td>
-                        <td class="text-right">{{ model.calculator.subtotal|money(model.calculator.currency) }}</td>
+                        <td class="text-right">{{ model.calculator.subtotal|money(invoice['invoice.currency']) }}</td>
                     </tr>
                     <tr>
                         <td colspan="4" class="text-right">
                             {{ 'invoice.tax'|trans }} ({{ model.calculator.vat }}%)
                         </td>
-                        <td class="text-right">{{ model.calculator.tax|money(model.calculator.currency) }}</td>
+                        <td class="text-right">{{ model.calculator.tax|money(invoice['invoice.currency']) }}</td>
                     </tr>
                     <tr>
                         <td colspan="4" class="text-right text-nowrap">
                             <strong>{{ 'invoice.total'|trans }}</strong>
                         </td>
                         <td class="text-right">
-                            <strong>{{ model.calculator.total|money(model.calculator.currency) }}</strong>
+                            <strong>{{ model.calculator.total|money(invoice['invoice.currency']) }}</strong>
                         </td>
                     </tr>
                     </tfoot>

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Showcase plugin for Kimai, with demos for many extension points within the core",
     "homepage": "https://github.com/Keleo/DemoBundle",
     "type": "kimai-plugin",
-    "version": "2.6.0",
+    "version": "2.7.0",
     "keywords": [
         "kimai",
         "kimai-plugin"