Skip to content

Commit

Permalink
fix payment turbo and some deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
baldarn committed Jul 25, 2024
1 parent 82ed5aa commit d8081c6
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 9 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,15 @@ 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
gem 'rubocop-rails', require: false
end

group :development do
gem 'brakeman', require: false
gem 'bundle-audit', require: false
gem 'htmlbeautifier'
gem 'kamal'
gem 'web-console'
Expand Down
6 changes: 6 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -432,6 +437,7 @@ DEPENDENCIES
bcrypt (~> 3.1.7)
bootstrap (~> 5.1)
brakeman
bundle-audit
capybara
debug
discard (~> 1.2)
Expand Down
11 changes: 5 additions & 6 deletions app/views/payments/_payment.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<%= turbo_frame_tag "new_payment_#{member.id}" do %>
<div class="card">
Amount: <%= payment.amount %>
Reason: <%= payment.reason %>
</div>
<% end %>
<div class="card">
Amount: <%= number_to_currency(payment.amount) %>
<br>
Reason: <%= payment.reason %>
</div>
2 changes: 1 addition & 1 deletion app/views/payments/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<% @payments.each do |payment| %>
<tr>
<th><%= payment.member.last_name %></th>
<td><%= payment.amount %></td>
<td><%= number_to_currency(payment.amount) %></td>
<td><%= payment.reason %></td>
<td><%= payment.created_at %></td>
</tr>
Expand Down
3 changes: 2 additions & 1 deletion config/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions config/locales/simple_form.it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
Expand Down

0 comments on commit d8081c6

Please sign in to comment.