From 01017f301227e5ea39bac358497479b42b9330f5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 25 May 2020 16:47:06 +0200 Subject: [PATCH] fix setting.get for boolean --- app/pdfs/pdf/invoice.rb | 4 ++-- app/policies/slot_policy.rb | 2 +- app/services/availabilities/public_availabilities_service.rb | 2 +- app/services/availabilities/status_service.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/pdfs/pdf/invoice.rb b/app/pdfs/pdf/invoice.rb index 203c260fb..b559cc293 100644 --- a/app/pdfs/pdf/invoice.rb +++ b/app/pdfs/pdf/invoice.rb @@ -41,7 +41,7 @@ class PDF::Invoice < Prawn::Document else text I18n.t('invoices.invoice_reference', REF: invoice.reference), leading: 3 end - if Setting.get('invoice_code-active') == 'true' + if Setting.get('invoice_code-active') text I18n.t('invoices.code', CODE: Setting.get('invoice_code-value')), leading: 3 end if invoice.invoiced_type != WalletTransaction.name @@ -251,7 +251,7 @@ class PDF::Invoice < Prawn::Document row(0).font_style = :bold column(1).style align: :right - if Setting.get('invoice_VAT-active') == 'true' + if Setting.get('invoice_VAT-active') # Total incl. taxes row(-1).style align: :right row(-1).background_color = 'E4E4E4' diff --git a/app/policies/slot_policy.rb b/app/policies/slot_policy.rb index 29d86a303..315ec317b 100644 --- a/app/policies/slot_policy.rb +++ b/app/policies/slot_policy.rb @@ -5,7 +5,7 @@ class SlotPolicy < ApplicationPolicy def update? # check that the update is allowed and the prevention delay has not expired delay = Setting.get('booking_move_delay').to_i - enabled = (Setting.get('booking_move_enable') == 'true') + enabled = Setting.get('booking_move_enable') # these condition does not apply to admins user.admin? || user.manager? || diff --git a/app/services/availabilities/public_availabilities_service.rb b/app/services/availabilities/public_availabilities_service.rb index 0e81b98fa..7e0fce152 100644 --- a/app/services/availabilities/public_availabilities_service.rb +++ b/app/services/availabilities/public_availabilities_service.rb @@ -4,7 +4,7 @@ class Availabilities::PublicAvailabilitiesService def initialize(current_user) @current_user = current_user - @service = Availabilities::StatusService.new('') + @service = Availabilities::StatusService.new('public') end # provides a list of slots and availabilities for the machines, between the given dates diff --git a/app/services/availabilities/status_service.rb b/app/services/availabilities/status_service.rb index 31f4ed314..5735466ab 100644 --- a/app/services/availabilities/status_service.rb +++ b/app/services/availabilities/status_service.rb @@ -4,7 +4,7 @@ class Availabilities::StatusService def initialize(current_user_role) @current_user_role = current_user_role - @show_name = (%w[admin manager].include?(@current_user_role) || Setting.get('display_name_enable') == 'true') + @show_name = (%w[admin manager].include?(@current_user_role) || Setting.get('display_name_enable')) end # check that the provided machine slot is reserved or not and modify it accordingly