Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
aoz-003
Commits
fabb99c3
Commit
fabb99c3
authored
Aug 25, 2017
by
Chrysanthi Lagodimou
Browse files
add bank account
parent
66b16729
Changes
8
Hide whitespace changes
Inline
Side-by-side
app/controllers/volunteers_controller.rb
View file @
fabb99c3
...
...
@@ -78,6 +78,6 @@ class VolunteersController < ApplicationController
end
def
volunteer_params
params
.
require
(
:volunteer
).
permit
(
volunteer_attributes
)
params
.
require
(
:volunteer
).
permit
(
volunteer_attributes
,
:bank
,
:iban
,
:waive
)
end
end
app/views/volunteers/_form.html.slim
View file @
fabb99c3
...
...
@@ -94,6 +94,16 @@ h3= t_attr(:single_accompaniment, Volunteer)
.col-xs-12
=
f
.
input
:zurich
-
if
current_user
.
present?
.row
.col-xs-12.col-md-6
=
f
.
input
:bank
.col-xs-12.col-md-6
=
f
.
input
:iban
.row
.col-xs-12
=
f
.
input
:waive
.row
.col-xs-12
=
f
.
input
:expectations
...
...
app/views/volunteers/show.html.slim
View file @
fabb99c3
...
...
@@ -97,6 +97,12 @@ h3= t('personal_background')
td
dl
.dl-horizontal
dt
=
t
(
@volunteer
.
zurich
)
tr
td
=
t_attr
(
:bank_details
)
td
=
"
#{
@volunteer
.
bank
}
#{
@volunteer
.
iban
}
"
tr
td
=
t_attr
(
:waive
)
td
=
t
(
@volunteer
.
waive
)
h3
=
t_attr
(
:single_accompaniment
)
.table-responsive
...
...
config/locales/de.yml
View file @
fabb99c3
...
...
@@ -103,7 +103,9 @@ de:
additional_nationality
:
Zusätzliche Nationalität
additional_phone_numbers
:
Zusätzliche Telefonnummern
assignment_count
:
Anzahl begleitungen
bank
:
Name der Bank
bank_account
:
Kontodaten eingetragen
bank_details
:
Name der Bank / IBAN
children
:
Kinder
cooking
:
Kochen
creative
:
Kreativ
...
...
@@ -120,6 +122,7 @@ de:
german_course
:
Deutsch-Kurs
group_accompaniment
:
Gruppenangebote in AOZ-Einrichtungen
health
:
Gesundheit
iban
:
IBAN
interests
:
Interessen
intro_course
:
Einführungskurs besucht
kid
:
Kinder
...
...
@@ -141,6 +144,7 @@ de:
unaccompanied
:
Unbegleitete Minderjährige
volunteer_availability
:
Wann sind Sie für einen Freiwilligeneinsatz verfügbar?
volunteer_experience_desc
:
Falls sie bereits Erfahrungen mit Freiwilligenarbeit haben, bitte diese genauer erläutern.
waive
:
Ich verzichte auf die Auszahlung von Spesen.
woman
:
Frau
women
:
Frauen
working_percent
:
Stellenprozent
...
...
config/locales/en.yml
View file @
fabb99c3
...
...
@@ -34,6 +34,7 @@ en:
additional_phone_numbers
:
Additional phone numbers
address
:
Address
bank_account
:
Bank account details entered
bank_details
:
Bank / IBAN
children
:
Children
cooking
:
Cooking
creative
:
Creative
...
...
@@ -46,6 +47,7 @@ en:
full_name
:
Name
german_course
:
German course
health
:
Health
iban
:
IBAN
intro_course
:
Introductory course
kid
:
Kid
man
:
Man
...
...
@@ -62,6 +64,7 @@ en:
trial_period
:
Trial period report
unaccompanied
:
Unaccompanied minors
volunteer_experience_desc
:
If you have any experiences with voluntary work, please describe here.
waive
:
I waived the compensation of my expenses.
woman
:
Woman
women
:
Women
working_percent
:
Employment rate (in Percent)
...
...
db/migrate/20170824123715_add_bank_account_to_volunteer.rb
0 → 100644
View file @
fabb99c3
class
AddBankAccountToVolunteer
<
ActiveRecord
::
Migration
[
5.1
]
def
change
add_column
:volunteers
,
:bank
,
:string
add_column
:volunteers
,
:iban
,
:string
add_column
:volunteers
,
:waive
,
:boolean
,
default:
false
end
end
db/schema.rb
View file @
fabb99c3
...
...
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
201708
11095622
)
do
ActiveRecord
::
Schema
.
define
(
version:
201708
24123715
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
@@ -270,6 +270,9 @@ ActiveRecord::Schema.define(version: 20170811095622) do
t
.
boolean
"workday"
,
default:
false
t
.
boolean
"weekend"
,
default:
false
t
.
text
"detailed_description"
t
.
string
"bank"
t
.
string
"iban"
t
.
boolean
"waive"
,
default:
false
t
.
index
[
"deleted_at"
],
name:
"index_volunteers_on_deleted_at"
t
.
index
[
"user_id"
],
name:
"index_volunteers_on_user_id"
end
...
...
test/system/volunteers_test.rb
View file @
fabb99c3
...
...
@@ -37,6 +37,9 @@ class VolunteersTest < ApplicationSystemTestCase
page
.
check
(
'volunteer_other_offer'
)
fill_in
'Description'
,
with:
'Description'
page
.
check
(
'volunteer_zurich'
)
fill_in
'Bank'
,
with:
'BankName'
fill_in
'IBAN'
,
with:
'CH01 2345 6789 0123 4567 8'
page
.
check
(
'volunteer_waive'
)
page
.
check
(
'volunteer_weekend'
)
fill_in
'Detailed Description'
,
with:
'I am every two weeks available on tuesdays asdfasdf.'
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment