Merge branch 'dev' for release 6.3.15

sleede · Feb 29, 2024 · 59ef0db · 59ef0db
2 parents 484fbde + 58e3097
commit 59ef0db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Next release
 
+## v6.3.15 2024 February 29
+
+- Fix a bug: unable to generate invoice for payment by check/transfer
+
 ## v6.3.14 2024 February 26
 
 - improvement: add idp_slo_service_url(logout requests url) to saml provider

diff --git a/app/services/invoices/payment_details_service.rb b/app/services/invoices/payment_details_service.rb
@@ -62,9 +62,9 @@ def payment_mean(invoice, total, wallet_amount)
       # else
       if invoice.paid_by_card?
         I18n.t('invoices.settlement_by_debit_card')
-      elsif paid_by_transfer?
+      elsif invoice.paid_by_transfer?
         I18n.t('invoices.settlement_by_transfer')
-      elsif paid_by_check?
+      elsif invoice.paid_by_check?
         I18n.t('invoices.settlement_by_check')
       else
         I18n.t('invoices.settlement_done_at_the_reception')

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.14",
+  "version": "6.3.15",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",