Commit Graph

2747 Commits

Author SHA1 Message Date
Christian Cueni e903268753 Add resend payment confirmation action 2024-08-19 18:43:51 +02:00
Christian Cueni 9bd0af45a3 Merged in fix/competence-grade-view (pull request #375)
Fix non-display of grade
2024-08-19 14:45:15 +00:00
Christian Cueni b763587a25 Fix non-display of grade 2024-08-19 16:01:46 +02:00
Christian Cueni 96dfa8bd31 Merged in feature/vbv-676-berufsbildner-2 (pull request #365)
Feature/vbv 676 berufsbildner 2
2024-08-19 12:18:18 +00:00
Christian Cueni c55be997dc Fix profiles 2024-08-19 13:48:56 +02:00
Elia Bieri dbd0f84c5f Fix frontend tests 2024-08-14 14:28:36 +02:00
Elia Bieri bbc4e3da3f Fix python tests 2024-08-14 09:50:00 +02:00
Elia Bieri 0d4aa58990 Merged develop into feature/vbv-676-berufsbildner-2 2024-08-14 07:31:24 +00:00
Christian Cueni e225e5b70e Merged in fix/VBV-PROD-24N (pull request #374)
Fix error when chosen_profile_id == ""
2024-08-12 16:47:50 +00:00
Christian Cueni 225f787de5 Fix error when chosen_profile_id == "" 2024-08-12 17:44:38 +02:00
Christian Cueni 424b97f597 Merged in feature/payment-templates (pull request #373)
Use different templates for invoice and cc
2024-08-12 08:15:21 +00:00
Christian Cueni ac2f1f1714 Use different templates for invoice and cc 2024-08-12 08:19:10 +02:00
Christian Cueni 6978a2de91 Merge migrations 2024-08-10 13:37:15 +02:00
Christian Cueni 05c4d471d8 Fix typecheck 2024-08-10 13:30:15 +02:00
Christian Cueni aca066a376 Merge branch 'develop' into feature/vbv-676-berufsbildner-2
# Conflicts:
#	client/src/composables.ts
#	client/src/gql/gql.ts
#	client/src/gql/graphql.ts
#	client/src/graphql/queries.ts
#	client/src/pages/competence/CompetenceCertificateDetailPage.vue
#	client/src/pages/competence/CompetenceCertificateListPage.vue
#	client/src/pages/competence/CompetenceIndexPage.vue
#	client/src/types.ts
#	cypress/support/commands.js
#	server/vbv_lernwelt/shop/migrations/0016_alter_checkoutinformation_refno2.py
2024-08-09 18:01:25 +02:00
Christian Cueni 15f19f5756 Merged in feature/zulassungsprofil-VBV-666-2024-08-07 (pull request #372)
Feature/zulassungsprofil VBV-666 2024 08 07
2024-08-09 11:17:38 +00:00
Christian Cueni 785057fd96 Add merge migration 2024-08-08 07:21:53 +02:00
Ramon Wenger 5ff582ea32 Fix typo in creator method 2024-08-08 07:21:53 +02:00
Christian Cueni 7ad406eb45 Add missing translation 2024-08-08 07:21:53 +02:00
Christian Cueni 7d974cc358 Add another misspelled circle 2024-08-08 07:21:53 +02:00
Ramon Wenger 4f231955fe Format code 2024-08-08 07:21:53 +02:00
Ramon Wenger 71e4840c35 Add misspelled circle to migration 2024-08-08 07:21:53 +02:00
Ramon Wenger 1272037e73 Update migration to assign circles to profiles 2024-08-08 07:21:53 +02:00
Ramon Wenger 4d3ab9ce39 Display correct profile filter when none is chosen yet 2024-08-08 07:21:53 +02:00
Ramon Wenger c50b19d0d7 Fix unit tests 2024-08-08 07:21:53 +02:00
Ramon Wenger cea47b4f61 Update lint scripts 2024-08-08 07:21:53 +02:00
Ramon Wenger dff81c0a6b Display profile filter on mobile also 2024-08-08 07:21:53 +02:00
Ramon Wenger bf5482e39c Replace the course profile filter pills with a dropdown 2024-08-08 07:21:53 +02:00
Ramon Wenger 17b466ea29 Fix layout of topics when there is enough space 2024-08-08 07:21:52 +02:00
Ramon Wenger 537c614a57 Add bullet point to VV start page 2024-08-08 07:21:52 +02:00
Ramon Wenger 708e24785d Fix formatting 2024-08-08 07:21:52 +02:00
Ramon Wenger 1290703095 Make course profile filter more mobile friendly 2024-08-08 07:21:52 +02:00
Ramon Wenger b0909c52d3 Add ordering to course profiles 2024-08-08 07:21:52 +02:00
Ramon Wenger a1228f7753 Add another unit test 2024-08-08 07:21:52 +02:00
Ramon Wenger d0ef9bd5fd Add unit test for course profile update 2024-08-08 07:21:52 +02:00
Ramon Wenger f6e459fafe Add additional checks in cypress test 2024-08-08 07:21:52 +02:00
Ramon Wenger dc689bd20a Fix linting issue in client code 2024-08-08 07:21:51 +02:00
Ramon Wenger 488dc0843f Fix linting issue in python code 2024-08-08 07:21:51 +02:00
Ramon Wenger 10cd228d56 Refactor code and add filtering to circle progress displays 2024-08-08 07:21:51 +02:00
Ramon Wenger b780061641 Fix filter bug when "all" course profile is selected 2024-08-08 07:21:51 +02:00
Ramon Wenger a8ac9c2a0a Remove debug info 2024-08-08 07:21:51 +02:00
Ramon Wenger d75fb9e836 Remove print statement 2024-08-08 07:21:51 +02:00
Ramon Wenger 6a0f2239af Change Circles.profiles to be a ParentalManyToManyField 2024-08-08 07:21:51 +02:00
Daniel Egger 418eba5623 Fix unit tests 2024-08-08 07:21:51 +02:00
Daniel Egger 0c5e48aa30 Fix cypress tests 2024-08-08 07:21:51 +02:00
Daniel Egger dacda2e19a Use order_id as refno 2024-08-08 07:21:51 +02:00
Daniel Egger 507c1a63f7 Format code, fix lint errors 2024-08-08 07:21:51 +02:00
Ramon Wenger 794c18fb41 Pass chosen_profile through checkout step to end up in CourseProfile 2024-08-08 07:21:50 +02:00
Ramon Wenger cf5aa64a24 Update wizard to show the correct step number 2024-08-08 07:21:50 +02:00
Ramon Wenger ca4ba26005 Add Course Profile selection step to checkout flow 2024-08-08 07:21:50 +02:00