return;
}
+ let signature = $("#jsign_signature");
+ let nativeData = signature.jSignature("getData", "native");
+ if (nativeData.length < 2) {
+ alert("You must sign to acknowledge your acceptance of the Code of Conduct.");
+ $("#register").one('click', register_click);
+ return;
+ }
+
var data = {
'attendee': {
'firstName': $("#firstName").val(),
@@ -351,7 +347,9 @@
One or more of the attendees in this order will still be minors at the start of {{ event }}. Please note that we require a parent or guardian to be present at registration to sign our consent form for all minor attendees. Any attendee under the age of 13 (by the start of the convention) must have a parent or guardian also register and accompany them during the event.
{% endif %}
-
This email is for your records only. You will not need the confirmation number to pick up your badge. In order to pick up your badge on-site, you will only need to bring your Government Issued Photo ID and Vaccine proof to the registration desk.
+
This email is for your records only. You will not need the confirmation number to pick up your badge. In order to pick up your badge on-site, you will only need to bring your Government Issued Photo ID to the registration desk.
diff --git a/registration/templates/registration/emails/registration-payment.txt b/registration/templates/registration/emails/registration-payment.txt
index 87018eb3..d79f6732 100644
--- a/registration/templates/registration/emails/registration-payment.txt
+++ b/registration/templates/registration/emails/registration-payment.txt
@@ -49,7 +49,7 @@ consent form for all minor attendees. Any attendee under the age of 13 (by the s
must have a parent or guardian also register and accompany them during the event.
{% endif %}
-This email is for your records only. You will not need the confirmation number to pick up your badge. In order to pick up your badge on-site, you will only need to bring your Government Issued Photo ID and Vaccine proof to the registration desk.
+This email is for your records only. You will not need the confirmation number to pick up your badge. In order to pick up your badge on-site, you will only need to bring your Government Issued Photo ID to the registration desk.
If you have any questions about your order, please contact us at {{ event.registrationEmail }}.
diff --git a/registration/templates/registration/master.html b/registration/templates/registration/master.html
index c65a5540..e5189a30 100644
--- a/registration/templates/registration/master.html
+++ b/registration/templates/registration/master.html
@@ -70,6 +70,7 @@
+
{% block javascript %}
{% endblock %}
diff --git a/registration/templates/registration/registration-form.html b/registration/templates/registration/registration-form.html
index 623768cf..574b4167 100644
--- a/registration/templates/registration/registration-form.html
+++ b/registration/templates/registration/registration-form.html
@@ -52,7 +52,7 @@
Pre-Register for {{ event }}!
Select your registration options and level.
-
+
@@ -60,7 +60,7 @@
Select your registration options and level.
-
+
-
-
-
-
-
-
+
+ {% include "templatetags/coc_sig.html" %}
@@ -422,6 +412,14 @@
}
let birthdate = parseDate(birthdate_str);
+ let signature = $("#jsign_signature");
+ let nativeData = signature.jSignature("getData", "native");
+ if (nativeData.length < 2) {
+ alert("You must sign to acknowledge your acceptance of the Code of Conduct.");
+ $("#register").one('click', register_click);
+ return;
+ }
+
{% if not event.allowOnlineMinorReg %}
let age = getAgeByEventStart(birthdate);
if (age < 18) {
@@ -449,6 +447,8 @@
'volDepts': $("#volunteer").val(),
'surveyOk': $("#survey").is(':checked'),
'asl': false,
+ 'signature_svg': signature.jSignature("getData", "svgbase64")[1],
+ 'signature_bitmap': signature.jSignature("getData", "image")[1]
},
'priceLevel': {'id': $(".selectLevel")[0].id.split('_')[1], 'options': getOptions()},
'event': '{{event}}'
diff --git a/registration/templates/registration/signature.html b/registration/templates/registration/signature.html
deleted file mode 100644
index 206145d5..00000000
--- a/registration/templates/registration/signature.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{% extends "registration/master_admin.html" %}
-{% load static %}
-
-{% block head %}
-
-{% endblock %}
-
-{% block content %}
-
-
-
-
', obj.signature_bitmap)
+
def get_age_range(self, obj):
try:
born = obj.attendee.birthdate
diff --git a/registration/migrations/0101_auto_20240630_0045.py b/registration/migrations/0101_auto_20240630_0045.py
new file mode 100644
index 00000000..ced95c25
--- /dev/null
+++ b/registration/migrations/0101_auto_20240630_0045.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.2.25 on 2024-06-30 04:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('registration', '0100_webhook_type'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='badge',
+ name='signature_bitmap',
+ field=models.TextField(blank=True, null=True),
+ ),
+ migrations.AlterField(
+ model_name='badge',
+ name='signature_svg',
+ field=models.TextField(blank=True, null=True),
+ ),
+ migrations.AlterField(
+ model_name='order',
+ name='status',
+ field=models.CharField(choices=[('Pending', 'Pending'), ('Captured', 'Captured'), ('Completed', 'Completed'), ('Refunded', 'Refunded'), ('Refund Pending', 'Refund Pending'), ('Failed', 'Failed'), ('Dispute Evidence Required', 'Dispute Evidence Required'), ('Dispute Processing', 'Dispute Processing'), ('Dispute Won', 'Dispute Won'), ('Dispute Lost', 'Dispute Lost'), ('Dispute Accepted', 'Dispute Accepted')], default='Pending', max_length=50),
+ ),
+ ]
diff --git a/registration/models.py b/registration/models.py
index 8172192e..27341258 100644
--- a/registration/models.py
+++ b/registration/models.py
@@ -428,12 +428,8 @@ class Badge(models.Model):
badgeNumber = models.IntegerField(null=True, blank=True)
printed = models.BooleanField(default=False)
printCount = models.IntegerField(default=0)
- signature_svg = models.FileField(
- upload_to=badge_signature_svg_path, null=True, blank=True
- )
- signature_bitmap = models.ImageField(
- upload_to=badge_signature_bitmap_path, null=True, blank=True
- )
+ signature_svg = models.TextField(null=True, blank=True)
+ signature_bitmap = models.TextField(null=True, blank=True)
def __str__(self):
if self.badgeNumber is not None or self.badgeNumber == "":
diff --git a/registration/static/js/jSignature.min.js b/registration/static/js/jSignature.min.js
new file mode 100644
index 00000000..93e1c5ce
--- /dev/null
+++ b/registration/static/js/jSignature.min.js
@@ -0,0 +1,83 @@
+;(function($){
+/*
+
+jSignature v2 "2018-11-06T13:56" "commit ID 89c22b348ab2e1d92a928d8fd992f175e8bc5cbd"
+Copyright (c) 2012 Willow Systems Corp http://willow-systems.com
+Copyright (c) 2010 Brinley Ang http://www.unbolt.net
+MIT License