'
@@ -618,6 +630,7 @@ Vue.component('pretix-button', {
+ '
'
@@ -733,6 +746,9 @@ var shared_root_computed = {
}
}
return has_priced || cnt_items > 1;
+ },
+ widget_data_json: function () {
+ return JSON.stringify(this.widget_data);
}
};
@@ -757,6 +773,23 @@ var create_overlay = function (app) {
app.$root.overlay = framechild;
};
+function get_ga_client_id(tracking_id) {
+ if (typeof ga === "undefined") {
+ return null;
+ }
+ try {
+ var trackers = ga.getAll();
+ var i, len;
+ for (i = 0, len = trackers.length; i < len; i += 1) {
+ if (trackers[i].get('trackingId') === tracking_id) {
+ return trackers[i].get('clientId');
+ }
+ }
+ } catch (e) {
+ }
+ return null;
+}
+
var create_widget = function (element) {
var event_url = element.attributes.event.value;
if (!event_url.match(/\/$/)) {
@@ -766,6 +799,13 @@ var create_widget = function (element) {
var subevent = element.attributes.subevent ? element.attributes.subevent.value : null;
var skip_ssl = element.attributes["skip-ssl-check"] ? true : false;
var disable_vouchers = element.attributes["disable-vouchers"] ? true : false;
+ var widget_data = JSON.parse(JSON.stringify(window.PretixWidget.widget_data));
+ for (var i = 0; i < element.attributes.length; i++) {
+ var attrib = element.attributes[i];
+ if (attrib.name.match(/^data-.*$/)) {
+ widget_data[attrib.name.replace(/^data-/, '')] = attrib.value;
+ }
+ }
if (element.tagName !== "pretix-widget") {
element.innerHTML = "
";
@@ -786,6 +826,7 @@ var create_widget = function (element) {
skip_ssl: skip_ssl,
error: null,
display_add_to_cart: false,
+ widget_data: widget_data,
loading: 1,
widget_id: 'pretix-widget-' + widget_id,
vouchers_exist: false,
@@ -815,6 +856,13 @@ var create_button = function (element) {
var raw_items = element.attributes.items ? element.attributes.items.value : "";
var skip_ssl = element.attributes["skip-ssl-check"] ? true : false;
var button_text = element.innerHTML;
+ var widget_data = JSON.parse(JSON.stringify(window.PretixWidget.widget_data));
+ for (var i = 0; i < element.attributes.length; i++) {
+ var attrib = element.attributes[i];
+ if (attrib.name.match(/^data-.*$/)) {
+ widget_data[attrib.name.replace(/^data-/, '')] = attrib.value;
+ }
+ }
if (element.tagName !== "pretix-button") {
element.innerHTML = "
" + element.innerHTML + "";
@@ -840,6 +888,7 @@ var create_button = function (element) {
voucher_code: voucher,
items: items,
error: null,
+ widget_data: widget_data,
widget_id: 'pretix-widget-' + widget_id,
button_text: button_text
}
@@ -856,27 +905,35 @@ var create_button = function (element) {
/* Find all widgets on the page and render them */
widgetlist = [];
buttonlist = [];
-document.createElement("pretix-widget");
-document.createElement("pretix-button");
-docReady(function () {
- var widgets = document.querySelectorAll("pretix-widget, div.pretix-widget-compat");
- var wlength = widgets.length;
- for (var i = 0; i < wlength; i++) {
- var widget = widgets[i];
- widgetlist.push(create_widget(widget));
- }
+window.PretixWidget.buildWidgets = function () {
+ document.createElement("pretix-widget");
+ document.createElement("pretix-button");
+ docReady(function () {
+ var widgets = document.querySelectorAll("pretix-widget, div.pretix-widget-compat");
+ var wlength = widgets.length;
+ for (var i = 0; i < wlength; i++) {
+ var widget = widgets[i];
+ widgetlist.push(create_widget(widget));
+ }
- var buttons = document.querySelectorAll("pretix-button, div.pretix-button-compat");
- var blength = buttons.length;
- for (var i = 0; i < blength; i++) {
- var button = buttons[i];
- buttonlist.push(create_button(button));
- }
-});
+ var buttons = document.querySelectorAll("pretix-button, div.pretix-button-compat");
+ var blength = buttons.length;
+ for (var i = 0; i < blength; i++) {
+ var button = buttons[i];
+ buttonlist.push(create_button(button));
+ }
+ });
+};
+if (typeof window.pretixWidgetCallback !== "undefined") {
+ window.pretixWidgetCallback();
+}
+if (window.PretixWidget.build_widgets) {
+ window.PretixWidget.buildWidgets();
+}
/* Set a global variable for debugging. In DEBUG mode, siteglobals will be window, otherwise it will be something
unnamed. */
-siteglobals.pretixwidget = {
+siteglobals.pretixwidget_debug = {
'Vue': Vue,
'widgets': widgetlist,
'buttons': buttonlist
diff --git a/src/tests/presale/test_cart.py b/src/tests/presale/test_cart.py
index f5ea46bdc..44ba27a5e 100644
--- a/src/tests/presale/test_cart.py
+++ b/src/tests/presale/test_cart.py
@@ -1,4 +1,5 @@
import datetime
+import json
from datetime import timedelta
from decimal import Decimal
@@ -107,6 +108,91 @@ class CartTest(CartTestMixin, TestCase):
self.assertIsNone(objs[0].variation)
self.assertEqual(objs[0].price, 23)
+ def test_widget_data_post(self):
+ self.event.settings.attendee_names_asked = True
+ self.event.settings.attendee_emails_asked = True
+ q = self.event.questions.create(
+ event=self.event, question='What is your shoe size?', type=Question.TYPE_NUMBER,
+ required=True
+ )
+ q.items.add(self.ticket)
+ response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+ 'item_%d' % self.ticket.id: '1',
+ 'widget_data': json.dumps({
+ 'attendee-name-full-name': 'John Doe',
+ 'email': 'foo@example.com',
+ 'question-' + q.identifier: '43'
+ })
+ }, follow=True)
+ self.assertRedirects(response, '/%s/%s/?require_cookie=true' % (self.orga.slug, self.event.slug),
+ target_status_code=200)
+ objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
+ self.assertEqual(len(objs), 1)
+ self.assertEqual(objs[0].item, self.ticket)
+ self.assertIsNone(objs[0].variation)
+ self.assertEqual(objs[0].price, 23)
+ self.assertEqual(objs[0].attendee_email, "foo@example.com")
+ self.assertEqual(objs[0].attendee_name, "John Doe")
+ a = objs[0].answers.first()
+ self.assertEqual(a.answer, "43")
+ self.assertEqual(a.question, q)
+
+ def test_widget_data_ignored_unknown_or_unasked(self):
+ self.event.settings.attendee_names_asked = False
+ self.event.settings.attendee_emails_asked = False
+ q = self.event.questions.create(
+ event=self.event, question='What is your shoe size?', type=Question.TYPE_NUMBER,
+ required=True
+ )
+ q.items.add(self.ticket)
+ response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+ 'item_%d' % self.ticket.id: '1',
+ 'widget_data': json.dumps({
+ 'attendee-name-full-name': 'John Doe',
+ 'email': 'foo@example.com',
+ 'question-' + q.identifier: 'bla'
+ })
+ }, follow=True)
+ self.assertRedirects(response, '/%s/%s/?require_cookie=true' % (self.orga.slug, self.event.slug),
+ target_status_code=200)
+ objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
+ self.assertEqual(len(objs), 1)
+ self.assertEqual(objs[0].item, self.ticket)
+ self.assertIsNone(objs[0].variation)
+ self.assertEqual(objs[0].price, 23)
+ assert not objs[0].attendee_email
+ assert not objs[0].attendee_name
+ assert not objs[0].answers.exists()
+
+ def test_widget_data_session(self):
+ self.event.settings.attendee_names_asked = True
+ self.event.settings.attendee_emails_asked = True
+ q = self.event.questions.create(
+ event=self.event, question='What is your shoe size?', type=Question.TYPE_NUMBER,
+ required=True
+ )
+ q.items.add(self.ticket)
+ self._set_session('widget_data', {
+ 'attendee-name': 'John Doe',
+ 'email': 'foo@example.com',
+ 'question-' + q.identifier: '43'
+ })
+ response = self.client.post('/%s/%s/cart/add' % (self.orga.slug, self.event.slug), {
+ 'item_%d' % self.ticket.id: '1',
+ }, follow=True)
+ self.assertRedirects(response, '/%s/%s/?require_cookie=true' % (self.orga.slug, self.event.slug),
+ target_status_code=200)
+ objs = list(CartPosition.objects.filter(cart_id=self.session_key, event=self.event))
+ self.assertEqual(len(objs), 1)
+ self.assertEqual(objs[0].item, self.ticket)
+ self.assertIsNone(objs[0].variation)
+ self.assertEqual(objs[0].price, 23)
+ self.assertEqual(objs[0].attendee_email, "foo@example.com")
+ self.assertEqual(objs[0].attendee_name, "John Doe")
+ a = objs[0].answers.first()
+ self.assertEqual(a.answer, "43")
+ self.assertEqual(a.question, q)
+
def _set_session(self, key, value):
session = self.client.session
session['carts'][get_cart_session_key(self.client, self.event)][key] = value