Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug Fix for Admission Confirmation email and Booking Payment Status #562

Merged
merged 3 commits into from
Mar 14, 2019
Merged

Bug Fix for Admission Confirmation email and Booking Payment Status #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b1ade5
Bug Fix for Admission Confirmation email and Booking Payment Status
Mar 14, 2019
71edc44
Fix empty/none Mobile check on booking screen causing error
Mar 14, 2019
64fae5b
Fix phone number else statement.
Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mooring/emails.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ def send_booking_confirmation(booking,request,context_processor):
subject = "Your mooring booking and admissions confirmation"
att2 = BytesIO()
admissionsBooking = AdmissionsBooking.objects.get(id=booking.admission_payment.id)
pdf.create_admissions_confirmation(att2, admissionsBooking)
pdf.create_admissions_confirmation(att2, admissionsBooking, context_processor)
att2.seek(0)
filename = 'confirmation-AD{}.pdf'.format(admissionsBooking.id)
sendHtmlEmail([email],subject,context,template,cc,bcc,from_email,template_group,attachments=[('confirmation-PS{}.pdf'.format(booking.id), att.read(), 'application/pdf'), (filename, att2.read(), 'application/pdf')])
Expand Down
6 changes: 1 addition & 5 deletions mooring/templates/mooring/booking/booking_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,7 @@ <h3 class="text-primary">{{ booking.mooringarea.name }}, {{ booking.mooringarea.
<b>Payment status:</b>
</div>
<div class="col-sm-8">
{% if booking.status == 'Over Paid' %}
Paid
{% else %}
{{ booking.status }}
{% endif %}
{{ booking.invoice_status }}
</div>
</div><div class="row"><div class="col-sm-12" style="margin-top: 1em">
{% if booking.status == 'Paid' or booking.status == 'Over Paid' %}
Expand Down
7 changes: 5 additions & 2 deletions mooring/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,8 +727,11 @@ def get(self, request, *args, **kwargs):
else:
form_context['first_name'] = request.user.first_name
form_context['last_name'] = request.user.last_name
if len(request.user.mobile_number) > 1:
form_context['phone'] = request.user.mobile_number
if request.user.mobile_number:
if len(request.user.mobile_number) > 1:
form_context['phone'] = request.user.mobile_number
else:
form_context['phone'] = request.user.phone_number
else:
form_context['phone'] = request.user.phone_number
if Address.objects.filter(user=request.user).count() > 0:
Expand Down