ansol/saucy
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ansol:d6bd26c76f8acd913e47208fbdf65f88874e9ef0
Branches Tags
ansol:main
..
compare: ansol:dccad3647434a3cd00b34c9ed069136aa6bfc312
Branches Tags
ansol:main

No commits in common. "d6bd26c76f8acd913e47208fbdf65f88874e9ef0" and "dccad3647434a3cd00b34c9ed069136aa6bfc312" have entirely different histories.
d6bd26c76f ... dccad36474

36 changed files with 115 additions and 218 deletions
Show Stats Expand all files Collapse all files

BIN
app/assets/images/ansol-logo-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

0
public/logo.svg → app/assets/images/logo.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

3
app/assets/stylesheets/application.css
View File

@ -15,10 +15,13 @@ main {
.banner {
width: 100%;
height: 30px;
padding: 15px;
background-image: url(logo.svg);
background-size: auto 30px;
background-repeat: no-repeat;
background-position: center;
background-color: #041952;
}
footer {

1
app/controllers/members_controller.rb
View File

@ -28,7 +28,6 @@ class MembersController < ApplicationController
@member = Member.new(member_params.merge(number: (Member.maximum(:number) || 0) + 1))
if @member.save
@member.generate_missing_ifthenpay_links!
@member.reset_status!
NotificationMailer.with(member: @member).registration.deliver_now!

37
app/lib/config.rb
View File

@ -1,9 +1,34 @@
module Config
class <<self
if ENV.fetch("BRANDING") == "d3"
include Config::D3
else
include Config::Ansol
end
def self.organization_full_name
"ANSOL - Associação Nacional para o Software Livre"
end
def self.organization_website
"https://ansol.org"
end
def self.regular_payment_value
30
end
def self.reduced_payment_value
6
end
def self.ifthenpay_payment_title
"Quotas ANSOL"
end
def self.payment_iban
"PT50 0035 2178 00027478430 14"
end
def self.payment_proof_email
"direccao@ansol.org"
end
def self.reduced_payment_description
"Caso queiras usufruir da quota reduzida de 6.00€ para estudantes, pessoas
desempregadas ou reformadas, envia-nos um comprovativo desse estatuto."
end
end

60
app/lib/config/ansol.rb
View File

@ -1,60 +0,0 @@
module Config
module Ansol
def organization_short_name
"ANSOL"
end
def organization_full_name
"ANSOL - Associação Nacional para o Software Livre"
end
def organization_website
"https://ansol.org"
end
def regular_payment_value
30
end
def reduced_payment_value
6
end
def full_rights_vesting_period
6.months
end
def payment_pending_grace_period
90.days
end
def ifthenpay_payment_title
"Quotas ANSOL"
end
def payment_iban
"PT50 0035 2178 00027478430 14"
end
def payment_proof_email
"direccao@ansol.org"
end
def reduced_payment_description
"Caso queiras usufruir da quota reduzida de 6.00€ para estudantes, pessoas
desempregadas ou reformadas, envia-nos um comprovativo desse estatuto."
end
def header_color
"white"
end
def header_background_color
"#041952"
end
def organization_logo_url
"https://#{ENV['BASE_HOST']}/logo.png"
end
end
end

60
app/lib/config/d3.rb
View File

@ -1,60 +0,0 @@
module Config
module D3
def organization_short_name
"D3"
end
def organization_full_name
"Associação D3 - Defesa dos Direitos Digitais"
end
def organization_website
"https://direitosdigitais.pt"
end
def regular_payment_value
32
end
def reduced_payment_value
16
end
def full_rights_vesting_period
1.year
end
def payment_pending_grace_period
120.days
end
def ifthenpay_payment_title
"Quotas D3"
end
def payment_iban
"PT50 0033 0000 45508899562 05"
end
def payment_proof_email
"direccao@direitosdigitais.pt"
end
def reduced_payment_description
"Caso queiras usufruir da quota reduzida de 6.00€ para estudantes, pessoas
desempregadas ou reformadas, envia-nos um comprovativo desse estatuto."
end
def header_color
"#60f163"
end
def header_background_color
"#424242"
end
def organization_logo_url
"https://direitosdigitais.pt/templates/g5_hydrogen/custom/images/d3/d3-logo/logo-d3-transparente.png"
end
end
end

48
app/mailers/notification_mailer.rb
View File

@ -1,70 +1,58 @@
class NotificationMailer < ApplicationMailer
default to: ->() { @member.email }
# Subject can be set in your I18n file at config/locales/en.yml
# with the following lookup:
#
# en.notification_mailer.expiration_in_60d.subject
#
def expiration_in_60d
set_notification
mail
mail to: @notification.member.email
end
def expiration_in_30d
set_notification
mail
mail to: @notification.member.email
end
def expired
set_notification
mail
mail to: @notification.member.email
end
def expired_30d_ago
set_notification
mail
mail to: @notification.member.email
end
def expired_60d_ago
set_notification
mail
mail to: @notification.member.email
end
def cancelled
set_notification
mail
mail to: @notification.member.email
end
def registration
set_member
mail
@member = params[:member]
@payment = @member.create_payment
mail to: @member.email
end
def first_payment_confirmation
set_contribution
mail
@contribution = params[:contribution]
mail to: @contribution.member.email
end
def payment_renewal_confirmation
set_contribution
mail
@contribution = params[:contribution]
mail to: @contribution.member.email
end
private
def set_notification
@notification = params[:notification]
@member = @notification.member
@payment = @notification.member.create_payment
end
def set_contribution
@contribution = params[:contribution]
@member = @contribution.member
end
def set_member
@member = params[:member]
@payment = @member.create_payment
end
def default_i18n_subject
mailer_scope = self.class.mailer_name.tr("/", ".")
I18n.t(:subject, scope: [mailer_scope, action_name], organization_short_name: Config.organization_short_name)
end
end

7
app/models/member.rb
View File

@ -14,11 +14,11 @@ class Member < ApplicationRecord
end
def cancelled_on
expires_on + Config.payment_pending_grace_period
expires_on + 90.days
end
def obtains_full_rights_on
joined_on + Config.full_rights_vesting_period
joined_on + 6.months
end
def reset_status!
@ -26,7 +26,6 @@ class Member < ApplicationRecord
end
def employed?
# normal is deprecated, here for retrocompatibility reasons
category == "normal" || category == "employed"
end
@ -112,7 +111,7 @@ class Member < ApplicationRecord
{ to_be_sent_on: expires_on + 0.days, template: "expired" },
{ to_be_sent_on: expires_on + 30.days, template: "expired_30d_ago" },
{ to_be_sent_on: expires_on + 60.days, template: "expired_60d_ago" },
{ to_be_sent_on: expires_on + Config.payment_pending_grace_period, template: "cancelled" },
{ to_be_sent_on: expires_on + 90.days, template: "cancelled" },
].reject do |n|
n[:to_be_sent_on].before?(from) || dates.include?(n[:to_be_sent_on])
end.each do |n|

4
app/views/layouts/application.html.erb
View File

@ -11,9 +11,7 @@
</head>
<body>
<div class='banner' style="background-color: <%= Config.header_background_color %>;">
<img src="<%= Config.organization_logo_url %>" style="margin: 0px auto; max-width: 400px; display: block; color: <%= Config.header_color %>" alt="<%= Config.organization_full_name %>" />
</div>
<div class='banner'></div>
<% if signed_in? %>
<nav>
<ul>

4
app/views/layouts/mailer.html.erb
View File

@ -9,8 +9,8 @@
<body>
<div style="max-width: 600px;">
<div style="background-color: <%= Config.header_background_color %>; padding: 20px; text-align: center;">
<img src="<%= Config.organization_logo_url %>" style="margin: 0px auto; max-width: 400px; display: block; color: <%= Config.header_color %>" alt="<%= Config.organization_full_name %>" />
<div style="background-color: #041952; padding: 20px">
<img src="<%= image_url("ansol-logo-white.png") %>" style="margin: 0px auto; max-width: 400px; display: block; color: white" alt="ANSOL" />
</div>
<%= yield %>

2
app/views/notification_mailer/_cheers.html.erb
View File

@ -1,4 +1,4 @@
<p>
Saudações livres,<br>
Direcção da <%= Config.organization_short_name %>
Direcção da ANSOL
</p>

2
app/views/notification_mailer/_cheers.text.erb
View File

@ -1,2 +1,2 @@
Saudações livres,
Direcção da <%= Config.organization_short_name %>
Direcção da ANSOL

3
app/views/notification_mailer/_greetings.html.erb
View File

@ -1,3 +0,0 @@
<p>
<%= t('notification_mailer.greetings', display_name: member.display_name) %>
</p>

1
app/views/notification_mailer/_greetings.text.erb
View File

@ -1 +0,0 @@
<%= t('notification_mailer.greetings', display_name: member.display_name) %>

13
app/views/notification_mailer/cancelled.html.erb
View File

@ -1,8 +1,10 @@
<%= render partial: "greetings", locals: { member: @member } %>
<p>
<%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %>
</p>
<p>
Como não recebemos o pagamento anual das quotas da <%= Config.organization_short_name %>,
a tua inscrição foi cancelada.
Como não recebemos o pagamento anual das quotas da ANSOL, a tua inscrição foi
cancelada.
</p>
<p>
@ -22,4 +24,7 @@
rápido possível.
</p>
<%= render partial: "cheers" %>
<p>
Saudações livres,<br>
Direcção da ANSOL
</p>

9
app/views/notification_mailer/cancelled.text.erb
View File

@ -1,7 +1,7 @@
<%= render partial: "greetings", locals: { member: @member } %>
<%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %>
Como não recebemos o pagamento anual das quotas da <%= Config.organization_short_name %>,
a tua inscrição foi cancelada.
Como não recebemos o pagamento anual das quotas da ANSOL, a tua inscrição foi
cancelada.
Vamos revogar em breve os teus acessos à infraestrutura da associação exclusiva
para membros (nextcloud, mailing list, sala de Matrix, etc).
@ -13,4 +13,5 @@ Caso consideres que estás a receber esta mensagem indevidamente, contacta-nos
através do endereço direccao@ansol.org para resolvermos a situação o mais
rápido possível.
<%= render partial: "cheers" %>
Saudações livres,
Direcção da ANSOL

2
app/views/notification_mailer/expiration_in_30d.html.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<p><%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %></p>
<p>
A tua inscrição como membro da ANSOL expira em 30 dias.

2
app/views/notification_mailer/expiration_in_30d.text.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %>
A tua inscrição como membro da ANSOL expira em 30 dias.

2
app/views/notification_mailer/expiration_in_60d.html.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<p><%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %></p>
<p>
A tua inscrição como membro da ANSOL expira em 60 dias.

2
app/views/notification_mailer/expiration_in_60d.text.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %>
A tua inscrição como membro da ANSOL expira em 60 dias.

4
app/views/notification_mailer/expired.html.erb
View File

@ -1,4 +1,6 @@
<%= render partial: "greetings", locals: { member: @member } %>
<p>
<%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %>
</p>
<p>
A tua inscrição como membro da ANSOL vai ser cancelada dentro de 30 dias por

2
app/views/notification_mailer/expired.text.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %>
A tua inscrição como membro da ANSOL expirou hoje e não recebemos a tua
contribuição anual.

4
app/views/notification_mailer/expired_30d_ago.html.erb
View File

@ -1,4 +1,6 @@
<%= render partial: "greetings", locals: { member: @member } %>
<p>
<%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %>
</p>
<p>
A tua inscrição como membro da ANSOL expirou há um mês e ainda não recebemos

2
app/views/notification_mailer/expired_30d_ago.text.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %>
A tua inscrição como membro da ANSOL expirou há um mês e ainda não recebemos
a tua contribuição anual.

4
app/views/notification_mailer/expired_60d_ago.html.erb
View File

@ -1,4 +1,6 @@
<%= render partial: "greetings", locals: { member: @member } %>
<p>
<%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %>
</p>
<p>
A tua inscrição como membro da ANSOL vai ser cancelada dentro de 30 dias por

2
app/views/notification_mailer/expired_60d_ago.text.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<%= t('notification_mailer.greetings', display_name: @notification.member.display_name) %>
A tua inscrição como membro da ANSOL expirou há 60 dias e ainda não recebemos
a tua contribuição anual.

2
app/views/notification_mailer/first_payment_confirmation.html.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<p><%= t('notification_mailer.greetings', display_name: @contribution.member.display_name) %></p>
<p>
Bem-vinde à ANSOL! Confirmamos que recebemos o teu pagamento, e tua inscrição

2
app/views/notification_mailer/first_payment_confirmation.text.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<%= t('notification_mailer.greetings', display_name: @contribution.member.display_name) %>
Bem-vinde à ANSOL! Confirmamos que recebemos o teu pagamento, e tua inscrição
está válida até <%= @contribution.member.expires_on %>.

2
app/views/notification_mailer/payment_renewal_confirmation.html.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<p><%= t('notification_mailer.greetings', display_name: @contribution.member.display_name) %></p>
<p>
Recebemos o teu pagamento. Obrigado por continuares a apoiar a ANSOL. A tua

2
app/views/notification_mailer/payment_renewal_confirmation.text.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<%= t('notification_mailer.greetings', display_name: @contribution.member.display_name) %>
Recebemos o teu pagamento. Obrigado por continuares a apoiar a ANSOL. A tua
inscrição foi renovada e está válida até <%= @contribution.member.expires_on %>.

2
app/views/notification_mailer/registration.html.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<p><%= t('notification_mailer.greetings', display_name: @member.display_name) %></p>
<p>
Obrigado pelo interesse em fazer parte da ANSOL. A tua candidatura foi

2
app/views/notification_mailer/registration.text.erb
View File

@ -1,4 +1,4 @@
<%= render partial: "greetings", locals: { member: @member } %>
<%= t('notification_mailer.greetings', display_name: @member.display_name) %>
Obrigado pelo interesse em fazer parte da ANSOL. A tua candidatura foi aprovada
pela direcção.

23
config/locales/en.yml
View File

@ -1,7 +1,4 @@
en:
option:
positive: Yes
negative: No
navigation:
members: "Member list"
board: "Board"
@ -71,21 +68,21 @@ en:
notification_mailer:
payment_cta: "Pay now"
expiration_in_60d:
subject: "%{organization_short_name} - Yearly membership renewal"
subject: "ANSOL - Pagamento anual de quotas"
title: "Pagamento anual de quotas"
expiration_in_30d:
subject: "%{organization_short_name} - Your membership expires in 30 days"
subject: "ANSOL - Prazo para pagamento de quotas vence em 30 dias"
expired:
subject: "%{organization_short_name} - Membership payment pending"
subject: "ANSOL - Pagamento de quotas pendente"
expired_30d_ago:
subject: "%{organization_short_name} - Membership payment expired"
subject: "ANSOL - Pagamento de quotas em atraso"
expired_60d_ago:
subject: "%{organization_short_name} - Your membership is about to be suspended"
subject: "ANSOL - Suspensão de inscrição iminente"
first_payment_confirmation:
subject: "%{organization_short_name} - Payment received: Welcome!"
subject: "ANSOL - Payment received: Welcome!"
payment_renewal_confirmation:
subject: "%{organization_short_name} - Payment received"
subject: "ANSOL - Payment received"
registration:
subject: "%{organization_short_name} - Registration approved: Payment required"
subject: "ANSOL - Registration approved: Payment required"
cancelled:
subject: "%{organization_short_name} - Membership suspended"
greetings: "Dear %{display_name}"
subject: "ANSOL - Inscrição cancelada"

18
config/locales/pt.yml
View File

@ -105,23 +105,23 @@ pt:
notification_mailer:
payment_cta: "Pagar quotas"
expiration_in_60d:
subject: "%{organization_short_name} - Pagamento anual de quotas"
subject: "ANSOL - Pagamento anual de quotas"
expiration_in_30d:
subject: "%{organization_short_name} - Inscrição expira em 30 dias"
subject: "ANSOL - Inscrição expira em 30 dias"
expired:
subject: "%{organization_short_name} - Pagamento de quotas pendente"
subject: "ANSOL - Pagamento de quotas pendente"
expired_30d_ago:
subject: "%{organization_short_name} - Pagamento de quotas em atraso"
subject: "ANSOL - Pagamento de quotas em atraso"
expired_60d_ago:
subject: "%{organization_short_name} - Suspensão de inscrição iminente"
subject: "ANSOL - Suspensão de inscrição iminente"
first_payment_confirmation:
subject: "%{organization_short_name} - Pagamento recebido: Mensagem de boas vindas"
subject: "ANSOL - Pagamento recebido: Mensagem de boas vindas"
payment_renewal_confirmation:
subject: "%{organization_short_name} - Pagamento de quotas recebido"
subject: "ANSOL - Pagamento de quotas recebido"
registration:
subject: "%{organization_short_name} - Inscrição aprovada: Pagamento inicial de quotas"
subject: "ANSOL - Inscrição aprovada: Pagamento inicial de quotas"
cancelled:
subject: "%{organization_short_name} - Inscrição cancelada"
subject: "ANSOL - Inscrição cancelada"
greetings: "Car(a/o/e) %{display_name}"
sessions:
new:

BIN
public/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.1 KiB