Commit 134a3963 authored by Kaspar Vollenweider's avatar Kaspar Vollenweider

Merge branch 'changes/accountnumbers' into 'develop'

Changed account numbers

See merge request !949
parents c6506f50 8e301217
Pipeline #46606 passed with stage
in 38 minutes and 36 seconds
......@@ -18,6 +18,7 @@ variables:
DATABASE_URL: "postgresql://postgres:postgres@localhost:5432/$POSTGRES_DB"
before_script:
- google-chrome --version
- node --version
- ruby --version
- yarn --version
......@@ -34,6 +35,9 @@ test:
system:
stage: test
script:
- CHROME_VERSION=$(google-chrome --version | sed -r 's/[^0-9]+([0-9]+\.[0-9]+\.[0-9]+).*/\1/g')
- CHROMEDRIVER_VERSION=$(curl -s https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_VERSION)
- bundle exec chromedriver-update $CHROMEDRIVER_VERSION
- bundle exec rails test:system
artifacts:
paths:
......
......@@ -14,12 +14,12 @@
.col-xs-4
= t('billing_expense_pdf.cost_center')
.col-xs-8
= '4182'
= '3120000'
.row
.col-xs-4
= t('billing_expense_pdf.account')
.col-xs-8
= '4621'
= '317000153'
.row
br=
.row
......@@ -88,12 +88,12 @@
p
= t('billing_expense_pdf.account')
br
'4621
'317000153
td
p
= t('billing_expense_pdf.kst')
br
'4182
'3120000
td
p
= t('billing_expense_pdf.amount')
......
......@@ -293,7 +293,7 @@ ActiveRecord::Schema.define(version: 20190314100216) do
end
create_table "events", force: :cascade do |t|
t.integer "kind", null: false
t.integer "kind"
t.date "date"
t.time "start_time"
t.time "end_time"
......
......@@ -177,8 +177,8 @@ def development_seed
generate_feedback_and_hours(assignment, start_date, end_date + 3.days)
end
end
puts_model_counts('After Assignment created', User, Volunteer, Feedback, Hour, Assignment, Client,
TrialFeedback)
#puts_model_counts('After Assignment created', User, Volunteer, Feedback, Hour, Assignment, Client,
# TrialFeedback)
Array.new(2)
.map { FactoryBot.create(:group_offer, department: Department.all.sample) }
......@@ -204,8 +204,8 @@ def development_seed
period_end: FFaker::Time.between(1.week.ago, 3.days.ago))
generate_feedback_and_hours(group_assignment.group_offer, start_date, volunteer: volunteers.fourth)
end
puts_model_counts('After GroupAssignment created', User, Volunteer, Feedback, Hour, GroupOffer,
GroupAssignment, Department, Assignment, Client)
# puts_model_counts('After GroupAssignment created', User, Volunteer, Feedback, Hour, GroupOffer,
# GroupAssignment, Department, Assignment, Client)
# create ClientNotifications
if ClientNotification.count < 1
......@@ -226,10 +226,10 @@ def development_seed
volunteer.user.update(last_sign_in_at: 2.weeks.ago, password: 'asdfasdf')
end
puts_model_counts('Total Summup', GroupAssignmentLog, LanguageSkill, ReminderMailingVolunteer,
Assignment, Contact, GroupOffer, PerformanceReport, User, BillingExpense, Department,
GroupOfferCategory, Profile, Volunteer, Certificate, EmailTemplate, Hour, Relative, Client,
Feedback, Import, ClientNotification, GroupAssignment, Journal, ReminderMailing)
# puts_model_counts('Total Summup', GroupAssignmentLog, LanguageSkill, ReminderMailingVolunteer,
# Assignment, Contact, GroupOffer, PerformanceReport, User, BillingExpense, Department,
# GroupOfferCategory, Profile, Volunteer, Certificate, EmailTemplate, Hour, Relative, Client,
# Feedback, Import, ClientNotification, GroupAssignment, Journal, ReminderMailing)
end
DEFAULT_TEMPLATES_EMAIL_TEMPLATES = [
......
......@@ -182,8 +182,8 @@ class BillingExpensesTest < ApplicationSystemTestCase
click_link 'Anzeigen'
assert_text "Spesenauszahlung an #{@volunteer1}"
assert_text 'Kostenstelle 4182'
assert_text 'Konto 4621'
assert_text 'Kostenstelle 3120000'
assert_text 'Konto 317000153'
assert_text 'zu überweisender Betrag Fr. 50.00'
assert_text "Nachname #{@volunteer1.contact.last_name}"
assert_text "Vorname #{@volunteer1.contact.first_name}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment