Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Paweljong
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Teckids
Projekt Hack-n-Fun
AlekSIS-App-Paweljong
Commits
1808e19c
Commit
1808e19c
authored
2 months ago
by
Hangzhi Yu
Browse files
Options
Downloads
Patches
Plain Diff
Fix registration detail view for registrations without invoices
parent
11354c27
No related branches found
No related tags found
1 merge request
!78
Resolve "Rewrite registration wizard"
Pipeline
#195984
passed
2 months ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/paweljong/templates/paweljong/event_registration/full.html
+2
-0
2 additions, 0 deletions
...aweljong/templates/paweljong/event_registration/full.html
aleksis/apps/paweljong/views.py
+3
-2
3 additions, 2 deletions
aleksis/apps/paweljong/views.py
with
5 additions
and
2 deletions
aleksis/apps/paweljong/templates/paweljong/event_registration/full.html
+
2
−
0
View file @
1808e19c
...
@@ -238,6 +238,7 @@
...
@@ -238,6 +238,7 @@
</div>
</div>
</div>
</div>
{% if invoice %}
<h5>
{% trans "Invoice details" %}
</h5>
<h5>
{% trans "Invoice details" %}
</h5>
<div
class=
"col s12 m8"
>
<div
class=
"col s12 m8"
>
<div
class=
"row"
>
<div
class=
"row"
>
...
@@ -318,6 +319,7 @@
...
@@ -318,6 +319,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
{% endif %}
{% if registration.person.guardians.all %}
{% if registration.person.guardians.all %}
<h5>
{% trans "Guardians / Parents "%}
</h5>
<h5>
{% trans "Guardians / Parents "%}
</h5>
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/paweljong/views.py
+
3
−
2
View file @
1808e19c
...
@@ -219,8 +219,9 @@ class EventRegistrationDetailView(PermissionRequiredMixin, DetailView):
...
@@ -219,8 +219,9 @@ class EventRegistrationDetailView(PermissionRequiredMixin, DetailView):
def
get_context_data
(
self
,
*
args
,
**
kwargs
):
def
get_context_data
(
self
,
*
args
,
**
kwargs
):
context
=
super
().
get_context_data
(
*
args
,
**
kwargs
)
context
=
super
().
get_context_data
(
*
args
,
**
kwargs
)
invoice
=
self
.
get_object
().
get_invoice
()
if
self
.
get_object
().
event
.
max_cost
is
None
or
self
.
get_object
().
event
.
max_cost
>
0
:
context
[
"
invoice
"
]
=
invoice
invoice
=
self
.
get_object
().
get_invoice
()
context
[
"
invoice
"
]
=
invoice
return
context
return
context
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment