diff --git a/Gemfile b/Gemfile index c9b67ac..53f277a 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,6 @@ gem 'thruster' gem 'useragent', github: 'basecamp/useragent' group :development, :test do - gem 'brakeman', require: false gem 'debug' gem 'faker', require: false gem 'rubocop-capybara', require: false @@ -59,6 +58,8 @@ group :development, :test do end group :development do + gem 'brakeman', require: false + gem 'bundle-audit', require: false gem 'htmlbeautifier' gem 'kamal' gem 'web-console' diff --git a/Gemfile.lock b/Gemfile.lock index 9606481..12ed2b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,6 +109,11 @@ GEM brakeman (6.1.2) racc builder (3.3.0) + bundle-audit (0.1.0) + bundler-audit + bundler-audit (0.9.1) + bundler (>= 1.2.0, < 3) + thor (~> 1.0) capybara (3.40.0) addressable matrix @@ -432,6 +437,7 @@ DEPENDENCIES bcrypt (~> 3.1.7) bootstrap (~> 5.1) brakeman + bundle-audit capybara debug discard (~> 1.2) diff --git a/app/views/payments/_payment.erb b/app/views/payments/_payment.erb index af739ba..8501899 100644 --- a/app/views/payments/_payment.erb +++ b/app/views/payments/_payment.erb @@ -1,6 +1,5 @@ -<%= turbo_frame_tag "new_payment_#{member.id}" do %> -
- Amount: <%= payment.amount %> - Reason: <%= payment.reason %> -
-<% end %> +
+ Amount: <%= number_to_currency(payment.amount) %> +
+ Reason: <%= payment.reason %> +
\ No newline at end of file diff --git a/app/views/payments/index.html.erb b/app/views/payments/index.html.erb index 0e36968..cb6bfec 100644 --- a/app/views/payments/index.html.erb +++ b/app/views/payments/index.html.erb @@ -12,7 +12,7 @@ <% @payments.each do |payment| %> <%= payment.member.last_name %> - <%= payment.amount %> + <%= number_to_currency(payment.amount) %> <%= payment.reason %> <%= payment.created_at %> diff --git a/config/deploy.yml b/config/deploy.yml index 0e3932d..229234e 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -64,7 +64,8 @@ env: # - data:/data # Configure custom arguments for Traefik. Be sure to reboot traefik when you modify it. -# traefik: +traefik: + host_port: "8080" # args: # accesslog: true # accesslog.format: json diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml index f15eda6..a924f68 100644 --- a/config/locales/simple_form.it.yml +++ b/config/locales/simple_form.it.yml @@ -22,8 +22,15 @@ it: province: Provincia telephone: Telefono email: Email + citizenship: Cittadinanza + address: Indirizzo + membership_id: Numero tessera + membership_expires_at: Scadenza medical_certificate_expires_at: Scadenza medical_certificate_kind: Tipo + payment: + amount: Ammontare + reason: Causale # user: # new: # email: 'E-mail to sign in.'