diff --git a/.gitattributes b/.gitattributes index 3fdddca17..722188fee 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,6 +5,7 @@ src/static/moment/* linguist-vendored src/static/datetimepicker/* linguist-vendored src/static/colorpicker/* linguist-vendored src/static/fileupload/* linguist-vendored +src/static/vuejs/* linguist-vendored src/static/charts/* linguist-vendored src/pretix/plugins/ticketoutputpdf/static/pretixplugins/ticketoutputpdf/fabric.* linguist-vendored src/pretix/plugins/ticketoutputpdf/static/pretixplugins/ticketoutputpdf/pdf.* linguist-vendored diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 4dbacf0b5..b91d099c7 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -427,6 +427,14 @@ Your {event} team""")) 'default': None, 'type': str }, + 'presale_widget_css_file': { + 'default': None, + 'type': str + }, + 'presale_widget_css_checksum': { + 'default': None, + 'type': str + }, 'logo_image': { 'default': None, 'type': File diff --git a/src/pretix/base/templatetags/rich_text.py b/src/pretix/base/templatetags/rich_text.py index 3eaadc3fc..b8d2b956e 100644 --- a/src/pretix/base/templatetags/rich_text.py +++ b/src/pretix/base/templatetags/rich_text.py @@ -4,6 +4,7 @@ import bleach import markdown from bleach import DEFAULT_CALLBACKS from django import template +from django.conf import settings from django.core import signing from django.urls import reverse from django.utils.http import is_safe_url @@ -63,6 +64,12 @@ def safelink_callback(attrs, new=False): return attrs +def abslink_callback(attrs, new=False): + attrs[None, 'href'] = urllib.parse.urljoin(settings.SITE_URL, attrs.get((None, 'href'), '/')) + attrs[None, 'target'] = '_blank' + return attrs + + @register.filter def rich_text(text: str, **kwargs): """ @@ -73,5 +80,5 @@ def rich_text(text: str, **kwargs): markdown.markdown(text), tags=ALLOWED_TAGS, attributes=ALLOWED_ATTRIBUTES, - ), callbacks=DEFAULT_CALLBACKS + [safelink_callback]) + ), callbacks=DEFAULT_CALLBACKS + ([safelink_callback] if kwargs.get('safelinks', True) else [abslink_callback])) return mark_safe(body_md) diff --git a/src/pretix/base/validators.py b/src/pretix/base/validators.py index da7d87380..0b7d8db3d 100644 --- a/src/pretix/base/validators.py +++ b/src/pretix/base/validators.py @@ -33,6 +33,7 @@ class EventSlugBlacklistValidator(BlacklistValidator): 'api', 'events', 'csp_report', + 'widget', ] @@ -53,4 +54,5 @@ class OrganizerSlugBlacklistValidator(BlacklistValidator): 'about', 'api', 'csp_report', + 'widget', ] diff --git a/src/pretix/base/views/async.py b/src/pretix/base/views/async.py index e9e32602d..03f327f98 100644 --- a/src/pretix/base/views/async.py +++ b/src/pretix/base/views/async.py @@ -51,6 +51,9 @@ class AsyncAction: return self.get_result(request) return self.http_method_not_allowed(request) + def _ajax_response_data(self): + return {} + def _return_ajax_result(self, res, timeout=.5): if not res.ready(): try: @@ -59,10 +62,11 @@ class AsyncAction: pass ready = res.ready() - data = { + data = self._ajax_response_data() + data.update({ 'async_id': res.id, 'ready': ready - } + }) if ready: if res.successful() and not isinstance(res.info, Exception): smes = self.get_success_message(res.info) diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index 0dc2712e7..a44a0642f 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -4,13 +4,13 @@ from django.core.exceptions import ValidationError from django.core.validators import RegexValidator from django.db.models import Q from django.utils.timezone import get_current_timezone_name -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import pgettext_lazy, ugettext_lazy as _ from i18nfield.forms import I18nFormField, I18nTextarea from pytz import common_timezones, timezone from pretix.base.forms import I18nModelForm, PlaceholderValidator, SettingsForm from pretix.base.models import Event, Organizer, TaxRule -from pretix.base.models.event import EventMetaValue +from pretix.base.models.event import EventMetaValue, SubEvent from pretix.base.reldate import RelativeDateField, RelativeDateTimeField from pretix.control.forms import ( ExtFileField, SlugWidget, SplitDateTimePickerWidget, @@ -897,3 +897,44 @@ class TaxRuleForm(I18nModelForm): class Meta: model = TaxRule fields = ['name', 'rate', 'price_includes_tax', 'eu_reverse_charge', 'home_country'] + + +class WidgetCodeForm(forms.Form): + subevent = forms.ModelChoiceField( + label=pgettext_lazy('subevent', "Date"), + required=True, + queryset=SubEvent.objects.none() + ) + language = forms.ChoiceField( + label=_("Language"), + required=True, + choices=settings.LANGUAGES + ) + voucher = forms.CharField( + label=_("Pre-selected voucher"), + required=False, + help_text=_("If set, the widget will show products as if this voucher has been entered and when a product is " + "bought via the widget, this voucher will be used. This can for example be used to provide " + "widgets that give discounts or unlock secret products.") + ) + + def __init__(self, *args, **kwargs): + self.event = kwargs.pop('event') + super().__init__(*args, **kwargs) + + if self.event.has_subevents: + self.fields['subevent'].queryset = self.event.subevents.all() + else: + del self.fields['subevent'] + + self.fields['language'].choices = [(l, n) for l, n in settings.LANGUAGES if l in self.event.settings.locales] + + def clean_voucher(self): + v = self.cleaned_data.get('voucher') + if not v: + return + + if not self.event.vouchers.filter(code=v).exists(): + raise ValidationError(_('The given voucher code does not exist.')) + + return v diff --git a/src/pretix/control/templates/pretixcontrol/event/settings_base.html b/src/pretix/control/templates/pretixcontrol/event/settings_base.html index 87017b1b5..fe622c35c 100644 --- a/src/pretix/control/templates/pretixcontrol/event/settings_base.html +++ b/src/pretix/control/templates/pretixcontrol/event/settings_base.html @@ -75,6 +75,11 @@ {% trans "Permissions" %} +
  • + + {% trans "Widget" %} + +
    • {% endif %} {% for nav in nav_event_settings %}
  • diff --git a/src/pretix/control/templates/pretixcontrol/event/widget.html b/src/pretix/control/templates/pretixcontrol/event/widget.html new file mode 100644 index 000000000..46de81164 --- /dev/null +++ b/src/pretix/control/templates/pretixcontrol/event/widget.html @@ -0,0 +1,63 @@ +{% extends "pretixcontrol/event/settings_base.html" %} +{% load i18n %} +{% load staticfiles %} +{% load bootstrap3 %} +{% load eventurl %} +{% block inside %} + {% trans "Widget" %} +

    + {% blocktrans trimmed %} + The pretix widget is a way to embed your ticket shop into your event website. This way, your visitors can + buy their ticket right away without leaving your website. + {% endblocktrans %} +

    + {% if valid %} +

    + {% blocktrans trimmed %} + To embed the widget onto your website, simply copy the following code to the <head> + section of your website: + {% endblocktrans %} +

    + 
    <link rel="stylesheet" type="text/css" href="{% abseventurl request.event "presale:event.widget.css" %}">
+<script type="text/javascript" src="{{ urlprefix }}{% url "presale:widget.js" lang=form.cleaned_data.language %}" async></script>
    +

    + {% blocktrans trimmed %} + Then, copy the following code to the place of your website where you want the widget to show up: + {% endblocktrans %} +

    + {% if form.cleaned_data.subevent %} + {% abseventurl request.event "presale:event.index" subevent=form.cleaned_data.subevent.pk as indexurl %} + {% else %} + {% abseventurl request.event "presale:event.index" as indexurl %} + {% endif %} + 
    <pretix-widget event="http://192.168.0.10:8000/democon/"{% if form.cleaned_data.subevent %} subevent="{{ form.cleaned_data.subevent.pk }}"{% endif %}{% if form.cleaned_data.voucher %} voucher="{{ form.cleaned_data.voucher }}"{% endif %}></pretix-widget>
+<noscript>
+   <div class="pretix-widget">
+        <div class="pretix-widget-info-message">
+            {% blocktrans trimmed with a_attr='target="_blank" href="'|add:indexurl|add:'"'|safe %}
+                JavaScript is disabled in your browser. To access our ticket shop without javascript,
+                please <a {{ a_attr }}>click here</a>.
+            {% endblocktrans %}
+        </div>
+    </div>
+</noscript>
+
    + {% else %} +

    + {% blocktrans trimmed %} + Using this form, you can generate a code to copy and paste to your website source. + {% endblocktrans %} +

    +
    + {% csrf_token %} + {% bootstrap_form form layout="control" %} +
    +
    + +
    +
    +
    + {% endif %} +{% endblock %} diff --git a/src/pretix/control/urls.py b/src/pretix/control/urls.py index 7e1e3cf60..56e9bf07d 100644 --- a/src/pretix/control/urls.py +++ b/src/pretix/control/urls.py @@ -75,6 +75,7 @@ urlpatterns = [ url(r'^settings/tax/(?P\d+)/$', event.TaxUpdate.as_view(), name='event.settings.tax.edit'), url(r'^settings/tax/add$', event.TaxCreate.as_view(), name='event.settings.tax.add'), url(r'^settings/tax/(?P\d+)/delete$', event.TaxDelete.as_view(), name='event.settings.tax.delete'), + url(r'^settings/widget$', event.WidgetSettings.as_view(), name='event.settings.widget'), url(r'^subevents/$', subevents.SubEventList.as_view(), name='event.subevents'), url(r'^subevents/(?P\d+)/$', subevents.SubEventUpdate.as_view(), name='event.subevent'), url(r'^subevents/(?P\d+)/delete$', subevents.SubEventDelete.as_view(), diff --git a/src/pretix/control/views/event.py b/src/pretix/control/views/event.py index 0ef0d6d72..12486708f 100644 --- a/src/pretix/control/views/event.py +++ b/src/pretix/control/views/event.py @@ -1,6 +1,7 @@ import re from collections import OrderedDict from datetime import timedelta +from urllib.parse import urlsplit from django.conf import settings from django.contrib import messages @@ -36,10 +37,12 @@ from pretix.control.forms.event import ( CommentForm, DisplaySettingsForm, EventMetaValueForm, EventSettingsForm, EventUpdateForm, InvoiceSettingsForm, MailSettingsForm, PaymentSettingsForm, ProviderForm, TaxRuleForm, TicketSettingsForm, + WidgetCodeForm, ) from pretix.control.permissions import EventPermissionRequiredMixin from pretix.control.signals import nav_event_settings from pretix.helpers.urls import build_absolute_uri +from pretix.multidomain.urlreverse import get_domain from pretix.presale.style import regenerate_css from . import CreateView, UpdateView @@ -989,3 +992,31 @@ class TaxDelete(EventSettingsViewMixin, EventPermissionRequiredMixin, DeleteView context = super().get_context_data(*args, **kwargs) context['possible'] = self.object.allow_delete() return context + + +class WidgetSettings(EventSettingsViewMixin, EventPermissionRequiredMixin, FormView): + template_name = 'pretixcontrol/event/widget.html' + permission = 'can_change_event_settings' + form_class = WidgetCodeForm + + def get_form_kwargs(self): + kwargs = super().get_form_kwargs() + kwargs['event'] = self.request.event + return kwargs + + def form_valid(self, form): + ctx = self.get_context_data() + ctx['form'] = form + ctx['valid'] = True + return self.render_to_response(ctx) + + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + ctx['urlprefix'] = settings.SITE_URL + domain = get_domain(self.request.organizer) + if domain: + siteurlsplit = urlsplit(settings.SITE_URL) + if siteurlsplit.port and siteurlsplit.port not in (80, 443): + domain = '%s:%d' % (domain, siteurlsplit.port) + ctx['urlprefix'] = '%s://%s' % (siteurlsplit.scheme, domain) + return ctx diff --git a/src/pretix/plugins/paypal/payment.py b/src/pretix/plugins/paypal/payment.py index a969433c0..ccfa97edd 100644 --- a/src/pretix/plugins/paypal/payment.py +++ b/src/pretix/plugins/paypal/payment.py @@ -1,10 +1,12 @@ import json import logging +import urllib.parse from collections import OrderedDict import paypalrestsdk from django import forms from django.contrib import messages +from django.core import signing from django.template.loader import get_template from django.utils.translation import ugettext as __, ugettext_lazy as _ @@ -89,14 +91,18 @@ class Paypal(BasePaymentProvider): def checkout_prepare(self, request, cart): self.init_api() + kwargs = {} + if request.resolver_match and 'cart_namespace' in request.resolver_match.kwargs: + kwargs['cart_namespace'] = request.resolver_match.kwargs['cart_namespace'] + payment = paypalrestsdk.Payment({ 'intent': 'sale', 'payer': { "payment_method": "paypal", }, "redirect_urls": { - "return_url": build_absolute_uri(request.event, 'plugins:paypal:return'), - "cancel_url": build_absolute_uri(request.event, 'plugins:paypal:abort'), + "return_url": build_absolute_uri(request.event, 'plugins:paypal:return', kwargs=kwargs), + "cancel_url": build_absolute_uri(request.event, 'plugins:paypal:abort', kwargs=kwargs), }, "transactions": [ { @@ -131,7 +137,14 @@ class Paypal(BasePaymentProvider): request.session['payment_paypal_id'] = payment.id for link in payment.links: if link.method == "REDIRECT" and link.rel == "approval_url": - return str(link.href) + if request.session.get('iframe_session', False): + signer = signing.Signer(salt='safe-redirect') + return ( + build_absolute_uri(request.event, 'plugins:paypal:redirect') + '?url=' + + urllib.parse.quote(signer.sign(link.href)) + ) + else: + return str(link.href) else: messages.error(request, _('We had trouble communicating with PayPal')) logger.error('Error on creating payment: ' + str(payment.error)) diff --git a/src/pretix/plugins/paypal/templates/pretixplugins/paypal/redirect.html b/src/pretix/plugins/paypal/templates/pretixplugins/paypal/redirect.html new file mode 100644 index 000000000..01c9d1ae9 --- /dev/null +++ b/src/pretix/plugins/paypal/templates/pretixplugins/paypal/redirect.html @@ -0,0 +1,32 @@ +{% load compress %} +{% load i18n %} +{% load staticfiles %} + + + + {{ settings.PRETIX_INSTANCE_NAME }} + {% compress css %} + + {% endcompress %} + {% compress js %} + + {% endcompress %} + + +
    +

    {% trans "The payment process has started in a new window." %}

    + +

    + {% trans "The window to enter your payment data was not opened or was closed?" %} +

    +

    + + {% trans "Click here in order to open the window." %} + +

    + +
    + + diff --git a/src/pretix/plugins/paypal/urls.py b/src/pretix/plugins/paypal/urls.py index 17b7ba841..e61960dea 100644 --- a/src/pretix/plugins/paypal/urls.py +++ b/src/pretix/plugins/paypal/urls.py @@ -2,12 +2,17 @@ from django.conf.urls import include, url from pretix.multidomain import event_url -from .views import abort, refund, success, webhook +from .views import abort, redirect_view, refund, success, webhook event_patterns = [ url(r'^paypal/', include([ url(r'^abort/$', abort, name='abort'), url(r'^return/$', success, name='return'), + url(r'^redirect/$', redirect_view, name='redirect'), + + url(r'w/(?P[a-zA-Z0-9]{16})/abort/', abort, name='abort'), + url(r'w/(?P[a-zA-Z0-9]{16})/return/', success, name='return'), + event_url(r'^webhook/$', webhook, name='webhook', require_live=False), ])), ] diff --git a/src/pretix/plugins/paypal/views.py b/src/pretix/plugins/paypal/views.py index e883bb6a8..6c94fe33c 100644 --- a/src/pretix/plugins/paypal/views.py +++ b/src/pretix/plugins/paypal/views.py @@ -3,11 +3,13 @@ import logging import paypalrestsdk from django.contrib import messages +from django.core import signing from django.db import transaction -from django.http import HttpResponse -from django.shortcuts import get_object_or_404, redirect +from django.http import HttpResponse, HttpResponseBadRequest +from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.translation import ugettext_lazy as _ +from django.views.decorators.clickjacking import xframe_options_exempt from django.views.decorators.csrf import csrf_exempt from django.views.decorators.http import require_POST @@ -17,12 +19,25 @@ from pretix.control.permissions import event_permission_required from pretix.multidomain.urlreverse import eventreverse from pretix.plugins.paypal.payment import Paypal from pretix.plugins.stripe.models import ReferencedStripeObject -from pretix.presale.utils import event_view logger = logging.getLogger('pretix.plugins.paypal') -@event_view(require_live=False) +@xframe_options_exempt +def redirect_view(request, *args, **kwargs): + signer = signing.Signer(salt='safe-redirect') + try: + url = signer.unsign(request.GET.get('url', '')) + except signing.BadSignature: + return HttpResponseBadRequest('Invalid parameter') + + r = render(request, 'pretixplugins/paypal/redirect.html', { + 'url': url, + }) + r._csp_ignore = True + return r + + def success(request, *args, **kwargs): pid = request.GET.get('paymentId') token = request.GET.get('token') @@ -30,6 +45,10 @@ def success(request, *args, **kwargs): request.session['payment_paypal_token'] = token request.session['payment_paypal_payer'] = payer + urlkwargs = {} + if 'cart_namespace' in kwargs: + urlkwargs['cart_namespace'] = kwargs['cart_namespace'] + if request.session.get('payment_paypal_order'): order = Order.objects.get(pk=request.session.get('payment_paypal_order')) else: @@ -44,7 +63,8 @@ def success(request, *args, **kwargs): else: messages.error(request, _('Invalid response from PayPal received.')) logger.error('Session did not contain payment_paypal_id') - return redirect(eventreverse(request.event, 'presale:event.checkout', kwargs={'step': 'payment'})) + urlkwargs['step'] = 'payment' + return redirect(eventreverse(request.event, 'presale:event.checkout', kwargs=urlkwargs)) if order: return redirect(eventreverse(request.event, 'presale:event.order', kwargs={ @@ -52,7 +72,8 @@ def success(request, *args, **kwargs): 'secret': order.secret }) + ('?paid=yes' if order.status == Order.STATUS_PAID else '')) else: - return redirect(eventreverse(request.event, 'presale:event.checkout', kwargs={'step': 'confirm'})) + urlkwargs['step'] = 'confirm' + return redirect(eventreverse(request.event, 'presale:event.checkout', kwargs=urlkwargs)) def abort(request, *args, **kwargs): diff --git a/src/pretix/plugins/stripe/views.py b/src/pretix/plugins/stripe/views.py index 27ba09104..ce95a6523 100644 --- a/src/pretix/plugins/stripe/views.py +++ b/src/pretix/plugins/stripe/views.py @@ -8,9 +8,11 @@ from django.db import transaction from django.http import Http404, HttpResponse from django.shortcuts import get_object_or_404, redirect from django.urls import reverse +from django.utils.decorators import method_decorator from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _ from django.views import View +from django.views.decorators.clickjacking import xframe_options_exempt from django.views.decorators.csrf import csrf_exempt from django.views.decorators.http import require_POST @@ -193,6 +195,7 @@ class StripeOrderView: return self.request.event.get_payment_providers()[self.order.payment_provider] +@method_decorator(xframe_options_exempt, 'dispatch') class ReturnView(StripeOrderView, View): def get(self, request, *args, **kwargs): prov = self.pprov diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py index 9822d3c24..a7451ec09 100644 --- a/src/pretix/presale/checkoutflow.py +++ b/src/pretix/presale/checkoutflow.py @@ -70,20 +70,26 @@ class BaseCheckoutFlowStep: def post(self, request): return HttpResponseNotAllowed([]) - def get_step_url(self): - return eventreverse(self.event, 'presale:event.checkout', kwargs={'step': self.identifier}) + def get_step_url(self, request): + kwargs = {'step': self.identifier} + if request.resolver_match and 'cart_namespace' in request.resolver_match.kwargs: + kwargs['cart_namespace'] = request.resolver_match.kwargs['cart_namespace'] + return eventreverse(self.event, 'presale:event.checkout', kwargs=kwargs) def get_prev_url(self, request): prev = self.get_prev_applicable(request) if not prev: - return eventreverse(self.event, 'presale:event.index') + kwargs = {} + if request.resolver_match and 'cart_namespace' in request.resolver_match.kwargs: + kwargs['cart_namespace'] = request.resolver_match.kwargs['cart_namespace'] + return eventreverse(self.request.event, 'presale:event.index', kwargs=kwargs) else: - return prev.get_step_url() + return prev.get_step_url(request) def get_next_url(self, request): n = self.get_next_applicable(request) if n: - return n.get_step_url() + return n.get_step_url(request) @cached_property def cart_session(self): @@ -225,6 +231,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep): def get_context_data(self, **kwargs): ctx = super().get_context_data(**kwargs) ctx['forms'] = self.forms + ctx['cart'] = self.get_cart() return ctx def get_success_message(self, value): @@ -234,7 +241,7 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep): return self.get_next_url(self.request) def get_error_url(self): - return self.get_step_url() + return self.get_step_url(self.request) def get(self, request): self.request = request @@ -382,6 +389,7 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep): ctx['contact_form'] = self.contact_form ctx['invoice_form'] = self.invoice_form ctx['reverse_charge_relevant'] = self.eu_reverse_charge_relevant + ctx['cart'] = self.get_cart() return ctx @@ -436,6 +444,7 @@ class PaymentStep(QuestionsViewMixin, CartMixin, TemplateFlowStep): ctx['selected'] = self.request.POST.get('payment', self.cart_session.get('payment', '')) if len(self.provider_forms) == 1: ctx['selected'] = self.provider_forms[0]['provider'].identifier + ctx['cart'] = self.get_cart() return ctx @cached_property @@ -557,7 +566,7 @@ class ConfirmStep(CartMixin, AsyncAction, TemplateFlowStep): return super().get_error_message(exception) def get_error_url(self): - return self.get_step_url() + return self.get_step_url(self.request) def get_order_url(self, order): return eventreverse(self.request.event, 'presale:event.order.pay.complete', kwargs={ diff --git a/src/pretix/presale/context.py b/src/pretix/presale/context.py index 9b13413e3..6bdd7ba3d 100644 --- a/src/pretix/presale/context.py +++ b/src/pretix/presale/context.py @@ -56,6 +56,9 @@ def contextprocessor(request): ctx['event'] = request.event ctx['languages'] = [get_language_info(code) for code in request.event.settings.locales] + if request.resolver_match: + ctx['cart_namespace'] = request.resolver_match.kwargs.get('cart_namespace', '') + if hasattr(request, 'organizer'): if request.organizer.settings.presale_css_file and not hasattr(request, 'event'): ctx['css_file'] = default_storage.url(request.organizer.settings.presale_css_file) diff --git a/src/pretix/presale/management/commands/updatestyles.py b/src/pretix/presale/management/commands/updatestyles.py index 9a481bfe1..4f2f2c596 100644 --- a/src/pretix/presale/management/commands/updatestyles.py +++ b/src/pretix/presale/management/commands/updatestyles.py @@ -1,15 +1,38 @@ +import hashlib + +from django.conf import settings +from django.core.files.base import ContentFile +from django.core.files.storage import default_storage from django.core.management.base import BaseCommand from pretix.base.models import Event_SettingsStore, Organizer_SettingsStore +from pretix.base.settings import GlobalSettingsObject +from pretix.presale.views.widget import generate_widget_js from ...style import regenerate_css, regenerate_organizer_css class Command(BaseCommand): - help = "Re-generate all custom stylesheets" + help = "Re-generate all custom stylesheets and scripts" def handle(self, *args, **options): for es in Event_SettingsStore.objects.filter(key="presale_css_file"): regenerate_css.apply_async(args=(es.object_id,)) + for es in Organizer_SettingsStore.objects.filter(key="presale_css_file"): regenerate_organizer_css.apply_async(args=(es.object_id,)) + + gs = GlobalSettingsObject() + for lc, ll in settings.LANGUAGES: + data = generate_widget_js(lc).encode() + checksum = hashlib.sha1(data).hexdigest() + fname = gs.settings.get('widget_file_{}'.format(lc)) + if not fname or gs.settings.get('widget_checksum_{}'.format(lc), '') != checksum: + newname = default_storage.save( + 'widget/widget.{}.{}.js'.format(lc, checksum), + ContentFile(data) + ) + gs.settings.set('widget_file_{}'.format(lc), 'file://' + newname) + gs.settings.set('widget_checksum_{}'.format(lc), checksum) + if fname: + default_storage.delete(fname) diff --git a/src/pretix/presale/style.py b/src/pretix/presale/style.py index 893f1245a..b8c655633 100644 --- a/src/pretix/presale/style.py +++ b/src/pretix/presale/style.py @@ -20,7 +20,7 @@ logger = logging.getLogger('pretix.presale.style') affected_keys = ['primary_font', 'primary_color'] -def compile_scss(object): +def compile_scss(object, file="main.scss", fonts=True): sassdir = os.path.join(settings.STATIC_ROOT, 'pretixpresale/scss') def static(path): @@ -41,14 +41,14 @@ def compile_scss(object): sassrules.append('$brand-primary: {};'.format(object.settings.get('primary_color'))) font = object.settings.get('primary_font') - if font != 'Open Sans': + if font != 'Open Sans' and fonts: sassrules.append(get_font_stylesheet(font)) sassrules.append( '$font-family-sans-serif: "{}", "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif !default'.format( font )) - sassrules.append('@import "main.scss";') + sassrules.append('@import "{}";'.format(file)) cf = dict(django_libsass.CUSTOM_FUNCTIONS) cf['static'] = static @@ -64,32 +64,46 @@ def compile_scss(object): @app.task(base=ProfiledTask) def regenerate_css(event_id: int): event = Event.objects.select_related('organizer').get(pk=event_id) - css, checksum = compile_scss(event) - fname = '{}/{}/presale.{}.css'.format( - event.organizer.slug, event.slug, checksum[:16] - ) + # main.scss + css, checksum = compile_scss(event) + fname = '{}/{}/presale.{}.css'.format(event.organizer.slug, event.slug, checksum[:16]) if event.settings.get('presale_css_checksum', '') != checksum: newname = default_storage.save(fname, ContentFile(css.encode('utf-8'))) event.settings.set('presale_css_file', newname) event.settings.set('presale_css_checksum', checksum) + # widget.scss + css, checksum = compile_scss(event, file='widget.scss', fonts=False) + fname = '{}/{}/widget.{}.css'.format(event.organizer.slug, event.slug, checksum[:16]) + + if event.settings.get('presale_widget_css_checksum', '') != checksum: + newname = default_storage.save(fname, ContentFile(css.encode('utf-8'))) + event.settings.set('presale_widget_css_file', newname) + event.settings.set('presale_widget_css_checksum', checksum) + @app.task(base=ProfiledTask) def regenerate_organizer_css(organizer_id: int): organizer = Organizer.objects.get(pk=organizer_id) + + # main.scss css, checksum = compile_scss(organizer) - - fname = '{}/presale.{}.css'.format( - organizer.slug, checksum[:16] - ) - + fname = '{}/presale.{}.css'.format(organizer.slug, checksum[:16]) if organizer.settings.get('presale_css_checksum', '') != checksum: newname = default_storage.save(fname, ContentFile(css.encode('utf-8'))) organizer.settings.set('presale_css_file', newname) organizer.settings.set('presale_css_checksum', checksum) + # widget.scss + css, checksum = compile_scss(organizer) + fname = '{}/widget.{}.css'.format(organizer.slug, checksum[:16]) + if organizer.settings.get('presale_widget_css_checksum', '') != checksum: + newname = default_storage.save(fname, ContentFile(css.encode('utf-8'))) + organizer.settings.set('presale_widget_css_file', newname) + organizer.settings.set('presale_widget_css_checksum', checksum) + non_inherited_events = set(Event_SettingsStore.objects.filter( object__organizer=organizer, key__in=affected_keys ).values_list('object_id', flat=True)) diff --git a/src/pretix/presale/templates/pretixpresale/base_footer.html b/src/pretix/presale/templates/pretixpresale/base_footer.html index c10bc5fe2..92c5b5231 100644 --- a/src/pretix/presale/templates/pretixpresale/base_footer.html +++ b/src/pretix/presale/templates/pretixpresale/base_footer.html @@ -1,7 +1,7 @@ {% load i18n %} {% load safelink %} {% safelink "https://pretix.eu" as pretixurl %} -{% with 'href="'|add:pretixurl|add:'"'|safe as a_attr %} +{% with 'target="_blank" href="'|add:pretixurl|add:'"'|safe as a_attr %} {% blocktrans trimmed %} powered by pretix {% endblocktrans %} diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html index 1bd8155f4..727b19e8c 100644 --- a/src/pretix/presale/templates/pretixpresale/event/base.html +++ b/src/pretix/presale/templates/pretixpresale/event/base.html @@ -8,6 +8,7 @@ {% block title %}{% endblock %}{% if url_name != "event.index" %} :: {% endif %}{{ event.name }} {% endblock %} {% block above %} + {% if not event.live %}
    @@ -24,12 +25,13 @@
    {% if event_logo %} - + {% else %}

    - {{ event.name }} + {{ event.name }} {% if not event.has_subevents %} {{ event.get_date_range_display }} {% endif %} diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html index d617312fe..c2ca6c03d 100644 --- a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html +++ b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html @@ -1,9 +1,7 @@ -{% extends "pretixpresale/event/base.html" %} +{% extends "pretixpresale/event/checkout_base.html" %} {% load i18n %} {% load bootstrap3 %} -{% block title %}{% trans "Checkout" %}{% endblock %} -{% block content %} -

    {% trans "Checkout" %}

    +{% block inner %}

    {% trans "For some of the products in your cart, you can choose additional options before you continue." %}

    diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_base.html b/src/pretix/presale/templates/pretixpresale/event/checkout_base.html new file mode 100644 index 000000000..6cf69c9cb --- /dev/null +++ b/src/pretix/presale/templates/pretixpresale/event/checkout_base.html @@ -0,0 +1,45 @@ +{% extends "pretixpresale/event/base.html" %} +{% load i18n %} +{% load bootstrap3 %} +{% block title %}{% trans "Checkout" %}{% endblock %} +{% block content %} +
    +
    +

    + +

    +
    +
    +
    + {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event %} + + {% if cart.minutes_left > 0 or cart.seconds_left > 0 %} + {% blocktrans trimmed with minutes=cart.minutes_left %} + The items in your cart are reserved for you for {{ minutes }} minutes. + {% endblocktrans %} + {% else %} + {% trans "The items in your cart are no longer reserved for you." %} + {% endif %} + +
    +
    +
    +

    {% trans "Checkout" %}

    + {% block inner %} + {% endblock %} +{% endblock %} diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html b/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html index aa4168d95..4235865d6 100644 --- a/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html +++ b/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html @@ -11,14 +11,22 @@ {% csrf_token %}
    -
    - +
    + {% trans "Modify" %}
    + + {% if cart.minutes_left > 0 or cart.seconds_left > 0 %} + {{ cart.minutes_left|stringformat:"02d" }}:{{ cart.seconds_left|stringformat:"02d" }} + {% else %} + {% trans "Cart expired" %} + {% endif %} +

    + {% trans "Your cart" %}

    @@ -27,7 +35,7 @@
    - {% if cart.minutes_left > 0 %} + {% if cart.minutes_left > 0 or cart.seconds_left > 0 %} {% blocktrans trimmed with minutes=cart.minutes_left %} The items in your cart are reserved for you for {{ minutes }} minutes. {% endblocktrans %} diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html index 2259aefe3..d637ee93a 100644 --- a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html +++ b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html @@ -1,9 +1,7 @@ -{% extends "pretixpresale/event/base.html" %} +{% extends "pretixpresale/event/checkout_base.html" %} {% load i18n %} {% load bootstrap3 %} -{% block title %}{% trans "Checkout" %}{% endblock %} -{% block content %} -

    {% trans "Checkout" %}

    +{% block inner %}

    {% trans "Please select how you want to pay." %}

    {% csrf_token %} diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html index adbdb1c21..44a0d592b 100644 --- a/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html +++ b/src/pretix/presale/templates/pretixpresale/event/checkout_questions.html @@ -1,9 +1,7 @@ -{% extends "pretixpresale/event/base.html" %} +{% extends "pretixpresale/event/checkout_base.html" %} {% load i18n %} {% load bootstrap3 %} -{% block title %}{% trans "Checkout" %}{% endblock %} -{% block content %} -

    {% trans "Checkout" %}

    +{% block inner %}

    {% trans "Before we continue, we need you to answer some questions." %}

    {% blocktrans trimmed %} diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_availability.html b/src/pretix/presale/templates/pretixpresale/event/fragment_availability.html index fff6719bc..8f0429360 100644 --- a/src/pretix/presale/templates/pretixpresale/event/fragment_availability.html +++ b/src/pretix/presale/templates/pretixpresale/event/fragment_availability.html @@ -5,7 +5,7 @@ {% trans "SOLD OUT" %} {% if event.settings.waiting_list_enabled %}
    - + {% trans "Waiting list" %} @@ -19,7 +19,7 @@ {% if event.settings.waiting_list_enabled %}
    - + {% trans "Waiting list" %} diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html index cde475824..515d21845 100644 --- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html +++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html @@ -79,7 +79,7 @@ {% else %}

    {% if editable %} - {% csrf_token %} @@ -90,7 +90,7 @@ {% endif %} {{ line.count }} {% if editable %} - {% csrf_token %} diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html index 3359f8307..285337cf0 100644 --- a/src/pretix/presale/templates/pretixpresale/event/index.html +++ b/src/pretix/presale/templates/pretixpresale/event/index.html @@ -17,45 +17,64 @@ {% if show_cart %}
    -

    {% trans "Your cart" %}

    +

    + +

    -
    - {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event editable=True %} - - {% if cart.minutes_left > 0 %} - {% blocktrans trimmed with minutes=cart.minutes_left %} - The items in your cart are reserved for you for {{ minutes }} minutes. - {% endblocktrans %} - {% else %} - {% trans "The items in your cart are no longer reserved for you." %} - {% endif %} - -
    -
    - - {% csrf_token %} - - +
    +
    + {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event editable=True %} + + {% if cart.minutes_left > 0 or cart.seconds_left > 0 %} + {% blocktrans trimmed with minutes=cart.minutes_left %} + The items in your cart are reserved for you for {{ minutes }} minutes. + {% endblocktrans %} + {% else %} + {% trans "The items in your cart are no longer reserved for you." %} + {% endif %} + +
    +
    +
    + {% csrf_token %} + +
    +
    +
    + + {% if has_addon_choices %} + {% trans "Continue" %} + + {% else %} + {% trans "Proceed with checkout" %} + {% endif %} + +
    +
    -
    - - {% if has_addon_choices %} - {% trans "Continue" %} - - {% else %} - {% trans "Proceed with checkout" %} - {% endif %} - -
    -
    {% endif %} - {% if event.has_subevents %} + {% if event.has_subevents and not cart_namespace %} {% if subevent %} {% trans "View other date" %} @@ -75,7 +94,7 @@ {% endif %} {% endif %} - {% if frontpage_text %} + {% if frontpage_text and not cart_namespace %}
    {{ frontpage_text|rich_text }}
    @@ -99,60 +118,63 @@ {% endif %}
    {% endif %} -
    - {% if ev.location %} + {% if not cart_namespace %} +
    + {% if ev.location %} +
    + +

    + {{ ev.location|linebreaksbr }} +

    +
    + {% endif %}
    - +

    - {{ ev.location|linebreaksbr }} + {{ ev.get_date_range_display }} + {% if event.settings.show_times %} +
    + {% blocktrans trimmed with time=ev.date_from|date:"TIME_FORMAT" %} + Begin: {{ time }} + {% endblocktrans %} + {% if event.settings.show_date_to %} +
    + {% blocktrans trimmed with time=ev.date_to|date:"TIME_FORMAT" %} + End: {{ time }} + {% endblocktrans %} + {% endif %} + {% endif %} + {% if ev.date_admission %} +
    + {% if ev.date_admission|date:"SHORT_DATE_FORMAT" == ev.date_from|date:"SHORT_DATE_FORMAT" %} + {% blocktrans trimmed with time=ev.date_admission|date:"TIME_FORMAT" %} + Admission: {{ time }} + {% endblocktrans %} + {% else %} + {% blocktrans trimmed with datetime=ev.date_admission|date:"SHORT_DATETIME_FORMAT" %} + Admission: {{ datetime }} + {% endblocktrans %} + {% endif %} + {% endif %} +
    + {% if subevent %} +     + {% else %} + + {% endif %} + {% trans "Add to Calendar" %} +

    - {% endif %} -
    - -

    - {{ ev.get_date_range_display }} - {% if event.settings.show_times %} -
    - {% blocktrans trimmed with time=ev.date_from|date:"TIME_FORMAT" %} - Begin: {{ time }} - {% endblocktrans %} - {% if event.settings.show_date_to %} -
    - {% blocktrans trimmed with time=ev.date_to|date:"TIME_FORMAT" %} - End: {{ time }} - {% endblocktrans %} - {% endif %} - {% endif %} - {% if ev.date_admission %} -
    - {% if ev.date_admission|date:"SHORT_DATE_FORMAT" == ev.date_from|date:"SHORT_DATE_FORMAT" %} - {% blocktrans trimmed with time=ev.date_admission|date:"TIME_FORMAT" %} - Admission: {{ time }} - {% endblocktrans %} - {% else %} - {% blocktrans trimmed with datetime=ev.date_admission|date:"SHORT_DATETIME_FORMAT" %} - Admission: {{ datetime }} - {% endblocktrans %} - {% endif %} - {% endif %} -
    - {% if subevent %} - - {% else %} - - {% endif %} - {% trans "Add to Calendar" %} - -

    +
    -
    + {% eventsignal event "pretix.presale.signals.front_page_top" %} + {% endif %} - {% eventsignal event "pretix.presale.signals.front_page_top" %} {% if ev.presale_is_running or event.settings.show_items_outside_presale_period %}
    + action="{% eventurl request.event "presale:event.cart.add" cart_namespace=cart_namespace %}?next={{ request.path|urlencode }}"> {% csrf_token %} {% for tup in items_by_category %} @@ -392,7 +414,7 @@ {% if vouchers_exist %}

    {% trans "Redeem a voucher" %}

    - +
    @@ -412,25 +434,27 @@
    {% endif %} - {% eventsignal event "pretix.presale.signals.front_page_bottom" %} -
    -

    {% trans "If you already ordered a ticket" %}

    -
    -
    -

    - {% blocktrans trimmed %} - If you want to see or change the status and details of your order, click on the link in one of the - emails we sent you during the order process. If you cannot find the link, click on the - following button to request the link to your order to be sent to you again. - {% endblocktrans %} -

    + {% if not cart_namespace %} + {% eventsignal event "pretix.presale.signals.front_page_bottom" %} +
    +

    {% trans "If you already ordered a ticket" %}

    +
    +
    +

    + {% blocktrans trimmed %} + If you want to see or change the status and details of your order, click on the link in one of the + emails we sent you during the order process. If you cannot find the link, click on the + following button to request the link to your order to be sent to you again. + {% endblocktrans %} +

    +
    +
    + + {% trans "Resend order links" %} + +
    +
    -
    - - {% trans "Resend order links" %} - -
    -
    -
    -
    + + {% endif %} {% endblock %} diff --git a/src/pretix/presale/templates/pretixpresale/event/order.html b/src/pretix/presale/templates/pretixpresale/event/order.html index ede67d162..24b7dca23 100644 --- a/src/pretix/presale/templates/pretixpresale/event/order.html +++ b/src/pretix/presale/templates/pretixpresale/event/order.html @@ -22,10 +22,15 @@ {% else %}

    {% trans "We successfully received your payment. See below for details." %}

    {% endif %} -

    {% blocktrans trimmed %} +

    {% blocktrans trimmed %} Please bookmark or save the link to this exact page if you want to download your ticket or change your details later. We also sent you an email containing the link to the address you specified. {% endblocktrans %}

    +

    {% blocktrans trimmed %} + Please save the following link if you want to download your ticket or change your details later. We + also sent you an email containing the link to the address you specified. + {% endblocktrans %}
    + {{ url }}

    {% endif %} diff --git a/src/pretix/presale/templates/pretixpresale/event/voucher.html b/src/pretix/presale/templates/pretixpresale/event/voucher.html index 7b6704ffb..efe698b61 100644 --- a/src/pretix/presale/templates/pretixpresale/event/voucher.html +++ b/src/pretix/presale/templates/pretixpresale/event/voucher.html @@ -19,7 +19,7 @@

    {% if event.presale_is_running or event.settings.show_items_outside_presale_period %}
    + action="{% eventurl request.event "presale:event.cart.add" cart_namespace=cart_namespace %}?next={% eventurl request.event "presale:event.index" cart_namespace=cart_namespace %}"> {% csrf_token %} diff --git a/src/pretix/presale/templates/pretixpresale/widget_dummy.html b/src/pretix/presale/templates/pretixpresale/widget_dummy.html new file mode 100644 index 000000000..6eefdc801 --- /dev/null +++ b/src/pretix/presale/templates/pretixpresale/widget_dummy.html @@ -0,0 +1,5 @@ +{% load compress %} +{% load staticfiles %} +{% compress css %} + +{% endcompress %} diff --git a/src/pretix/presale/urls.py b/src/pretix/presale/urls.py index 4b27c301e..36e1e9ace 100644 --- a/src/pretix/presale/urls.py +++ b/src/pretix/presale/urls.py @@ -1,4 +1,5 @@ -from django.conf.urls import url +from django.conf.urls import include, url +from django.views.decorators.csrf import csrf_exempt import pretix.presale.views.cart import pretix.presale.views.checkout @@ -9,23 +10,44 @@ import pretix.presale.views.organizer import pretix.presale.views.robots import pretix.presale.views.user import pretix.presale.views.waiting +import pretix.presale.views.widget # This is not a valid Django URL configuration, as the final # configuration is done by the pretix.multidomain package. -event_patterns = [ - url(r'^cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'), +frame_wrapped_urls = [ url(r'^cart/remove$', pretix.presale.views.cart.CartRemove.as_view(), name='event.cart.remove'), url(r'^cart/clear$', pretix.presale.views.cart.CartClear.as_view(), name='event.cart.clear'), url(r'^cart/answer/(?P[^/]+)/$', pretix.presale.views.cart.AnswerDownload.as_view(), name='event.cart.download.answer'), - url(r'^waitinglist', pretix.presale.views.waiting.WaitingView.as_view(), name='event.waitinglist'), url(r'^checkout/start$', pretix.presale.views.checkout.CheckoutView.as_view(), name='event.checkout.start'), - url(r'^redeem/?$', pretix.presale.views.cart.RedeemView.as_view(), - name='event.redeem'), url(r'^checkout/(?P[^/]+)/$', pretix.presale.views.checkout.CheckoutView.as_view(), name='event.checkout'), + url(r'^redeem/?$', pretix.presale.views.cart.RedeemView.as_view(), + name='event.redeem'), + url(r'^(?P[0-9]+)/$', pretix.presale.views.event.EventIndex.as_view(), name='event.index'), + url(r'^waitinglist', pretix.presale.views.waiting.WaitingView.as_view(), name='event.waitinglist'), + url(r'^$', pretix.presale.views.event.EventIndex.as_view(), name='event.index'), +] +event_patterns = [ + + # Cart/checkout patterns are a bit more complicated, as they should have simple URLs like cart/clear in normal + # cases, but need to have versions with unguessable URLs like w/8l4Y83XNonjLxoBb/cart/clear to be used in widget + # mode. This is required to prevent all clickjacking and CSRF attacks that would otherwise be possible. + # First, we define the normal version + url(r'', include(frame_wrapped_urls)), + # Second, the widget version + url(r'w/(?P[a-zA-Z0-9]{16})/', include(frame_wrapped_urls)), + # Third, a fake version that is defined like the first (and never gets called), but makes reversing URLs easier + url(r'(?P[_]{0})', include(frame_wrapped_urls)), + # CartAdd goes extra since it also gets a csrf_exempt decorator in one of the cases + url(r'^cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'), + url(r'^(?P[_]{0})cart/add$', pretix.presale.views.cart.CartAdd.as_view(), name='event.cart.add'), + url(r'w/(?P[a-zA-Z0-9]{16})/cart/add', + csrf_exempt(pretix.presale.views.cart.CartAdd.as_view()), + name='event.cart.add'), + url(r'resend/$', pretix.presale.views.user.ResendLinkView.as_view(), name='event.resend_link'), url(r'^order/(?P[^/]+)/(?P[A-Za-z0-9]+)/$', pretix.presale.views.order.OrderDetails.as_view(), name='event.order'), @@ -71,8 +93,12 @@ event_patterns = [ pretix.presale.views.event.EventIcalDownload.as_view(), name='event.ical.download'), url(r'^auth/$', pretix.presale.views.event.EventAuth.as_view(), name='event.auth'), - url(r'^(?P[0-9]+)/$', pretix.presale.views.event.EventIndex.as_view(), name='event.index'), - url(r'^$', pretix.presale.views.event.EventIndex.as_view(), name='event.index'), + + url(r'^widget/product_list$', pretix.presale.views.widget.WidgetAPIProductList.as_view(), + name='event.widget.productlist'), + url(r'^widget/v1.css$', pretix.presale.views.widget.widget_css, name='event.widget.css'), + url(r'^(?P\d+)/widget/product_list$', pretix.presale.views.widget.WidgetAPIProductList.as_view(), + name='event.widget.productlist'), ] organizer_patterns = [ @@ -85,4 +111,5 @@ organizer_patterns = [ locale_patterns = [ url(r'^locale/set$', pretix.presale.views.locale.LocaleSet.as_view(), name='locale.set'), url(r'^robots.txt$', pretix.presale.views.robots.robots_txt, name='robots.txt'), + url(r'^widget/v1\.(?P[a-zA-Z0-9_\-]+)\.js$', pretix.presale.views.widget.widget_js, name='widget.js'), ] diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py index 1d87ae0e4..efbbc7339 100644 --- a/src/pretix/presale/views/__init__.py +++ b/src/pretix/presale/views/__init__.py @@ -1,13 +1,18 @@ from collections import defaultdict -from datetime import timedelta +from datetime import datetime, timedelta +from functools import wraps from itertools import groupby +from django.conf import settings from django.db.models import Sum +from django.utils.decorators import available_attrs from django.utils.functional import cached_property from django.utils.timezone import now +from pretix.base.i18n import language from pretix.base.models import CartPosition, InvoiceAddress, OrderPosition from pretix.base.services.cart import get_fees +from pretix.multidomain.urlreverse import eventreverse from pretix.presale.signals import question_form_fields @@ -129,9 +134,11 @@ class CartMixin: try: first_expiry = min(p.expires for p in positions) if positions else now() minutes_left = max(first_expiry - now(), timedelta()).seconds // 60 + seconds_left = max(first_expiry - now(), timedelta()).seconds % 60 except AttributeError: first_expiry = None minutes_left = None + seconds_left = None return { 'positions': positions, @@ -142,6 +149,7 @@ class CartMixin: 'fees': fees, 'answers': answers, 'minutes_left': minutes_left, + 'seconds_left': seconds_left, 'first_expiry': first_expiry, } @@ -182,9 +190,53 @@ class EventViewMixin: context['event'] = self.request.event return context + def get_index_url(self): + kwargs = {} + if 'cart_namespace' in self.kwargs: + kwargs['cart_namespace'] = self.kwargs['cart_namespace'] + return eventreverse(self.request.event, 'presale:event.index', kwargs=kwargs) + class OrganizerViewMixin: def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context['organizer'] = self.request.organizer return context + + +def allow_frame_if_namespaced(view_func): + def wrapped_view(request, *args, **kwargs): + resp = view_func(request, *args, **kwargs) + if request.resolver_match and request.resolver_match.kwargs.get('cart_namespace'): + resp.xframe_options_exempt = True + return resp + return wraps(view_func, assigned=available_attrs(view_func))(wrapped_view) + + +def allow_cors_if_namespaced(view_func): + def wrapped_view(request, *args, **kwargs): + resp = view_func(request, *args, **kwargs) + if request.resolver_match and request.resolver_match.kwargs.get('cart_namespace'): + resp['Access-Control-Allow-Origin'] = '*' + return resp + return wraps(view_func, assigned=available_attrs(view_func))(wrapped_view) + + +def iframe_entry_view_wrapper(view_func): + def wrapped_view(request, *args, **kwargs): + if 'iframe' in request.GET: + request.session['iframe_session'] = True + + locale = request.GET.get('locale') + if locale and locale in [lc for lc, ll in settings.LANGUAGES]: + with language(locale): + resp = view_func(request, *args, **kwargs) + max_age = 10 * 365 * 24 * 60 * 60 + resp.set_cookie(settings.LANGUAGE_COOKIE_NAME, locale, max_age=max_age, + expires=(datetime.utcnow() + timedelta(seconds=max_age)).strftime('%a, %d-%b-%Y %H:%M:%S GMT'), + domain=settings.SESSION_COOKIE_DOMAIN) + return resp + + resp = view_func(request, *args, **kwargs) + return resp + return wraps(view_func, assigned=available_attrs(view_func))(wrapped_view) diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py index 13cb38d37..8a48b3d2d 100644 --- a/src/pretix/presale/views/cart.py +++ b/src/pretix/presale/views/cart.py @@ -2,37 +2,47 @@ import mimetypes import os from django.contrib import messages -from django.db.models import Count, Prefetch, Q +from django.db.models import Q from django.http import FileResponse, Http404, JsonResponse from django.shortcuts import get_object_or_404, redirect from django.utils import translation from django.utils.crypto import get_random_string +from django.utils.decorators import method_decorator from django.utils.functional import cached_property +from django.utils.http import is_safe_url from django.utils.timezone import now from django.utils.translation import ugettext as _ +from django.views.decorators.clickjacking import xframe_options_exempt from django.views.generic import TemplateView, View from pretix.base.models import ( - CartPosition, InvoiceAddress, ItemVariation, QuestionAnswer, Quota, - SubEvent, Voucher, + CartPosition, InvoiceAddress, QuestionAnswer, SubEvent, Voucher, ) from pretix.base.services.cart import ( CartError, add_items_to_cart, clear_cart, remove_cart_position, ) from pretix.multidomain.urlreverse import eventreverse -from pretix.presale.views import EventViewMixin +from pretix.presale.views import ( + EventViewMixin, allow_cors_if_namespaced, allow_frame_if_namespaced, + iframe_entry_view_wrapper, +) from pretix.presale.views.async import AsyncAction -from pretix.presale.views.event import item_group_by_category +from pretix.presale.views.event import ( + get_grouped_items, item_group_by_category, +) from pretix.presale.views.robots import NoSearchIndexViewMixin class CartActionMixin: def get_next_url(self): - if "next" in self.request.GET and '://' not in self.request.GET.get('next'): + if "next" in self.request.GET and is_safe_url(self.request.GET.get("next")): return self.request.GET.get('next') else: - return eventreverse(self.request.event, 'presale:event.index') + kwargs = {} + if 'cart_namespace' in self.kwargs: + kwargs['cart_namespace'] = self.kwargs['cart_namespace'] + return eventreverse(self.request.event, 'presale:event.index', kwargs=kwargs) def get_success_url(self, value=None): return self.get_next_url() @@ -129,25 +139,54 @@ class CartActionMixin: return items -def create_empty_cart_id(request): - current_id = request.session.get('current_cart_event_{}'.format(request.event.pk)) - if current_id and current_id in request.session.get('carts', {}): - del request.session['carts'][current_id] - del request.session['current_cart_event_{}'.format(request.event.pk)] - return get_or_create_cart_id(request) +def generate_cart_id(prefix=''): + while True: + new_id = prefix + get_random_string(length=32 - len(prefix)) + if not CartPosition.objects.filter(cart_id=new_id).exists(): + return new_id + + +def create_empty_cart_id(request, replace_current=True): + session_keyname = 'current_cart_event_{}'.format(request.event.pk) + prefix = '' + if request.resolver_match and request.resolver_match.kwargs.get('cart_namespace'): + session_keyname += '_' + request.resolver_match.kwargs.get('cart_namespace') + prefix = request.resolver_match.kwargs.get('cart_namespace') + + if 'carts' not in request.session: + request.session['carts'] = {} + + new_id = generate_cart_id(prefix=prefix) + request.session['carts'][new_id] = {} + + if replace_current: + current_id = request.session.get(session_keyname) + if current_id and current_id in request.session.get('carts', {}): + del request.session['carts'][current_id] + del request.session[session_keyname] + request.session[session_keyname] = new_id + return new_id def get_or_create_cart_id(request): - current_id = request.session.get('current_cart_event_{}'.format(request.event.pk)) + session_keyname = 'current_cart_event_{}'.format(request.event.pk) + prefix = '' + if request.resolver_match and request.resolver_match.kwargs.get('cart_namespace'): + session_keyname += '_' + request.resolver_match.kwargs.get('cart_namespace') + prefix = request.resolver_match.kwargs.get('cart_namespace') + + current_id = request.session.get(session_keyname) if current_id and current_id in request.session.get('carts', {}): return current_id else: cart_data = {} - - while True: - new_id = get_random_string(length=32) - if not CartPosition.objects.filter(cart_id=new_id).exists(): - break + if prefix and 'take_cart_id' in request.GET: + if CartPosition.objects.filter(event=request.event, cart_id=request.GET.get('take_cart_id')).exists(): + new_id = request.GET.get('take_cart_id') + else: + new_id = generate_cart_id(prefix=prefix) + else: + new_id = generate_cart_id(prefix=prefix) # Migrate legacy data # TODO: This is for the upgrade 1.7→1.8. We should remove this around April 2018 @@ -165,8 +204,9 @@ def get_or_create_cart_id(request): if 'carts' not in request.session: request.session['carts'] = {} - request.session['carts'][new_id] = cart_data - request.session['current_cart_event_{}'.format(request.event.pk)] = new_id + if new_id not in request.session['carts']: + request.session['carts'][new_id] = cart_data + request.session[session_keyname] = new_id return new_id @@ -176,6 +216,7 @@ def cart_session(request): return request.session['carts'][cart_id] +@method_decorator(allow_frame_if_namespaced, 'dispatch') class CartRemove(EventViewMixin, CartActionMixin, AsyncAction, View): task = remove_cart_position known_errortypes = ['CartError'] @@ -198,6 +239,7 @@ class CartRemove(EventViewMixin, CartActionMixin, AsyncAction, View): return redirect(self.get_error_url()) +@method_decorator(allow_frame_if_namespaced, 'dispatch') class CartClear(EventViewMixin, CartActionMixin, AsyncAction, View): task = clear_cart known_errortypes = ['CartError'] @@ -209,6 +251,9 @@ class CartClear(EventViewMixin, CartActionMixin, AsyncAction, View): return self.do(self.request.event.id, get_or_create_cart_id(self.request), translation.get_language()) +@method_decorator(allow_cors_if_namespaced, 'dispatch') +@method_decorator(allow_frame_if_namespaced, 'dispatch') +@method_decorator(iframe_entry_view_wrapper, 'dispatch') class CartAdd(EventViewMixin, CartActionMixin, AsyncAction, View): task = add_items_to_cart known_errortypes = ['CartError'] @@ -216,6 +261,13 @@ class CartAdd(EventViewMixin, CartActionMixin, AsyncAction, View): def get_success_message(self, value): return _('The products have been successfully added to your cart.') + def _ajax_response_data(self): + cart_id = get_or_create_cart_id(self.request) + return { + 'cart_id': cart_id, + 'has_cart': CartPosition.objects.filter(cart_id=cart_id, event=self.request.event).exists() + } + def post(self, request, *args, **kwargs): items = self._items_from_post_data() if items: @@ -230,6 +282,8 @@ class CartAdd(EventViewMixin, CartActionMixin, AsyncAction, View): return redirect(self.get_error_url()) +@method_decorator(allow_frame_if_namespaced, 'dispatch') +@method_decorator(iframe_entry_view_wrapper, 'dispatch') class RedeemView(NoSearchIndexViewMixin, EventViewMixin, TemplateView): template_name = "pretixpresale/event/voucher.html" @@ -240,90 +294,11 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, TemplateView): context['max_times'] = self.voucher.max_usages - self.voucher.redeemed # Fetch all items - items = self.request.event.items.all().filter( - Q(active=True) - & Q(Q(available_from__isnull=True) | Q(available_from__lte=now())) - & Q(Q(available_until__isnull=True) | Q(available_until__gte=now())) - & ~Q(category__is_addon=True) - ) + items, display_add_to_cart = get_grouped_items(self.request.event, self.subevent, + voucher=self.voucher) - vouchq = Q(hide_without_voucher=False) - - if self.voucher.item_id: - vouchq |= Q(pk=self.voucher.item_id) - items = items.filter(pk=self.voucher.item_id) - elif self.voucher.quota_id: - items = items.filter(quotas__in=[self.voucher.quota_id]) - - items = items.filter(vouchq).select_related( - 'category', 'tax_rule', # for re-grouping - ).prefetch_related( - Prefetch('quotas', - to_attr='_subevent_quotas', - queryset=self.request.event.quotas.filter(subevent=self.subevent)), - Prefetch('variations', to_attr='available_variations', - queryset=ItemVariation.objects.filter(active=True, quotas__isnull=False).prefetch_related( - Prefetch('quotas', - to_attr='_subevent_quotas', - queryset=self.request.event.quotas.filter(subevent=self.subevent)) - ).distinct()), - ).annotate( - quotac=Count('quotas'), - has_variations=Count('variations') - ).filter( - quotac__gt=0 - ).distinct().order_by('category__position', 'category_id', 'position', 'name') - quota_cache = {} - - if self.subevent: - item_price_override = self.subevent.item_price_overrides - var_price_override = self.subevent.var_price_overrides - else: - item_price_override = {} - var_price_override = {} - - for item in items: - if self.voucher.item_id and self.voucher.variation_id: - item.available_variations = [v for v in item.available_variations if v.pk == self.voucher.variation_id] - - item.order_max = item.max_per_order or int(self.request.event.settings.max_items_per_order) - - if not item.has_variations: - item._remove = not bool(item._subevent_quotas) - if self.voucher.allow_ignore_quota or self.voucher.block_quota: - item.cached_availability = (Quota.AVAILABILITY_OK, 1) - else: - item.cached_availability = item.check_quotas(subevent=self.subevent, _cache=quota_cache) - - price = item_price_override.get(item.pk, item.default_price) - price = self.voucher.calculate_price(price) - item.display_price = item.tax(price) - else: - item._remove = False - for var in item.available_variations: - if self.voucher.allow_ignore_quota or self.voucher.block_quota: - var.cached_availability = (Quota.AVAILABILITY_OK, 1) - else: - var.cached_availability = list(var.check_quotas(subevent=self.subevent, _cache=quota_cache)) - - price = var_price_override.get(var.pk, var.price) - price = self.voucher.calculate_price(price) - var.display_price = item.tax(price) - - item.available_variations = [ - v for v in item.available_variations if v._subevent_quotas - ] - if self.voucher.variation_id: - item.available_variations = [v for v in item.available_variations - if v.pk == self.voucher.variation_id] - if len(item.available_variations) > 0: - item.min_price = min([v.display_price.net if self.request.event.settings.display_net_prices else - v.display_price.gross for v in item.available_variations]) - item.max_price = max([v.display_price.net if self.request.event.settings.display_net_prices else - v.display_price.gross for v in item.available_variations]) - - items = [item for item in items - if (len(item.available_variations) > 0 or not item.has_variations) and not item._remove] + # Calculate how many options the user still has. If there is only one option, we can + # check the box right away ;) context['options'] = sum([(len(item.available_variations) if item.has_variations else 1) for item in items]) @@ -359,7 +334,7 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, TemplateView): except Voucher.DoesNotExist: err = error_messages['voucher_invalid'] else: - return redirect(eventreverse(request.event, 'presale:event.index')) + return redirect(self.get_index_url()) if request.event.presale_start and now() < request.event.presale_start: err = error_messages['not_started'] @@ -379,11 +354,12 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, TemplateView): if err: messages.error(request, _(err)) - return redirect(eventreverse(request.event, 'presale:event.index')) + return redirect(self.get_index_url()) return super().dispatch(request, *args, **kwargs) +@method_decorator(xframe_options_exempt, 'dispatch') class AnswerDownload(EventViewMixin, View): def get(self, request, *args, **kwargs): answid = kwargs.get('answer') diff --git a/src/pretix/presale/views/checkout.py b/src/pretix/presale/views/checkout.py index 5a88c020c..c3a773a22 100644 --- a/src/pretix/presale/views/checkout.py +++ b/src/pretix/presale/views/checkout.py @@ -1,6 +1,7 @@ from django.contrib import messages from django.http import Http404 from django.shortcuts import redirect +from django.utils.decorators import method_decorator from django.utils.translation import ugettext_lazy as _ from django.views.generic import View @@ -8,21 +9,31 @@ from pretix.base.services.cart import CartError from pretix.base.signals import validate_cart from pretix.multidomain.urlreverse import eventreverse from pretix.presale.checkoutflow import get_checkout_flow -from pretix.presale.views import get_cart +from pretix.presale.views import ( + allow_frame_if_namespaced, get_cart, iframe_entry_view_wrapper, +) +@method_decorator(allow_frame_if_namespaced, 'dispatch') +@method_decorator(iframe_entry_view_wrapper, 'dispatch') class CheckoutView(View): - def dispatch(self, request, *args, **kwargs): + def get_index_url(self, request): + kwargs = {} + if 'cart_namespace' in self.kwargs: + kwargs['cart_namespace'] = self.kwargs['cart_namespace'] + return eventreverse(self.request.event, 'presale:event.index', kwargs=kwargs) + + def dispatch(self, request, *args, **kwargs): self.request = request if not get_cart(request) and "async_id" not in request.GET: messages.error(request, _("Your cart is empty")) - return redirect(eventreverse(self.request.event, 'presale:event.index')) + return redirect(self.get_index_url(self.request)) if not request.event.presale_is_running: messages.error(request, _("The presale for this event is over or has not yet started.")) - return redirect(eventreverse(self.request.event, 'presale:event.index')) + return redirect(self.get_index_url(self.request)) cart_error = None try: @@ -37,14 +48,14 @@ class CheckoutView(View): continue if step.requires_valid_cart and cart_error: messages.error(request, str(cart_error)) - return redirect(previous_step.get_step_url() if previous_step - else eventreverse(self.request.event, 'presale:event.index')) + return redirect(previous_step.get_step_url(request) if previous_step + else self.get_index_url(request)) if 'step' not in kwargs: - return redirect(step.get_step_url()) + return redirect(step.get_step_url(request)) is_selected = (step.identifier == kwargs.get('step', '')) if "async_id" not in request.GET and not is_selected and not step.is_completed(request, warn=not is_selected): - return redirect(step.get_step_url()) + return redirect(step.get_step_url(request)) if is_selected: if request.method.lower() in self.http_method_names: handler = getattr(step, request.method.lower(), self.http_method_not_allowed) diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py index 2c40684cf..276820f4f 100644 --- a/src/pretix/presale/views/event.py +++ b/src/pretix/presale/views/event.py @@ -17,7 +17,7 @@ from django.views import View from django.views.decorators.csrf import csrf_exempt from django.views.generic import TemplateView -from pretix.base.models import ItemVariation +from pretix.base.models import ItemVariation, Quota from pretix.base.models.event import SubEvent from pretix.multidomain.urlreverse import eventreverse from pretix.presale.ical import get_ical @@ -25,7 +25,10 @@ from pretix.presale.views.organizer import ( add_subevents_for_days, weeks_for_template, ) -from . import CartMixin, EventViewMixin, get_cart +from . import ( + CartMixin, EventViewMixin, allow_frame_if_namespaced, get_cart, + iframe_entry_view_wrapper, +) SessionStore = import_module(settings.SESSION_ENGINE).SessionStore @@ -44,14 +47,23 @@ def item_group_by_category(items): ) -def get_grouped_items(event, subevent=None): +def get_grouped_items(event, subevent=None, voucher=None): items = event.items.all().filter( Q(active=True) & Q(Q(available_from__isnull=True) | Q(available_from__lte=now())) & Q(Q(available_until__isnull=True) | Q(available_until__gte=now())) - & Q(hide_without_voucher=False) & ~Q(category__is_addon=True) - ).select_related( + ) + + vouchq = Q(hide_without_voucher=False) + if voucher: + if voucher.item_id: + vouchq |= Q(pk=voucher.item_id) + items = items.filter(pk=voucher.item_id) + elif voucher.quota_id: + items = items.filter(quotas__in=[voucher.quota_id]) + + items = items.filter(vouchq).select_related( 'category', 'tax_rule', # for re-grouping ).prefetch_related( Prefetch('quotas', @@ -81,36 +93,74 @@ def get_grouped_items(event, subevent=None): var_price_override = {} for item in items: + if voucher and voucher.item_id and voucher.variation_id: + # Restrict variations if the voucher only allows one + item.available_variations = [v for v in item.available_variations + if v.pk == voucher.variation_id] + max_per_order = item.max_per_order or int(event.settings.max_items_per_order) + if not item.has_variations: item._remove = not bool(item._subevent_quotas) - item.cached_availability = list(item.check_quotas(subevent=subevent, _cache=quota_cache)) - item.order_max = min(item.cached_availability[1] - if item.cached_availability[1] is not None else sys.maxsize, - max_per_order) - price = item.default_price - item.display_price = item.tax(item_price_override.get(item.pk, price)) + + if voucher and (voucher.allow_ignore_quota or voucher.block_quota): + item.cached_availability = ( + Quota.AVAILABILITY_OK, voucher.max_usages - voucher.redeemed + ) + else: + item.cached_availability = list( + item.check_quotas(subevent=subevent, _cache=quota_cache) + ) + + item.order_max = min( + item.cached_availability[1] + if item.cached_availability[1] is not None else sys.maxsize, + max_per_order + ) + + price = item_price_override.get(item.pk, item.default_price) + if voucher: + price = voucher.calculate_price(price) + item.display_price = item.tax(price) display_add_to_cart = display_add_to_cart or item.order_max > 0 else: for var in item.available_variations: - var.cached_availability = list(var.check_quotas(subevent=subevent, _cache=quota_cache)) - var.order_max = min(var.cached_availability[1] - if var.cached_availability[1] is not None else sys.maxsize, - max_per_order) + if voucher and (voucher.allow_ignore_quota or voucher.block_quota): + var.cached_availability = ( + Quota.AVAILABILITY_OK, voucher.max_usages - voucher.redeemed + ) + else: + var.cached_availability = list( + var.check_quotas(subevent=subevent, _cache=quota_cache) + ) - var.display_price = var.tax(var_price_override.get(var.pk, var.price)) + var.order_max = min( + var.cached_availability[1] + if var.cached_availability[1] is not None else sys.maxsize, + max_per_order + ) + + price = var_price_override.get(var.pk, var.price) + if voucher: + price = voucher.calculate_price(price) + var.display_price = var.tax(price) display_add_to_cart = display_add_to_cart or var.order_max > 0 item.available_variations = [ v for v in item.available_variations if v._subevent_quotas ] + if voucher and voucher.variation_id: + item.available_variations = [v for v in item.available_variations + if v.pk == voucher.variation_id] + if len(item.available_variations) > 0: item.min_price = min([v.display_price.net if event.settings.display_net_prices else v.display_price.gross for v in item.available_variations]) item.max_price = max([v.display_price.net if event.settings.display_net_prices else v.display_price.gross for v in item.available_variations]) + item._remove = not bool(item.available_variations) if not external_quota_cache: @@ -120,6 +170,8 @@ def get_grouped_items(event, subevent=None): return items, display_add_to_cart +@method_decorator(allow_frame_if_namespaced, 'dispatch') +@method_decorator(iframe_entry_view_wrapper, 'dispatch') class EventIndex(EventViewMixin, CartMixin, TemplateView): template_name = "pretixpresale/event/index.html" @@ -135,7 +187,7 @@ class EventIndex(EventViewMixin, CartMixin, TemplateView): return super().get(request, *args, **kwargs) else: if 'subevent' in kwargs: - return redirect(eventreverse(request.event, 'presale:event.index')) + return redirect(self.get_index_url()) else: return super().get(request, *args, **kwargs) diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py index 6984dab54..ff92e8b4e 100644 --- a/src/pretix/presale/views/order.py +++ b/src/pretix/presale/views/order.py @@ -7,9 +7,11 @@ from django.db import transaction from django.db.models import Sum from django.http import FileResponse, Http404, JsonResponse from django.shortcuts import get_object_or_404, redirect, render +from django.utils.decorators import method_decorator from django.utils.functional import cached_property from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ +from django.views.decorators.clickjacking import xframe_options_exempt from django.views.generic import TemplateView, View from pretix.base.models import CachedTicket, Invoice, Order, OrderPosition @@ -24,7 +26,7 @@ from pretix.base.services.tickets import ( ) from pretix.base.signals import allow_ticket_download, register_ticket_outputs from pretix.helpers.safedownload import check_token -from pretix.multidomain.urlreverse import eventreverse +from pretix.multidomain.urlreverse import build_absolute_uri, eventreverse from pretix.presale.forms.checkout import InvoiceAddressForm from pretix.presale.views import CartMixin, EventViewMixin from pretix.presale.views.async import AsyncAction @@ -59,6 +61,7 @@ class OrderDetailMixin(NoSearchIndexViewMixin): }) +@method_decorator(xframe_options_exempt, 'dispatch') class OrderDetails(EventViewMixin, OrderDetailMixin, CartMixin, TemplateView): template_name = "pretixpresale/event/order.html" @@ -112,6 +115,12 @@ class OrderDetails(EventViewMixin, OrderDetailMixin, CartMixin, TemplateView): ctx['can_generate_invoice'] = invoice_qualified(self.order) and ( self.request.event.settings.invoice_generate == 'user' ) + ctx['url'] = build_absolute_uri( + self.request.event, 'presale:event.order', kwargs={ + 'order': self.order.code, + 'secret': self.order.secret + } + ) if self.order.status == Order.STATUS_PENDING: ctx['payment'] = self.payment_provider.order_pending_render(self.request, self.order) @@ -134,6 +143,7 @@ class OrderDetails(EventViewMixin, OrderDetailMixin, CartMixin, TemplateView): return ctx +@method_decorator(xframe_options_exempt, 'dispatch') class OrderPaymentStart(EventViewMixin, OrderDetailMixin, TemplateView): """ This is used if a payment is retried or the payment method is changed. It shows the payment @@ -186,6 +196,7 @@ class OrderPaymentStart(EventViewMixin, OrderDetailMixin, TemplateView): }) +@method_decorator(xframe_options_exempt, 'dispatch') class OrderPaymentConfirm(EventViewMixin, OrderDetailMixin, TemplateView): """ This is used if a payment is retried or the payment method is changed. It is shown after the @@ -232,6 +243,7 @@ class OrderPaymentConfirm(EventViewMixin, OrderDetailMixin, TemplateView): }) +@method_decorator(xframe_options_exempt, 'dispatch') class OrderPaymentComplete(EventViewMixin, OrderDetailMixin, View): """ This is used for the first try of a payment. This means the user just entered payment @@ -273,6 +285,7 @@ class OrderPaymentComplete(EventViewMixin, OrderDetailMixin, View): }) +@method_decorator(xframe_options_exempt, 'dispatch') class OrderPayChangeMethod(EventViewMixin, OrderDetailMixin, TemplateView): template_name = 'pretixpresale/event/order_pay_change.html' @@ -384,6 +397,7 @@ class OrderPayChangeMethod(EventViewMixin, OrderDetailMixin, TemplateView): }) +@method_decorator(xframe_options_exempt, 'dispatch') class OrderInvoiceCreate(EventViewMixin, OrderDetailMixin, View): def dispatch(self, request, *args, **kwargs): @@ -406,6 +420,7 @@ class OrderInvoiceCreate(EventViewMixin, OrderDetailMixin, View): return redirect(self.get_order_url()) +@method_decorator(xframe_options_exempt, 'dispatch') class OrderModify(EventViewMixin, OrderDetailMixin, QuestionsViewMixin, TemplateView): template_name = "pretixpresale/event/order_modify.html" @@ -471,6 +486,7 @@ class OrderModify(EventViewMixin, OrderDetailMixin, QuestionsViewMixin, Template return ctx +@method_decorator(xframe_options_exempt, 'dispatch') class OrderCancel(EventViewMixin, OrderDetailMixin, TemplateView): template_name = "pretixpresale/event/order_cancel.html" @@ -493,6 +509,7 @@ class OrderCancel(EventViewMixin, OrderDetailMixin, TemplateView): return ctx +@method_decorator(xframe_options_exempt, 'dispatch') class OrderCancelDo(EventViewMixin, OrderDetailMixin, AsyncAction, View): task = cancel_order known_errortypes = ['OrderError'] @@ -520,6 +537,7 @@ class OrderCancelDo(EventViewMixin, OrderDetailMixin, AsyncAction, View): return _('The order has been canceled.') +@method_decorator(xframe_options_exempt, 'dispatch') class AnswerDownload(EventViewMixin, OrderDetailMixin, View): def get(self, request, *args, **kwargs): answid = kwargs.get('answer') @@ -541,6 +559,7 @@ class AnswerDownload(EventViewMixin, OrderDetailMixin, View): return resp +@method_decorator(xframe_options_exempt, 'dispatch') class OrderDownload(EventViewMixin, OrderDetailMixin, View): def get_self_url(self): @@ -636,6 +655,7 @@ class OrderDownload(EventViewMixin, OrderDetailMixin, View): return resp +@method_decorator(xframe_options_exempt, 'dispatch') class InvoiceDownload(EventViewMixin, OrderDetailMixin, View): def get(self, request, *args, **kwargs): diff --git a/src/pretix/presale/views/waiting.py b/src/pretix/presale/views/waiting.py index 1ed9cc6e4..6e390c168 100644 --- a/src/pretix/presale/views/waiting.py +++ b/src/pretix/presale/views/waiting.py @@ -1,18 +1,21 @@ from django.contrib import messages from django.shortcuts import get_object_or_404, redirect from django.utils import translation +from django.utils.decorators import method_decorator from django.utils.functional import cached_property from django.utils.translation import pgettext_lazy, ugettext_lazy as _ from django.views.generic import FormView from pretix.base.models.event import SubEvent +from pretix.presale.views import EventViewMixin +from . import allow_frame_if_namespaced from ...base.models import Item, ItemVariation, WaitingListEntry -from ...multidomain.urlreverse import eventreverse from ..forms.waitinglist import WaitingListForm -class WaitingView(FormView): +@method_decorator(allow_frame_if_namespaced, 'dispatch') +class WaitingView(EventViewMixin, FormView): template_name = 'pretixpresale/event/waitinglist.html' form_class = WaitingListForm @@ -52,11 +55,11 @@ class WaitingView(FormView): if not self.request.event.settings.waiting_list_enabled: messages.error(request, _("Waiting lists are disabled for this event.")) - return redirect(eventreverse(self.request.event, 'presale:event.index')) + return redirect(self.get_index_url()) if not self.item_and_variation: messages.error(request, _("We could not identify the product you selected.")) - return redirect(eventreverse(self.request.event, 'presale:event.index')) + return redirect(self.get_index_url()) self.subevent = None if request.event.has_subevents: @@ -65,7 +68,7 @@ class WaitingView(FormView): active=True) else: messages.error(request, pgettext_lazy('subevent', "You need to select a date.")) - return redirect(eventreverse(self.request.event, 'presale:event.index')) + return redirect(self.get_index_url()) return super().dispatch(request, *args, **kwargs) @@ -78,7 +81,7 @@ class WaitingView(FormView): if availability[0] == 100: messages.error(self.request, _("You cannot add yourself to the waiting list as this product is currently " "available.")) - return redirect(eventreverse(self.request.event, 'presale:event.index')) + return redirect(self.get_index_url()) form.save() messages.success(self.request, _("We've added you to the waiting list. You will receive " @@ -86,4 +89,4 @@ class WaitingView(FormView): return super().form_valid(form) def get_success_url(self): - return eventreverse(self.request.event, 'presale:event.index') + return self.get_index_url() diff --git a/src/pretix/presale/views/widget.py b/src/pretix/presale/views/widget.py new file mode 100644 index 000000000..44c9f24c1 --- /dev/null +++ b/src/pretix/presale/views/widget.py @@ -0,0 +1,274 @@ +import hashlib +import json +from urllib.parse import urljoin + +from django.conf import settings +from django.contrib.staticfiles import finders +from django.core.files.base import ContentFile +from django.core.files.storage import default_storage +from django.db.models import Q +from django.http import FileResponse, Http404, HttpResponse, JsonResponse +from django.template import Context, Engine +from django.template.loader import get_template +from django.utils.formats import date_format +from django.utils.timezone import now +from django.views import View +from django.views.decorators.cache import cache_page +from django.views.decorators.http import condition +from django.views.i18n import ( + get_formats, get_javascript_catalog, js_catalog_template, +) +from easy_thumbnails.files import get_thumbnailer +from lxml import etree + +from pretix.base.i18n import language +from pretix.base.models import CartPosition, Voucher +from pretix.base.services.cart import error_messages +from pretix.base.settings import GlobalSettingsObject +from pretix.base.templatetags.rich_text import rich_text +from pretix.presale.views.cart import get_or_create_cart_id +from pretix.presale.views.event import ( + get_grouped_items, item_group_by_category, +) + + +def indent(s): + return s.replace('\n', '\n ') + + +def widget_css_etag(request, **kwargs): + return request.event.settings.presale_widget_css_checksum or request.organizer.settings.presale_widget_css_checksum + + +def widget_js_etag(request, lang, **kwargs): + gs = GlobalSettingsObject() + return gs.settings.get('widget_checksum_{}'.format(lang)) + + +@condition(etag_func=widget_css_etag) +@cache_page(60) +def widget_css(request, **kwargs): + if request.event.settings.presale_widget_css_file: + resp = FileResponse(default_storage.open(request.event.settings.presale_widget_css_file), + content_type='text/css') + return resp + else: + tpl = get_template('pretixpresale/widget_dummy.html') + et = etree.fromstring(tpl.render({})).attrib['href'].replace(settings.STATIC_URL, '') + f = finders.find(et) + resp = FileResponse(open(f, 'rb'), content_type='text/css') + return resp + + +def generate_widget_js(lang): + code = [] + with language(lang): + # Provide isolation + code.append('(function (siteglobals) {\n') + code.append('var module = {}, exports = {};\n') + code.append('var lang = "%s";\n' % lang) + + catalog, plural = get_javascript_catalog(lang, 'djangojs', ['pretix']) + catalog = dict((k, v) for k, v in catalog.items() if k.startswith('widget\u0004')) + template = Engine().from_string(js_catalog_template) + context = Context({ + 'catalog_str': indent(json.dumps( + catalog, sort_keys=True, indent=2)) if catalog else None, + 'formats_str': indent(json.dumps( + get_formats(), sort_keys=True, indent=2)), + 'plural': plural, + }) + code.append(template.render(context)) + + files = [ + 'vuejs/vue.js' if settings.DEBUG else 'vuejs/vue.min.js', + 'pretixpresale/js/widget/docready.js', + 'pretixpresale/js/widget/floatformat.js', + 'pretixpresale/js/widget/widget.js', + ] + for fname in files: + f = finders.find(fname) + with open(f, 'r') as fp: + code.append(fp.read()) + + if settings.DEBUG: + code.append('})(this);\n') + else: + # Do not expose debugging variables + code.append('})({});\n') + return ''.join(code) + + +@condition(etag_func=widget_js_etag) +@cache_page(60) +def widget_js(request, lang, **kwargs): + if lang not in [lc for lc, ll in settings.LANGUAGES]: + raise Http404() + + gs = GlobalSettingsObject() + fname = gs.settings.get('widget_file_{}'.format(lang)) + print(fname, settings.DEBUG) + if not fname or settings.DEBUG: + data = generate_widget_js(lang).encode() + checksum = hashlib.sha1(data).hexdigest() + if not fname: + newname = default_storage.save( + 'widget/widget.{}.{}.js'.format(lang, checksum), + ContentFile(data) + ) + gs.settings.set('widget_file_{}'.format(lang), 'file://' + newname) + gs.settings.set('widget_checksum_{}'.format(lang), checksum) + resp = HttpResponse(data, content_type='text/javascript') + else: + resp = FileResponse(default_storage.open(fname), content_type='text/javascript') + return resp + + +def price_dict(price): + return { + 'gross': price.gross, + 'net': price.net, + 'tax': price.tax, + 'rate': price.rate, + 'name': str(price.name) + } + + +def get_picture(picture): + thumb = get_thumbnailer(picture)['productlist'] + return urljoin(settings.SITE_URL, thumb.url) + + +class WidgetAPIProductList(View): + + def _get_items(self): + items, display_add_to_cart = get_grouped_items( + self.request.event, subevent=self.subevent, voucher=self.voucher + ) + grps = [] + for cat, g in item_group_by_category(items): + grps.append({ + 'id': cat.pk if cat else None, + 'name': str(cat.name) if cat else None, + 'description': str(rich_text(cat.description, safelinks=False)) if cat and cat.description else None, + 'items': [ + { + 'id': item.pk, + 'name': str(item.name), + 'picture': get_picture(item.picture) if item.picture else None, + 'description': str(rich_text(item.description, safelinks=False)) if item.description else None, + 'has_variations': item.has_variations, + 'require_voucher': item.require_voucher, + 'order_min': item.min_per_order, + 'order_max': item.order_max if not item.has_variations else None, + 'price': price_dict(item.display_price) if not item.has_variations else None, + 'min_price': item.min_price if item.has_variations else None, + 'max_price': item.max_price if item.has_variations else None, + 'free_price': item.free_price, + 'avail': [ + item.cached_availability[0], + item.cached_availability[1] if self.request.event.settings.show_quota_left else None + ] if not item.has_variations else None, + 'variations': [ + { + 'id': var.id, + 'value': str(var.value), + 'order_max': var.order_max, + 'description': str(rich_text(var.description, safelinks=False)) if var.description else None, + 'price': price_dict(var.display_price), + 'avail': [ + var.cached_availability[0], + var.cached_availability[1] if self.request.event.settings.show_quota_left else None + ], + } for var in item.available_variations + ] + + } for item in g + ] + }) + return grps, display_add_to_cart + + def dispatch(self, request, *args, **kwargs): + self.subevent = None + if request.event.has_subevents: + if 'subevent' in kwargs: + self.subevent = request.event.subevents.filter(pk=kwargs['subevent'], active=True).first() + if not self.subevent: + raise Http404() + else: + if 'subevent' in kwargs: + raise Http404() + + if 'lang' in request.GET and request.GET.get('lang') in [lc for lc, ll in settings.LANGUAGES]: + with language(request.GET.get('lang')): + return super().dispatch(request, *args, **kwargs) + else: + return super().dispatch(request, *args, **kwargs) + + def get(self, request, **kwargs): + data = { + 'currency': request.event.currency, + 'display_net_prices': request.event.settings.display_net_prices, + 'show_variations_expanded': request.event.settings.show_variations_expanded, + 'waiting_list_enabled': request.event.settings.waiting_list_enabled, + 'error': None, + 'cart_exists': False + } + + if 'cart_id' in request.GET and CartPosition.objects.filter(event=request.event, cart_id=request.GET.get('cart_id')).exists(): + data['cart_exists'] = True + + ev = self.subevent or request.event + fail = False + + if not ev.presale_is_running: + if ev.presale_has_ended: + data['error'] = 'The presale period for this event is over.' + elif request.event.settings.presale_start_show_date: + data['error'] = 'The presale for this event will start on %(date)s at %(time)s.' % { + 'date': date_format(ev.presale_start, "SHORT_DATE_FORMAT"), + 'time': date_format(ev.presale_start, "TIME_FORMAT"), + } + else: + data['error'] = 'The presale for this event has not yet started.' + + self.voucher = None + if 'voucher' in request.GET: + try: + self.voucher = request.event.vouchers.get(code=request.GET.get('voucher').strip()) + if self.voucher.redeemed >= self.voucher.max_usages: + data['error'] = error_messages['voucher_redeemed'] + fail = True + if self.voucher.valid_until is not None and self.voucher.valid_until < now(): + data['error'] = error_messages['voucher_expired'] + fail = True + + redeemed_in_carts = CartPosition.objects.filter( + Q(voucher=self.voucher) & Q(event=request.event) & + (Q(expires__gte=now()) | Q(cart_id=get_or_create_cart_id(request))) + ) + v_avail = self.voucher.max_usages - self.voucher.redeemed - redeemed_in_carts.count() + + if v_avail < 1: + data['error'] = error_messages['voucher_redeemed'] + fail = True + except Voucher.DoesNotExist: + data['error'] = error_messages['voucher_invalid'] + fail = True + + if not fail and (ev.presale_is_running or request.event.settings.show_items_outside_presale_period): + data['items_by_category'], data['display_add_to_cart'] = self._get_items() + data['display_add_to_cart'] = data['display_add_to_cart'] and ev.presale_is_running + else: + data['items_by_category'] = [] + data['display_add_to_cart'] = False + + vouchers_exist = self.request.event.get_cache().get('vouchers_exist') + if vouchers_exist is None: + vouchers_exist = self.request.event.vouchers.exists() + self.request.event.get_cache().set('vouchers_exist', vouchers_exist) + data['vouchers_exist'] = vouchers_exist + + resp = JsonResponse(data) + resp['Access-Control-Allow-Origin'] = '*' + return resp diff --git a/src/pretix/static/pretixpresale/js/ui/cart.js b/src/pretix/static/pretixpresale/js/ui/cart.js index e07360234..014cbeed2 100644 --- a/src/pretix/static/pretixpresale/js/ui/cart.js +++ b/src/pretix/static/pretixpresale/js/ui/cart.js @@ -1,33 +1,45 @@ /*global $,gettext,ngettext */ - var cart = { _deadline: null, _deadline_interval: null, _deadline_call: 0, draw_deadline: function () { + function pad(n, width, z) { + z = z || '0'; + n = n + ''; + return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n; + } + cart._deadline_call++; if ((typeof django === 'undefined' || typeof django.gettext === 'undefined') && cart._deadline_call < 5) { // Language files are not loaded yet, don't run during the first seconds return; } - var diff = Math.floor(cart._deadline.diff(moment()) / 1000 / 60); - if (diff < 0) { + var diff_minutes = Math.floor(cart._deadline.diff(moment()) / 1000 / 60); + var diff_seconds = Math.floor(cart._deadline.diff(moment()) / 1000 % 60); + if (diff_minutes < 0) { $("#cart-deadline").text(gettext("The items in your cart are no longer reserved for you.")); + $("#cart-deadline-short").text( + gettext("Cart expired") + ); window.clearInterval(cart._deadline_interval); } else { $("#cart-deadline").text(ngettext( "The items in your cart are reserved for you for one minute.", "The items in your cart are reserved for you for {num} minutes.", - diff - ).replace(/\{num\}/g, diff)); + diff_minutes + ).replace(/\{num\}/g, diff_minutes)); + $("#cart-deadline-short").text( + pad(diff_minutes.toString(), 2) + ':' + pad(diff_seconds.toString(), 2) + ); } }, init: function () { "use strict"; cart._deadline = moment($("#cart-deadline").attr("data-expires")); - cart._deadline_interval = window.setInterval(cart.draw_deadline, 2000); + cart._deadline_interval = window.setInterval(cart.draw_deadline, 500); cart.draw_deadline(); } }; diff --git a/src/pretix/static/pretixpresale/js/ui/iframe.js b/src/pretix/static/pretixpresale/js/ui/iframe.js new file mode 100644 index 000000000..33d9cc9da --- /dev/null +++ b/src/pretix/static/pretixpresale/js/ui/iframe.js @@ -0,0 +1,10 @@ +var inIframe = function () { + try { + return window.self !== window.top; + } catch (e) { + return true; + } +}; +if (inIframe()) { + document.body.classList.add('in-iframe'); +} diff --git a/src/pretix/static/pretixpresale/js/ui/main.js b/src/pretix/static/pretixpresale/js/ui/main.js index 89deb992e..c54fa4518 100644 --- a/src/pretix/static/pretixpresale/js/ui/main.js +++ b/src/pretix/static/pretixpresale/js/ui/main.js @@ -12,9 +12,9 @@ function ngettext(singular, plural, count) { } return plural; } - $(function () { "use strict"; + $("input[data-toggle=radiocollapse]").change(function () { $($(this).attr("data-parent")).find(".collapse.in").collapse('hide'); $($(this).attr("data-target")).collapse('show'); diff --git a/src/pretix/static/pretixpresale/js/widget/docready.js b/src/pretix/static/pretixpresale/js/widget/docready.js new file mode 100644 index 000000000..2bc64604d --- /dev/null +++ b/src/pretix/static/pretixpresale/js/widget/docready.js @@ -0,0 +1,81 @@ +// Pure-js replacement for $.ready +// by John Friend, https://github.com/jfriend00/docReady +// MIT License + +(function(funcName, baseObj) { + "use strict"; + // The public function name defaults to window.docReady + // but you can modify the last line of this function to pass in a different object or method name + // if you want to put them in a different namespace and those will be used instead of + // window.docReady(...) + funcName = funcName || "docReady"; + baseObj = baseObj || window; + var readyList = []; + var readyFired = false; + var readyEventHandlersInstalled = false; + + // call this when the document is ready + // this function protects itself against being called more than once + function ready() { + if (!readyFired) { + // this must be set to true before we start calling callbacks + readyFired = true; + for (var i = 0; i < readyList.length; i++) { + // if a callback here happens to add new ready handlers, + // the docReady() function will see that it already fired + // and will schedule the callback to run right after + // this event loop finishes so all handlers will still execute + // in order and no new ones will be added to the readyList + // while we are processing the list + readyList[i].fn.call(window, readyList[i].ctx); + } + // allow any closures held by these functions to free + readyList = []; + } + } + + function readyStateChange() { + if ( document.readyState === "complete" ) { + ready(); + } + } + + // This is the one public interface + // docReady(fn, context); + // the context argument is optional - if present, it will be passed + // as an argument to the callback + baseObj[funcName] = function(callback, context) { + if (typeof callback !== "function") { + throw new TypeError("callback for docReady(fn) must be a function"); + } + // if ready has already fired, then just schedule the callback + // to fire asynchronously, but right away + if (readyFired) { + setTimeout(function() {callback(context);}, 1); + return; + } else { + // add the function and context to the list + readyList.push({fn: callback, ctx: context}); + } + // if document already ready to go, schedule the ready function to run + // IE only safe when readyState is "complete", others safe when readyState is "interactive" + if (document.readyState === "complete" || (!document.attachEvent && document.readyState === "interactive")) { + setTimeout(ready, 1); + } else if (!readyEventHandlersInstalled) { + // otherwise if we don't have event handlers installed, install them + if (document.addEventListener) { + // first choice is DOMContentLoaded event + document.addEventListener("DOMContentLoaded", ready, false); + // backup is window load event + window.addEventListener("load", ready, false); + } else { + // must be IE + document.attachEvent("onreadystatechange", readyStateChange); + window.attachEvent("onload", ready); + } + readyEventHandlersInstalled = true; + } + } +})("docReady", window); +// modify this previous line to pass in your own method name +// and object for the method to be attached to diff --git a/src/pretix/static/pretixpresale/js/widget/floatformat.js b/src/pretix/static/pretixpresale/js/widget/floatformat.js new file mode 100644 index 000000000..8306ed31f --- /dev/null +++ b/src/pretix/static/pretixpresale/js/widget/floatformat.js @@ -0,0 +1,25 @@ +/*global django*/ +var roundTo = function (n, digits) { + if (digits === undefined) { + digits = 0; + } + + var multiplicator = Math.pow(10, digits); + n = parseFloat((n * multiplicator).toFixed(11)); + return Math.round(n) / multiplicator; +}; + + +var floatformat = function (val, places) { + "use strict"; + if (places === undefined) { + places = 2; + } + if (typeof val === "string") { + val = parseFloat(val); + } + var parts = roundTo(val, places).toFixed(places).split("."); + + parts[0] = parts[0].replace(new RegExp("\\B(?=(\\d{" + django.get_format("NUMBER_GROUPING") + "})+(?!\\d))", "g"), django.get_format("THOUSAND_SEPARATOR")); + return parts[0] + django.get_format("DECIMAL_SEPARATOR") + parts[1]; +}; diff --git a/src/pretix/static/pretixpresale/js/widget/widget.js b/src/pretix/static/pretixpresale/js/widget/widget.js new file mode 100644 index 000000000..94f82ac57 --- /dev/null +++ b/src/pretix/static/pretixpresale/js/widget/widget.js @@ -0,0 +1,680 @@ +/*global siteglobals, module, lang, django*/ +/* PRETIX WIDGET BEGINS HERE */ +/* This is embedded in an isolation wrapper that exposes siteglobals as the global + scope. */ + +var Vue = module.exports; + +var strings = { + 'sold_out': django.pgettext('widget', 'Sold out'), + 'buy': django.pgettext('widget', 'Buy'), + 'reserved': django.pgettext('widget', 'Reserved'), + 'free': django.pgettext('widget', 'FREE'), + 'price_from': django.pgettext('widget', 'from %(currency)s %(price)s'), + 'tax_incl': django.pgettext('widget', 'incl. %(rate)s% %(taxname)s'), + 'tax_plus': django.pgettext('widget', 'plus %(rate)s% %(taxname)s'), + 'quota_left': django.pgettext('widget', 'currently available: %s'), + 'voucher_required': django.pgettext('widget', 'Only available with a voucher'), + 'order_min': django.pgettext('widget', 'minimum amount to order: %s'), + 'exit': django.pgettext('widget', 'Close ticket shop'), + 'loading_error': django.pgettext('widget', 'The ticket shop could not be loaded.'), + 'cart_error': django.pgettext('widget', 'The cart could not be created. Please try again later'), + 'waiting_list': django.pgettext('widget', 'Waiting list'), + 'cart_exists': django.pgettext('widget', 'You currently have an active cart for this event. If you select more' + + ' products, they will be added to your existing cart. Click on this message to continue checkout with your' + + ' cart.'), + 'poweredby': django.pgettext('widget', 'ticketing powered by pretix'), + 'redeem_voucher': django.pgettext('widget', 'Redeem a voucher'), + 'redeem': django.pgettext('widget', 'Redeem'), + 'voucher_code': django.pgettext('widget', 'Voucher code'), + 'close': django.pgettext('widget', 'Close'), + 'continue': django.pgettext('widget', 'Continue'), +}; + +var setCookie = function (cname, cvalue, exdays) { + var d = new Date(); + d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000)); + var expires = "expires=" + d.toUTCString(); + document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/"; +}; +var getCookie = function (name) { + var value = "; " + document.cookie; + var parts = value.split("; " + name + "="); + if (parts.length == 2) return parts.pop().split(";").shift() || null; + else return null; +}; + +/* HTTP API Call helpers */ +var api = { + '_getXHR': function () { + try { + return new window.XMLHttpRequest(); + } catch (e) { + // explicitly bubble up the exception if not found + return new window.ActiveXObject('Microsoft.XMLHTTP'); + } + }, + + '_getJSON': function (endpoint, callback, err_callback) { + var xhr = api._getXHR(); + xhr.open("GET", endpoint, true); + xhr.onload = function (e) { + if (xhr.readyState === 4) { + if (xhr.status === 200) { + callback(JSON.parse(xhr.responseText)); + } else { + console.error(xhr.statusText); + } + } + }; + xhr.onerror = function (e) { + console.error(xhr.statusText); + err_callback(xhr, e); + }; + xhr.send(null); + }, + + '_postFormJSON': function (endpoint, form, callback, err_callback) { + var params = [].filter.call(form.elements, function (el) { + return (el.type !== 'checkbox' && el.type !== 'radio') || el.checked; + }) + .filter(function (el) { + return !!el.name && !!el.value; + }) + .filter(function (el) { + return !el.disabled; + }) + .map(function (el) { + return encodeURIComponent(el.name) + '=' + encodeURIComponent(el.value); + }).join('&'); + + var xhr = api._getXHR(); + xhr.open("POST", endpoint, true); + xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + xhr.onload = function (e) { + if (xhr.readyState === 4) { + if (xhr.status === 200) { + callback(JSON.parse(xhr.responseText)); + } else { + console.error(xhr.statusText); + } + } + }; + xhr.onerror = function (e) { + console.error(xhr.statusText); + err_callback(xhr, e); + }; + xhr.send(params); + } +}; + +var makeid = function (length) { + var text = ""; + var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + + for (var i = 0; i < length; i++) { + text += possible.charAt(Math.floor(Math.random() * possible.length)); + } + + return text; +}; + +var site_is_secure = function () { + return /https.*/.test(document.location.protocol) +}; + +var widget_id = makeid(16); + +/* Vue Components */ +Vue.component('availbox', { + template: ('
    ' + + '
    ' + + '' + strings.voucher_required + '' + + '
    ' + + '
    ' + + strings.reserved + + '
    ' + + '
    ' + + strings.sold_out + + '
    ' + + '
    ' + + '' + strings.waiting_list + '' + + '
    ' + + '
    ' + + '' + + '' + + '
    ' + + '
    '), + props: { + item: Object, + variation: Object + }, + computed: { + input_name: function () { + if (this.item.has_variations) { + return 'variation_' + this.item.id + '_' + this.variation.id; + } else { + return 'item_' + this.item.id; + } + }, + order_max: function () { + return this.item.has_variations ? this.variation.order_max : this.item.order_max; + }, + avail: function () { + return this.item.has_variations ? this.variation.avail : this.item.avail; + }, + waiting_list_show: function () { + return this.avail[0] < 100 && this.$root.waiting_list_enabled; + }, + waiting_list_url: function () { + if (this.item.has_variations) { + return this.$root.event_url + 'w/' + widget_id + '/waitinglist/?item=' + this.item.id + '&var=' + this.variation.id; + } else { + return this.$root.event_url + 'w/' + widget_id + '/waitinglist/?item=' + this.item.id; + } + } + } +}); +Vue.component('pricebox', { + template: ('
    ' + + '{{ priceline }}' + + '
    ' + + '{{ $root.currency }} ' + + '' + + '
    ' + + '' + + '{{ taxline }}' + + '' + + '
    '), + props: { + price: Object, + free_price: Boolean, + field_name: String + }, + computed: { + display_price: function () { + if (this.$root.display_net_prices) { + return floatformat(this.price.net, 2); + } else { + return floatformat(this.price.gross, 2); + } + }, + priceline: function () { + if (this.price.gross === "0.00") { + return strings.free; + } else { + return this.$root.currency + " " + floatformat(this.display_price, 2); + } + }, + taxline: function () { + if (this.$root.display_net_prices) { + return django.interpolate(strings.tax_plus, { + 'rate': floatformat(this.price.rate, 2), + 'taxname': this.price.name + }, true); + } else { + return django.interpolate(strings.tax_incl, { + 'rate': floatformat(this.price.rate, 2), + 'taxname': this.price.name + }, true); + } + } + } +}); +Vue.component('variation', { + template: ('
    ' + + '
    ' + + + '
    ' + + '
    ' + + '{{ variation.value }}' + + '
    ' + + '

    ' + + '{{ quota_left_str }}' + + '

    ' + + '
    ' + + '
    ' + + + '
    ' + + '' + + '' + + '
    ' + + '
    ' + + '' + + '
    ' + + + '
    ' + + '
    ' + + '
    '), + props: { + variation: Object, + item: Object, + }, + computed: { + quota_left_str: function () { + return django.interpolate(strings["quota_left"], [this.variation.avail[1]]); + }, + } +}); +Vue.component('item', { + template: ('
    ' + + '
    ' + + + '
    ' + + '' + + '
    ' + + '' + + '{{ item.name }}' + + '' + + '{{ item.name }}' + + '
    ' + + '

    ' + + '{{ min_order_str }}' + + '

    ' + + '

    ' + + '{{ quota_left_str }}' + + '

    ' + + '
    ' + + '
    ' + + + '
    ' + + '' + + '' + + '
    {{ pricerange }}
    ' + + '
    ' + + '
    ' + + 'See variations' + + '' + + '
    ' + + + '
    ' + + '
    ' + + + '
    ' + + '' + + '' + + '
    ' + + + '
    '), + props: { + item: Object, + }, + data: function () { + return { + expanded: this.$root.show_variations_expanded + }; + }, + methods: { + expand: function () { + this.expanded = !this.expanded; + } + }, + computed: { + classObject: function () { + return { + 'pretix-widget-item': true, + 'pretix-widget-item-with-picture': !!this.item.picture, + 'pretix-widget-item-with-variations': this.item.has_variations + } + }, + varClasses: function () { + return { + 'pretix-widget-item-variations': true, + 'pretix-widget-item-variations-expanded': this.expanded, + } + }, + min_order_str: function () { + return django.interpolate(strings["order_min"], [this.item.order_min]); + }, + quota_left_str: function () { + return django.interpolate(strings["quota_left"], [this.item.avail[1]]); + }, + show_toggle: function () { + return this.item.has_variations && !this.$root.show_variations_expanded; + }, + pricerange: function () { + if (this.item.min_price !== this.item.max_price || this.item.free_price) { + return django.interpolate(strings.price_from, { + 'currency': this.$root.currency, + 'price': floatformat(this.$root.price, 2) + }, true); + } else if (this.item.min_price === "0.00" && this.item.max_price === "0.00") { + return strings.free; + } else { + return this.$root.currency + " " + floatformat(this.item.min_price, 2); + } + }, + } +}); +Vue.component('category', { + template: ('
    ' + + '

    {{ category.name }}

    ' + + '
    ' + + '
    ' + + '
    ' + + '' + + '
    ' + + '
    '), + props: { + category: Object + } +}); +Vue.component('pretix-widget', { + template: ('
    ' + + '
    ' + + '
    ' + + '' + + '
    ' + + '' + + '' + + '' + + '
    {{ $root.error }}
    ' + + '
    ' + + strings['cart_exists'] + + '
    ' + + '' + + '
    ' + + '' + + '
    ' + + '' + + '
    ' + + '
    ' + + '

    '+ strings['redeem_voucher'] +'

    ' + + '
    ' + + '' + + '
    ' + + '' + + '' + + '
    ' + + '' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + strings.poweredby + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '' + + '
    ' + + '
    ' + + '' + + '
    X
    ' + + '
    ' + + '
    ' + + '
    ' + + '' + + '
    ' + + '

    {{ $root.error_message }}

    ' + + '

    ' + + '

    ' + + '
    ' + + '    ' + + '' + + '
    ' + + '
    ' + + '
    ' + ), + data: function () { + return { + async_task_id: null, + async_task_check_url: null, + async_task_timeout: null, + async_task_interval: 100, + voucher: null, + } + }, + methods: { + buy: function (event) { + if (this.$root.useIframe) { + event.preventDefault(); + } else { + return; + } + var url = this.$root.formTarget + "&locale=" + lang + "&ajax=1"; + this.$root.frame_loading = true; + this.async_task_interval = 100; + api._postFormJSON(url, this.$refs.form, this.buy_callback, this.buy_error_callback); + }, + buy_error_callback: function (xhr, data) { + this.$root.error_message = strings['cart_error']; + this.$root.frame_loading = false; + }, + buy_check_error_callback: function (xhr, data) { + if (xhr.status == 200 || (xhr.status >= 400 && xhr.status < 500)) { + this.$root.error_message = strings['cart_error']; + this.$root.frame_loading = false; + } else { + this.async_task_timeout = window.setTimeout(this.buy_check, 1000); + } + }, + buy_callback: function (data) { + if (data.redirect) { + var iframe = this.$refs['frame-container'].children[0]; + this.$root.cart_id = data.cart_id; + setCookie(this.$root.cookieName, data.cart_id, 30); + if (data.redirect.substr(0, 1) === '/') { + data.redirect = this.$root.event_url.replace(/^([^\/]+:\/\/[^\/]+)\/.*$/, "$1") + data.redirect; + } + var url = data.redirect + '?iframe=1&locale=' + lang + '&take_cart_id=' + this.$root.cart_id; + if (data.success === false) { + url = url.replace(/checkout\/start/g, ""); + this.$root.error_message = data.message; + if (data.has_cart) { + this.$root.error_url_after = url; + } + this.$root.frame_loading = false; + } else { + iframe.src = url; + } + } else { + this.async_task_id = data.async_id; + if (data.check_url) { + this.async_task_check_url = this.$root.event_url.replace(/^([^\/]+:\/\/[^\/]+)\/.*$/, "$1") + data.check_url; + } + this.async_task_timeout = window.setTimeout(this.buy_check, this.async_task_interval); + this.async_task_interval = 250; + } + }, + buy_check: function () { + api._getJSON(this.async_task_check_url, this.buy_callback, this.buy_check_error_callback); + }, + errorContinue: function () { + var iframe = this.$refs['frame-container'].children[0]; + iframe.src = this.$root.error_url_after; + this.$root.frame_loading = true; + this.$root.error_message = null; + this.$root.error_url_after = null; + }, + errorClose: function () { + this.$root.error_message = null; + this.$root.error_url_after = null; + }, + redeem: function () { + if (this.$root.useIframe) { + event.preventDefault(); + } else { + return; + } + var redirect_url = this.$root.voucherFormTarget + '&voucher=' + this.voucher + '&subevent=' + this.$root.subevent; + var iframe = this.$refs['frame-container'].children[0]; + this.$root.frame_loading = true; + iframe.src = redirect_url; + }, + resume: function () { + var redirect_url = this.$root.event_url + 'w/' + widget_id + '/checkout/start?iframe=1&locale=' + lang + '&take_cart_id=' + this.$root.cart_id; + if (this.$root.useIframe) { + var iframe = this.$refs['frame-container'].children[0]; + this.$root.frame_loading = true; + iframe.src = redirect_url; + } else { + window.open(redirect_url); + } + }, + close: function () { + this.$root.frame_shown = false; + }, + iframeLoaded: function () { + if (this.$root.frame_loading) { + this.$root.frame_loading = false; + this.$root.frame_shown = true; + } + } + }, + computed: { + frameClasses: function () { + return { + 'pretix-widget-frame-holder': true, + 'pretix-widget-frame-shown': this.$root.frame_shown || this.$root.frame_loading, + }; + }, + alertClasses: function () { + return { + 'pretix-widget-alert-holder': true, + 'pretix-widget-alert-shown': this.$root.error_message, + }; + }, + } +}); + +/* Function to create the actual Vue instances */ +var create_widget = function (element) { + var event_url = element.attributes.event.value; + if (!event_url.match(/\/$/)) { + event_url += "/"; + } + var voucher = element.attributes.voucher ? element.attributes.voucher.value : null; + var subevent = element.attributes.subevent ? element.attributes.subevent.value : null; + var skip_ssl = element.attributes["skip-ssl-check"] ? true : false; + + var app = new Vue({ + el: element, + data: function () { + return { + event_url: event_url, + subevent: subevent, + categories: null, + currency: null, + voucher_code: voucher, + display_net_prices: false, + show_variations_expanded: false, + error: null, + display_add_to_cart: false, + loading: 1, + widget_id: 'pretix-widget-' + widget_id, + frame_loading: false, + frame_shown: false, + error_message: null, + error_url_after: null, + vouchers_exist: false, + cart_exists: false + } + }, + created: function () { + var url; + if (subevent) { + url = event_url + subevent + '/widget/product_list?lang=' + lang; + } else { + url = event_url + 'widget/product_list?lang=' + lang; + } + var cart_id = getCookie(this.cookieName); + if (voucher) { + url += '&voucher=' + escape(voucher); + } + if (cart_id) { + url += "&cart_id=" + cart_id; + } + api._getJSON(url, function (data) { + app.categories = data.items_by_category; + app.currency = data.currency; + app.display_net_prices = data.display_net_prices; + app.error = data.error; + app.display_add_to_cart = data.display_add_to_cart; + app.waiting_list_enabled = data.waiting_list_enabled; + app.show_variations_expanded = data.show_variations_expanded; + app.cart_id = cart_id; + app.cart_exists = data.cart_exists; + app.vouchers_exist = data.vouchers_exist; + app.loading--; + }, function (error) { + app.categories = []; + app.currency = ''; + app.error = strings['loading_error']; + app.loading--; + }); + }, + computed: { + cookieName: function () { + return "pretix_widget_" + this.event_url.replace(/[^a-zA-Z0-9]+/g, "_"); + }, + voucherFormTarget: function () { + var form_target = this.event_url + 'w/' + widget_id + '/redeem?iframe=1&locale=' + lang; + if (getCookie(this.cookieName)) { + form_target += "&take_cart_id=" + getCookie(this.cookieName); + } + if (this.subevent) { + form_target += "&subevent=" + this.subevent; + } + return form_target; + }, + formTarget: function () { + var checkout_url = "/" + this.event_url.replace(/^[^\/]+:\/\/([^\/]+)\//, "") + "w/" + widget_id + "/checkout/start"; + var form_target = this.event_url + 'w/' + widget_id + '/cart/add?iframe=1&next=' + checkout_url; + if (getCookie(this.cookieName)) { + form_target += "&take_cart_id=" + getCookie(this.cookieName); + } + return form_target; + }, + useIframe: function () { + return window.innerWidth >= 800 && (skip_ssl || site_is_secure()); + } + }, + methods: { + open_link_in_frame: function (event) { + var url = event.target.attributes.href.value; + this.$children[0].$refs['frame-container'].children[0].src = url; + this.frame_loading = true; + } + } + }); + return app; +}; + +/* Find all widgets on the page and render them */ +widgetlist = []; +document.createElement("pretix-widget"); +docReady(function () { + var widgets = document.querySelectorAll("pretix-widget"); + var wlength = widgets.length; + + for (var i = 0; i < wlength; i++) { + var widget = widgets[i]; + widgetlist.push(create_widget(widget)); + } +}); + +/* Set a global variable for debugging. In DEBUG mode, siteglobals will be window, otherwise it will be something + unnamed. */ +siteglobals.pretixwidget = { + 'Vue': Vue, + 'widgets': widgetlist +}; diff --git a/src/pretix/static/pretixpresale/scss/_cart.scss b/src/pretix/static/pretixpresale/scss/_cart.scss index 2f313a1c9..9f1225137 100644 --- a/src/pretix/static/pretixpresale/scss/_cart.scss +++ b/src/pretix/static/pretixpresale/scss/_cart.scss @@ -81,3 +81,10 @@ } } } + +#cart-deadline-short { + font-variant-numeric: tabular-nums; +} +.cart-modify { + margin-left: 10px; +} diff --git a/src/pretix/static/pretixpresale/scss/_iframe.scss b/src/pretix/static/pretixpresale/scss/_iframe.scss new file mode 100644 index 000000000..c240402c6 --- /dev/null +++ b/src/pretix/static/pretixpresale/scss/_iframe.scss @@ -0,0 +1,13 @@ +.in-iframe .page-header { + display: none; +} +.in-iframe .container { + padding-top: 10px; +} +.iframe-only, +.in-iframe .iframe-hidden { + display: none; +} +.in-iframe .iframe-only { + display: block; +} diff --git a/src/pretix/static/pretixpresale/scss/main.scss b/src/pretix/static/pretixpresale/scss/main.scss index a33ff2092..2299c1d86 100644 --- a/src/pretix/static/pretixpresale/scss/main.scss +++ b/src/pretix/static/pretixpresale/scss/main.scss @@ -201,6 +201,12 @@ body.loading .container { text-decoration: none; } -.panel-title a[data-toggle="collapse"]:hover { +.panel-default .panel-title a[data-toggle="collapse"]:hover { background-color: #eeeeee; } + +.panel-primary .panel-title a[data-toggle="collapse"]:hover { + background-color: darken($btn-primary-bg, 10%); +} + +@import "_iframe.scss"; diff --git a/src/pretix/static/pretixpresale/scss/widget.scss b/src/pretix/static/pretixpresale/scss/widget.scss new file mode 100644 index 000000000..4bb890e9f --- /dev/null +++ b/src/pretix/static/pretixpresale/scss/widget.scss @@ -0,0 +1,531 @@ +@import "_variables.scss"; +@import "../../bootstrap/scss/bootstrap/variables"; +@import "../../bootstrap/scss/bootstrap/mixins"; + +.pretix-widget, .pretix-widget-alert-box { + a { + color: $link-color; + text-decoration: none; + + &:hover, + &:focus { + color: $link-hover-color; + text-decoration: $link-hover-decoration; + } + &:focus { + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; + } + } + img { + border: 0; + } + b, strong { + font-weight: bold; + } + h3 { + font-size: $font-size-h3; + font-weight: bold; + padding: 0 15px; + } + button, input[type="button"] { + overflow: visible; + text-transform: none; + cursor: pointer; + display: inline-block; + margin-bottom: 0; + text-align: center; + vertical-align: middle; + touch-action: manipulation; + background-image: none; + border: 1px solid transparent; + white-space: nowrap; + @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base); + @include user-select(none); + @include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border); + + &, + &:active, + &.active { + &:focus, + &.focus { + @include tab-focus; + } + } + } + input[type="text"], input[type="number"] { + line-height: normal; + border: 1px solid $input-border; + border-radius: $input-border-radius; + height: $input-height-base; + padding: $padding-base-vertical $padding-base-horizontal; + color: $input-color; + background-color: $input-bg; + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075)); + @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s); + @include placeholder; + $color-rgba: rgba(red($input-border-focus), green($input-border-focus), blue($input-border-focus), .6); + + &:focus { + border-color: $input-border-focus; + outline: 0; + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px $color-rgba); + } + } + input[type="checkbox"], + input[type="radio"] { + box-sizing: border-box; // 1 + padding: 0; // 2 + &:focus { + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; + } + } +} + +.pretix-widget { + margin: 10px 0; + padding: 0 10px; + border: 1px solid #ccc; + position: relative; + min-height: 208px; + border-radius: $input-border-radius; + + + .pretix-widget-clickable { + cursor: pointer; + } + + .pretix-widget-info-message { + padding: 10px; + text-align: center; + margin: 10px 0; + background-color: $alert-info-bg; + border-color: $alert-info-border; + color: $alert-info-text; + border-radius: $alert-border-radius; + } + + .pretix-widget-error-message { + padding: 10px; + text-align: center; + margin: 10px 0; + background-color: $alert-danger-bg; + border-color: $alert-danger-border; + color: $alert-danger-text; + border-radius: $alert-border-radius; + } + + .pretix-widget-loading { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background: rgba(255, 255, 255, .8); + text-align: center; + } + + @-moz-keyframes pretix-widget-spin { + 100% { + -moz-transform: rotate(360deg); + } + } + + @-webkit-keyframes pretix-widget-spin { + 100% { + -webkit-transform: rotate(360deg); + } + } + + @keyframes pretix-widget-spin { + 100% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } + } + + .pretix-widget-loading svg { + margin: 40px; + -webkit-animation: pretix-widget-spin 6s linear infinite; + -moz-animation: pretix-widget-spin 6s linear infinite; + animation: pretix-widget-spin 6s linear infinite; + } + + .pretix-widget-item-row, .pretix-widget-category { + clear: both; + } + + .pretix-widget-item-title { + font-weight: bold; + } + + .pretix-widget-item-row { + padding: 10px 0; + } + + .pretix-widget-category { + margin: 10px 0; + } + + .pretix-widget-category-description { + padding: 0 15px; + } + + .pretix-widget-category-name { + margin: 10px 0 0 0; + } + + .pretix-widget-item-info-col { + width: 50%; + float: left; + padding: 0 15px; + box-sizing: border-box; + } + + .pretix-widget-item-price-col, .pretix-widget-item-availability-col { + width: 25%; + float: left; + padding: 0 15px; + box-sizing: border-box; + } + + .pretix-widget-item-description p, .pretix-widget-item-meta { + margin: 0; + } + + .pretix-widget-item-price-col { + text-align: right; + } + + .pretix-widget-clear { + clear: both; + } + + .pretix-widget-category-description p { + margin: 0 0 10px; + } + + .pretix-widget-pricebox-tax { + display: block; + } + + .pretix-widget-item-count-multiple { + display: block; + width: 100%; + box-sizing: border-box; + padding: 5px; + text-align: center; + } + + .pretix-widget-pricebox-price-input { + display: inline; + width: 100px; + box-sizing: border-box; + text-align: right; + } + + .pretix-widget-item-count-single-label { + display: block; + text-align: center; + width: 100%; + } + + .pretix-widget-attribution { + padding: 10px 15px; + text-align: center; + font-size: 12px; + } + + .pretix-widget-item-picture { + width: 60px; + height: 60px; + margin-right: 10px; + float: left; + } + + .pretix-widget-action { + margin-left: 75%; + width: 25%; + padding: 0 15px; + box-sizing: border-box; + } + + .pretix-widget-action button { + width: 100%; + } + + .pretix-widget-voucher-headline { + margin: 10px 0 0 0; + } + + .pretix-widget-voucher-input-wrap { + padding: 0 15px; + width: 75%; + box-sizing: border-box; + float: left; + } + + .pretix-widget-voucher input { + width: 100%; + box-sizing: border-box; + } + + .pretix-widget-voucher-button-wrap { + padding: 0 15px; + width: 25%; + box-sizing: border-box; + float: left; + } + + .pretix-widget-voucher button { + width: 100%; + } + + .pretix-widget-item-with-picture .pretix-widget-main-item-row .pretix-widget-item-title-and-description { + margin-left: 70px; + } + + .pretix-widget-item-availability-col { + text-align: center; + } + + .pretix-widget-availability-gone { + font-weight: bold; + color: $brand-danger; + text-transform: uppercase; + } + + .pretix-widget-availability-unavailable { + color: $brand-danger; + } + + .pretix-widget-item-variations { + overflow: hidden; + max-height: 0; + padding-top: 0; + padding-bottom: 0; + margin-top: 0; + margin-bottom: 0; + -moz-transition-duration: 0.5s; + -webkit-transition-duration: 0.5s; + -o-transition-duration: 0.5s; + transition-duration: 0.5s; + -moz-transition-timing-function: cubic-bezier(0, 1, 0.5, 1); + -webkit-transition-timing-function: cubic-bezier(0, 1, 0.5, 1); + -o-transition-timing-function: cubic-bezier(0, 1, 0.5, 1); + transition-timing-function: cubic-bezier(0, 1, 0.5, 1); + } + + .pretix-widget-item-variations-expanded { + -moz-transition-duration: 0.5s; + -webkit-transition-duration: 0.5s; + -o-transition-duration: 0.5s; + transition-duration: 0.5s; + -moz-transition-timing-function: ease-in; + -webkit-transition-timing-function: ease-in; + -o-transition-timing-function: ease-in; + transition-timing-function: ease-in; + max-height: 1000px; + overflow: hidden; + } +} + +@keyframes pretix-widget-bounce-in { + 0% { + transform: scale(0); + } + 50% { + transform: scale(1.5); + } + 100% { + transform: scale(1); + } +} +.pretix-widget-alert-holder { + position: fixed; + left: 0; + top: 0; + width: 100%; + height: 100%; + background: rgba(255, 255, 255, 0.8); + z-index: 16777271; + visibility: hidden; + opacity: 0; + transition: opacity 0.5s, visibility 0.5s; + + &.pretix-widget-alert-shown { + visibility: visible; + opacity: 1; + transition: opacity 0.5s, visibility 0.5s; + } + + .bounce-enter-active { + animation: pretix-widget-bounce-in .5s; + } + .bounce-leave-active { + animation: pretix-widget-bounce-in .5s reverse; + } + + .pretix-widget-alert-box { + position: fixed; + left: 50%; + width: 600px; + margin-left: -300px; + top: 100px; + background: white; + border-radius: 5px 5px 5px 5px; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + box-shadow: 0 4px 18px 0 rgba(0, 0, 0, 0.1), 0 6px 20px 0 rgba(0, 0, 0, 0.09); + -webkit-box-shadow: 0 4px 18px 0 rgba(0, 0, 0, 0.1), 0 6px 20px 0 rgba(0, 0, 0, 0.09); + -moz-box-shadow: 0 4px 18px 0 rgba(0, 0, 0, 0.1), 0 6px 20px 0 rgba(0, 0, 0, 0.09); + box-sizing: border-box; + padding: 42px 20px 20px 20px; + text-align: center; + font-size: 20px; + + p:first-child { + margin-top: 0; + } + p:last-child { + margin-bottom: 0; + } + } + .pretix-widget-alert-icon { + position: fixed; + left: 50%; + width: 64px; + margin-left: -32px; + top: 68px; + } +} +.pretix-widget-frame-holder { + position: fixed; + left: 0; + top: 0; + width: 100%; + height: 100%; + background: rgba(255, 255, 255, 0.8); + z-index: 16777271; + visibility: hidden; + opacity: 0; + transition: opacity 0.5s, visibility 0.5s; + + .pretix-widget-frame-loading { + text-align: center; + display: flex; + align-items: center; + justify-content: center; + height: 100%; + width: 100%; + position: fixed; + left: 0; + top: 0; + } + + .pretix-widget-frame-loading svg { + margin: 40px; + -webkit-animation: pretix-widget-spin 6s linear infinite; + -moz-animation: pretix-widget-spin 6s linear infinite; + animation: pretix-widget-spin 6s linear infinite; + } + + &.pretix-widget-frame-shown { + visibility: visible; + opacity: 1; + transition: opacity 0.5s, visibility 0.5s; + } + + .pretix-widget-frame-inner { + position: fixed; + left: 10%; + width: 80%; + height: 80%; + top: 10%; + background: white; + border-radius: 5px 5px 5px 5px; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + box-shadow: 0 4px 18px 0 rgba(0, 0, 0, 0.1), 0 6px 20px 0 rgba(0, 0, 0, 0.09); + -webkit-box-shadow: 0 4px 18px 0 rgba(0, 0, 0, 0.1), 0 6px 20px 0 rgba(0, 0, 0, 0.09); + -moz-box-shadow: 0 4px 18px 0 rgba(0, 0, 0, 0.1), 0 6px 20px 0 rgba(0, 0, 0, 0.09); + box-sizing: border-box; + padding: 10px; + } + + .pretix-widget-frame-close { + position: fixed; + right: 10%; + top: 10%; + width: 24px; + height: 24px; + background: $brand-primary; + margin: -12px -12px 0 0; + border-radius: 12px; + -moz-border-radius: 12px; + -webkit-border-radius: 12px; + text-align: center; + } + + .pretix-widget-frame-close a { + color: white; + font-weight: bold; + font-family: sans-serif; + text-decoration: none; + padding: 4px 0; + display: block; + } + + .pretix-widget-frame-inner iframe { + width: 100% !important; + height: 100% !important; + } +} + +.pretix-widget-primary-color { + /* in SVG */ + fill: $brand-primary; +} + +@media (max-width: $screen-sm-max) { + .pretix-widget { + .pretix-widget-item-info-col { + width: 100%; + float: none; + margin-bottom: 5px; + } + .pretix-widget-item-price-col, .pretix-widget-item-availability-col { + width: 50%; + } + .pretix-widget-action { + width: 100%; + margin-left: 0; + } + .pretix-widget-voucher-input-wrap { + width: 100%; + float: none; + } + .pretix-widget-voucher-button-wrap { + width: 100%; + float: none; + margin-top: 10px; + } + } +} + +@media (min-width: 1200px) { + .pretix-widget-frame-holder { + .pretix-widget-frame-inner { + left: 50%; + margin-left: -540px; + width: 1080px; + } + .pretix-widget-frame-close { + left: 50%; + margin-left: 528px; + } + } +} diff --git a/src/pretix/static/vuejs/vue.js b/src/pretix/static/vuejs/vue.js new file mode 100644 index 000000000..6ecd1b691 --- /dev/null +++ b/src/pretix/static/vuejs/vue.js @@ -0,0 +1,10057 @@ +/*! + * Vue.js v2.4.0 + * (c) 2014-2017 Evan You + * Released under the MIT License. + */ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : + typeof define === 'function' && define.amd ? define(factory) : + (global.Vue = factory()); +}(this, (function () { 'use strict'; + +/* */ + +// these helpers produces better vm code in JS engines due to their +// explicitness and function inlining +function isUndef (v) { + return v === undefined || v === null +} + +function isDef (v) { + return v !== undefined && v !== null +} + +function isTrue (v) { + return v === true +} + +function isFalse (v) { + return v === false +} + +/** + * Check if value is primitive + */ +function isPrimitive (value) { + return typeof value === 'string' || typeof value === 'number' +} + +/** + * Quick object check - this is primarily used to tell + * Objects from primitive values when we know the value + * is a JSON-compliant type. + */ +function isObject (obj) { + return obj !== null && typeof obj === 'object' +} + +var _toString = Object.prototype.toString; + +/** + * Strict object type check. Only returns true + * for plain JavaScript objects. + */ +function isPlainObject (obj) { + return _toString.call(obj) === '[object Object]' +} + +function isRegExp (v) { + return _toString.call(v) === '[object RegExp]' +} + +/** + * Check if val is a valid array index. + */ +function isValidArrayIndex (val) { + var n = parseFloat(val); + return n >= 0 && Math.floor(n) === n && isFinite(val) +} + +/** + * Convert a value to a string that is actually rendered. + */ +function toString (val) { + return val == null + ? '' + : typeof val === 'object' + ? JSON.stringify(val, null, 2) + : String(val) +} + +/** + * Convert a input value to a number for persistence. + * If the conversion fails, return original string. + */ +function toNumber (val) { + var n = parseFloat(val); + return isNaN(n) ? val : n +} + +/** + * Make a map and return a function for checking if a key + * is in that map. + */ +function makeMap ( + str, + expectsLowerCase +) { + var map = Object.create(null); + var list = str.split(','); + for (var i = 0; i < list.length; i++) { + map[list[i]] = true; + } + return expectsLowerCase + ? function (val) { return map[val.toLowerCase()]; } + : function (val) { return map[val]; } +} + +/** + * Check if a tag is a built-in tag. + */ +var isBuiltInTag = makeMap('slot,component', true); + +/** + * Check if a attribute is a reserved attribute. + */ +var isReservedAttribute = makeMap('key,ref,slot,is'); + +/** + * Remove an item from an array + */ +function remove (arr, item) { + if (arr.length) { + var index = arr.indexOf(item); + if (index > -1) { + return arr.splice(index, 1) + } + } +} + +/** + * Check whether the object has the property. + */ +var hasOwnProperty = Object.prototype.hasOwnProperty; +function hasOwn (obj, key) { + return hasOwnProperty.call(obj, key) +} + +/** + * Create a cached version of a pure function. + */ +function cached (fn) { + var cache = Object.create(null); + return (function cachedFn (str) { + var hit = cache[str]; + return hit || (cache[str] = fn(str)) + }) +} + +/** + * Camelize a hyphen-delimited string. + */ +var camelizeRE = /-(\w)/g; +var camelize = cached(function (str) { + return str.replace(camelizeRE, function (_, c) { return c ? c.toUpperCase() : ''; }) +}); + +/** + * Capitalize a string. + */ +var capitalize = cached(function (str) { + return str.charAt(0).toUpperCase() + str.slice(1) +}); + +/** + * Hyphenate a camelCase string. + */ +var hyphenateRE = /([^-])([A-Z])/g; +var hyphenate = cached(function (str) { + return str + .replace(hyphenateRE, '$1-$2') + .replace(hyphenateRE, '$1-$2') + .toLowerCase() +}); + +/** + * Simple bind, faster than native + */ +function bind (fn, ctx) { + function boundFn (a) { + var l = arguments.length; + return l + ? l > 1 + ? fn.apply(ctx, arguments) + : fn.call(ctx, a) + : fn.call(ctx) + } + // record original fn length + boundFn._length = fn.length; + return boundFn +} + +/** + * Convert an Array-like object to a real Array. + */ +function toArray (list, start) { + start = start || 0; + var i = list.length - start; + var ret = new Array(i); + while (i--) { + ret[i] = list[i + start]; + } + return ret +} + +/** + * Mix properties into target object. + */ +function extend (to, _from) { + for (var key in _from) { + to[key] = _from[key]; + } + return to +} + +/** + * Merge an Array of Objects into a single Object. + */ +function toObject (arr) { + var res = {}; + for (var i = 0; i < arr.length; i++) { + if (arr[i]) { + extend(res, arr[i]); + } + } + return res +} + +/** + * Perform no operation. + * Stubbing args to make Flow happy without leaving useless transpiled code + * with ...rest (https://flow.org/blog/2017/05/07/Strict-Function-Call-Arity/) + */ +function noop (a, b, c) {} + +/** + * Always return false. + */ +var no = function (a, b, c) { return false; }; + +/** + * Return same value + */ +var identity = function (_) { return _; }; + +/** + * Generate a static keys string from compiler modules. + */ +function genStaticKeys (modules) { + return modules.reduce(function (keys, m) { + return keys.concat(m.staticKeys || []) + }, []).join(',') +} + +/** + * Check if two values are loosely equal - that is, + * if they are plain objects, do they have the same shape? + */ +function looseEqual (a, b) { + var isObjectA = isObject(a); + var isObjectB = isObject(b); + if (isObjectA && isObjectB) { + try { + return JSON.stringify(a) === JSON.stringify(b) + } catch (e) { + // possible circular reference + return a === b + } + } else if (!isObjectA && !isObjectB) { + return String(a) === String(b) + } else { + return false + } +} + +function looseIndexOf (arr, val) { + for (var i = 0; i < arr.length; i++) { + if (looseEqual(arr[i], val)) { return i } + } + return -1 +} + +/** + * Ensure a function is called only once. + */ +function once (fn) { + var called = false; + return function () { + if (!called) { + called = true; + fn.apply(this, arguments); + } + } +} + +var SSR_ATTR = 'data-server-rendered'; + +var ASSET_TYPES = [ + 'component', + 'directive', + 'filter' +]; + +var LIFECYCLE_HOOKS = [ + 'beforeCreate', + 'created', + 'beforeMount', + 'mounted', + 'beforeUpdate', + 'updated', + 'beforeDestroy', + 'destroyed', + 'activated', + 'deactivated' +]; + +/* */ + +var config = ({ + /** + * Option merge strategies (used in core/util/options) + */ + optionMergeStrategies: Object.create(null), + + /** + * Whether to suppress warnings. + */ + silent: false, + + /** + * Show production mode tip message on boot? + */ + productionTip: "development" !== 'production', + + /** + * Whether to enable devtools + */ + devtools: "development" !== 'production', + + /** + * Whether to record perf + */ + performance: false, + + /** + * Error handler for watcher errors + */ + errorHandler: null, + + /** + * Warn handler for watcher warns + */ + warnHandler: null, + + /** + * Ignore certain custom elements + */ + ignoredElements: [], + + /** + * Custom user key aliases for v-on + */ + keyCodes: Object.create(null), + + /** + * Check if a tag is reserved so that it cannot be registered as a + * component. This is platform-dependent and may be overwritten. + */ + isReservedTag: no, + + /** + * Check if an attribute is reserved so that it cannot be used as a component + * prop. This is platform-dependent and may be overwritten. + */ + isReservedAttr: no, + + /** + * Check if a tag is an unknown element. + * Platform-dependent. + */ + isUnknownElement: no, + + /** + * Get the namespace of an element + */ + getTagNamespace: noop, + + /** + * Parse the real tag name for the specific platform. + */ + parsePlatformTagName: identity, + + /** + * Check if an attribute must be bound using property, e.g. value + * Platform-dependent. + */ + mustUseProp: no, + + /** + * Exposed for legacy reasons + */ + _lifecycleHooks: LIFECYCLE_HOOKS +}); + +/* */ + +var emptyObject = Object.freeze({}); + +/** + * Check if a string starts with $ or _ + */ +function isReserved (str) { + var c = (str + '').charCodeAt(0); + return c === 0x24 || c === 0x5F +} + +/** + * Define a property. + */ +function def (obj, key, val, enumerable) { + Object.defineProperty(obj, key, { + value: val, + enumerable: !!enumerable, + writable: true, + configurable: true + }); +} + +/** + * Parse simple path. + */ +var bailRE = /[^\w.$]/; +function parsePath (path) { + if (bailRE.test(path)) { + return + } + var segments = path.split('.'); + return function (obj) { + for (var i = 0; i < segments.length; i++) { + if (!obj) { return } + obj = obj[segments[i]]; + } + return obj + } +} + +/* */ + +var warn = noop; +var tip = noop; +var formatComponentName = (null); // work around flow check + +{ + var hasConsole = typeof console !== 'undefined'; + var classifyRE = /(?:^|[-_])(\w)/g; + var classify = function (str) { return str + .replace(classifyRE, function (c) { return c.toUpperCase(); }) + .replace(/[-_]/g, ''); }; + + warn = function (msg, vm) { + var trace = vm ? generateComponentTrace(vm) : ''; + + if (config.warnHandler) { + config.warnHandler.call(null, msg, vm, trace); + } else if (hasConsole && (!config.silent)) { + console.error(("[Vue warn]: " + msg + trace)); + } + }; + + tip = function (msg, vm) { + if (hasConsole && (!config.silent)) { + console.warn("[Vue tip]: " + msg + ( + vm ? generateComponentTrace(vm) : '' + )); + } + }; + + formatComponentName = function (vm, includeFile) { + if (vm.$root === vm) { + return '' + } + var name = typeof vm === 'string' + ? vm + : typeof vm === 'function' && vm.options + ? vm.options.name + : vm._isVue + ? vm.$options.name || vm.$options._componentTag + : vm.name; + + var file = vm._isVue && vm.$options.__file; + if (!name && file) { + var match = file.match(/([^/\\]+)\.vue$/); + name = match && match[1]; + } + + return ( + (name ? ("<" + (classify(name)) + ">") : "") + + (file && includeFile !== false ? (" at " + file) : '') + ) + }; + + var repeat = function (str, n) { + var res = ''; + while (n) { + if (n % 2 === 1) { res += str; } + if (n > 1) { str += str; } + n >>= 1; + } + return res + }; + + var generateComponentTrace = function (vm) { + if (vm._isVue && vm.$parent) { + var tree = []; + var currentRecursiveSequence = 0; + while (vm) { + if (tree.length > 0) { + var last = tree[tree.length - 1]; + if (last.constructor === vm.constructor) { + currentRecursiveSequence++; + vm = vm.$parent; + continue + } else if (currentRecursiveSequence > 0) { + tree[tree.length - 1] = [last, currentRecursiveSequence]; + currentRecursiveSequence = 0; + } + } + tree.push(vm); + vm = vm.$parent; + } + return '\n\nfound in\n\n' + tree + .map(function (vm, i) { return ("" + (i === 0 ? '---> ' : repeat(' ', 5 + i * 2)) + (Array.isArray(vm) + ? ((formatComponentName(vm[0])) + "... (" + (vm[1]) + " recursive calls)") + : formatComponentName(vm))); }) + .join('\n') + } else { + return ("\n\n(found in " + (formatComponentName(vm)) + ")") + } + }; +} + +/* */ + +function handleError (err, vm, info) { + if (config.errorHandler) { + config.errorHandler.call(null, err, vm, info); + } else { + { + warn(("Error in " + info + ": \"" + (err.toString()) + "\""), vm); + } + /* istanbul ignore else */ + if (inBrowser && typeof console !== 'undefined') { + console.error(err); + } else { + throw err + } + } +} + +/* */ +/* globals MutationObserver */ + +// can we use __proto__? +var hasProto = '__proto__' in {}; + +// Browser environment sniffing +var inBrowser = typeof window !== 'undefined'; +var UA = inBrowser && window.navigator.userAgent.toLowerCase(); +var isIE = UA && /msie|trident/.test(UA); +var isIE9 = UA && UA.indexOf('msie 9.0') > 0; +var isEdge = UA && UA.indexOf('edge/') > 0; +var isAndroid = UA && UA.indexOf('android') > 0; +var isIOS = UA && /iphone|ipad|ipod|ios/.test(UA); +var isChrome = UA && /chrome\/\d+/.test(UA) && !isEdge; + +// Firefix has a "watch" function on Object.prototype... +var nativeWatch = ({}).watch; + +var supportsPassive = false; +if (inBrowser) { + try { + var opts = {}; + Object.defineProperty(opts, 'passive', ({ + get: function get () { + /* istanbul ignore next */ + supportsPassive = true; + } + })); // https://github.com/facebook/flow/issues/285 + window.addEventListener('test-passive', null, opts); + } catch (e) {} +} + +// this needs to be lazy-evaled because vue may be required before +// vue-server-renderer can set VUE_ENV +var _isServer; +var isServerRendering = function () { + if (_isServer === undefined) { + /* istanbul ignore if */ + if (!inBrowser && typeof global !== 'undefined') { + // detect presence of vue-server-renderer and avoid + // Webpack shimming the process + _isServer = global['process'].env.VUE_ENV === 'server'; + } else { + _isServer = false; + } + } + return _isServer +}; + +// detect devtools +var devtools = inBrowser && window.__VUE_DEVTOOLS_GLOBAL_HOOK__; + +/* istanbul ignore next */ +function isNative (Ctor) { + return typeof Ctor === 'function' && /native code/.test(Ctor.toString()) +} + +var hasSymbol = + typeof Symbol !== 'undefined' && isNative(Symbol) && + typeof Reflect !== 'undefined' && isNative(Reflect.ownKeys); + +/** + * Defer a task to execute it asynchronously. + */ +var nextTick = (function () { + var callbacks = []; + var pending = false; + var timerFunc; + + function nextTickHandler () { + pending = false; + var copies = callbacks.slice(0); + callbacks.length = 0; + for (var i = 0; i < copies.length; i++) { + copies[i](); + } + } + + // the nextTick behavior leverages the microtask queue, which can be accessed + // via either native Promise.then or MutationObserver. + // MutationObserver has wider support, however it is seriously bugged in + // UIWebView in iOS >= 9.3.3 when triggered in touch event handlers. It + // completely stops working after triggering a few times... so, if native + // Promise is available, we will use it: + /* istanbul ignore if */ + if (typeof Promise !== 'undefined' && isNative(Promise)) { + var p = Promise.resolve(); + var logError = function (err) { console.error(err); }; + timerFunc = function () { + p.then(nextTickHandler).catch(logError); + // in problematic UIWebViews, Promise.then doesn't completely break, but + // it can get stuck in a weird state where callbacks are pushed into the + // microtask queue but the queue isn't being flushed, until the browser + // needs to do some other work, e.g. handle a timer. Therefore we can + // "force" the microtask queue to be flushed by adding an empty timer. + if (isIOS) { setTimeout(noop); } + }; + } else if (typeof MutationObserver !== 'undefined' && ( + isNative(MutationObserver) || + // PhantomJS and iOS 7.x + MutationObserver.toString() === '[object MutationObserverConstructor]' + )) { + // use MutationObserver where native Promise is not available, + // e.g. PhantomJS IE11, iOS7, Android 4.4 + var counter = 1; + var observer = new MutationObserver(nextTickHandler); + var textNode = document.createTextNode(String(counter)); + observer.observe(textNode, { + characterData: true + }); + timerFunc = function () { + counter = (counter + 1) % 2; + textNode.data = String(counter); + }; + } else { + // fallback to setTimeout + /* istanbul ignore next */ + timerFunc = function () { + setTimeout(nextTickHandler, 0); + }; + } + + return function queueNextTick (cb, ctx) { + var _resolve; + callbacks.push(function () { + if (cb) { + try { + cb.call(ctx); + } catch (e) { + handleError(e, ctx, 'nextTick'); + } + } else if (_resolve) { + _resolve(ctx); + } + }); + if (!pending) { + pending = true; + timerFunc(); + } + if (!cb && typeof Promise !== 'undefined') { + return new Promise(function (resolve, reject) { + _resolve = resolve; + }) + } + } +})(); + +var _Set; +/* istanbul ignore if */ +if (typeof Set !== 'undefined' && isNative(Set)) { + // use native Set when available. + _Set = Set; +} else { + // a non-standard Set polyfill that only works with primitive keys. + _Set = (function () { + function Set () { + this.set = Object.create(null); + } + Set.prototype.has = function has (key) { + return this.set[key] === true + }; + Set.prototype.add = function add (key) { + this.set[key] = true; + }; + Set.prototype.clear = function clear () { + this.set = Object.create(null); + }; + + return Set; + }()); +} + +/* */ + + +var uid = 0; + +/** + * A dep is an observable that can have multiple + * directives subscribing to it. + */ +var Dep = function Dep () { + this.id = uid++; + this.subs = []; +}; + +Dep.prototype.addSub = function addSub (sub) { + this.subs.push(sub); +}; + +Dep.prototype.removeSub = function removeSub (sub) { + remove(this.subs, sub); +}; + +Dep.prototype.depend = function depend () { + if (Dep.target) { + Dep.target.addDep(this); + } +}; + +Dep.prototype.notify = function notify () { + // stabilize the subscriber list first + var subs = this.subs.slice(); + for (var i = 0, l = subs.length; i < l; i++) { + subs[i].update(); + } +}; + +// the current target watcher being evaluated. +// this is globally unique because there could be only one +// watcher being evaluated at any time. +Dep.target = null; +var targetStack = []; + +function pushTarget (_target) { + if (Dep.target) { targetStack.push(Dep.target); } + Dep.target = _target; +} + +function popTarget () { + Dep.target = targetStack.pop(); +} + +/* + * not type checking this file because flow doesn't play well with + * dynamically accessing methods on Array prototype + */ + +var arrayProto = Array.prototype; +var arrayMethods = Object.create(arrayProto);[ + 'push', + 'pop', + 'shift', + 'unshift', + 'splice', + 'sort', + 'reverse' +] +.forEach(function (method) { + // cache original method + var original = arrayProto[method]; + def(arrayMethods, method, function mutator () { + var args = [], len = arguments.length; + while ( len-- ) args[ len ] = arguments[ len ]; + + var result = original.apply(this, args); + var ob = this.__ob__; + var inserted; + switch (method) { + case 'push': + case 'unshift': + inserted = args; + break + case 'splice': + inserted = args.slice(2); + break + } + if (inserted) { ob.observeArray(inserted); } + // notify change + ob.dep.notify(); + return result + }); +}); + +/* */ + +var arrayKeys = Object.getOwnPropertyNames(arrayMethods); + +/** + * By default, when a reactive property is set, the new value is + * also converted to become reactive. However when passing down props, + * we don't want to force conversion because the value may be a nested value + * under a frozen data structure. Converting it would defeat the optimization. + */ +var observerState = { + shouldConvert: true +}; + +/** + * Observer class that are attached to each observed + * object. Once attached, the observer converts target + * object's property keys into getter/setters that + * collect dependencies and dispatches updates. + */ +var Observer = function Observer (value) { + this.value = value; + this.dep = new Dep(); + this.vmCount = 0; + def(value, '__ob__', this); + if (Array.isArray(value)) { + var augment = hasProto + ? protoAugment + : copyAugment; + augment(value, arrayMethods, arrayKeys); + this.observeArray(value); + } else { + this.walk(value); + } +}; + +/** + * Walk through each property and convert them into + * getter/setters. This method should only be called when + * value type is Object. + */ +Observer.prototype.walk = function walk (obj) { + var keys = Object.keys(obj); + for (var i = 0; i < keys.length; i++) { + defineReactive$$1(obj, keys[i], obj[keys[i]]); + } +}; + +/** + * Observe a list of Array items. + */ +Observer.prototype.observeArray = function observeArray (items) { + for (var i = 0, l = items.length; i < l; i++) { + observe(items[i]); + } +}; + +// helpers + +/** + * Augment an target Object or Array by intercepting + * the prototype chain using __proto__ + */ +function protoAugment (target, src, keys) { + /* eslint-disable no-proto */ + target.__proto__ = src; + /* eslint-enable no-proto */ +} + +/** + * Augment an target Object or Array by defining + * hidden properties. + */ +/* istanbul ignore next */ +function copyAugment (target, src, keys) { + for (var i = 0, l = keys.length; i < l; i++) { + var key = keys[i]; + def(target, key, src[key]); + } +} + +/** + * Attempt to create an observer instance for a value, + * returns the new observer if successfully observed, + * or the existing observer if the value already has one. + */ +function observe (value, asRootData) { + if (!isObject(value)) { + return + } + var ob; + if (hasOwn(value, '__ob__') && value.__ob__ instanceof Observer) { + ob = value.__ob__; + } else if ( + observerState.shouldConvert && + !isServerRendering() && + (Array.isArray(value) || isPlainObject(value)) && + Object.isExtensible(value) && + !value._isVue + ) { + ob = new Observer(value); + } + if (asRootData && ob) { + ob.vmCount++; + } + return ob +} + +/** + * Define a reactive property on an Object. + */ +function defineReactive$$1 ( + obj, + key, + val, + customSetter, + shallow +) { + var dep = new Dep(); + + var property = Object.getOwnPropertyDescriptor(obj, key); + if (property && property.configurable === false) { + return + } + + // cater for pre-defined getter/setters + var getter = property && property.get; + var setter = property && property.set; + + var childOb = !shallow && observe(val); + Object.defineProperty(obj, key, { + enumerable: true, + configurable: true, + get: function reactiveGetter () { + var value = getter ? getter.call(obj) : val; + if (Dep.target) { + dep.depend(); + if (childOb) { + childOb.dep.depend(); + } + if (Array.isArray(value)) { + dependArray(value); + } + } + return value + }, + set: function reactiveSetter (newVal) { + var value = getter ? getter.call(obj) : val; + /* eslint-disable no-self-compare */ + if (newVal === value || (newVal !== newVal && value !== value)) { + return + } + /* eslint-enable no-self-compare */ + if ("development" !== 'production' && customSetter) { + customSetter(); + } + if (setter) { + setter.call(obj, newVal); + } else { + val = newVal; + } + childOb = !shallow && observe(newVal); + dep.notify(); + } + }); +} + +/** + * Set a property on an object. Adds the new property and + * triggers change notification if the property doesn't + * already exist. + */ +function set (target, key, val) { + if (Array.isArray(target) && isValidArrayIndex(key)) { + target.length = Math.max(target.length, key); + target.splice(key, 1, val); + return val + } + if (hasOwn(target, key)) { + target[key] = val; + return val + } + var ob = (target).__ob__; + if (target._isVue || (ob && ob.vmCount)) { + "development" !== 'production' && warn( + 'Avoid adding reactive properties to a Vue instance or its root $data ' + + 'at runtime - declare it upfront in the data option.' + ); + return val + } + if (!ob) { + target[key] = val; + return val + } + defineReactive$$1(ob.value, key, val); + ob.dep.notify(); + return val +} + +/** + * Delete a property and trigger change if necessary. + */ +function del (target, key) { + if (Array.isArray(target) && isValidArrayIndex(key)) { + target.splice(key, 1); + return + } + var ob = (target).__ob__; + if (target._isVue || (ob && ob.vmCount)) { + "development" !== 'production' && warn( + 'Avoid deleting properties on a Vue instance or its root $data ' + + '- just set it to null.' + ); + return + } + if (!hasOwn(target, key)) { + return + } + delete target[key]; + if (!ob) { + return + } + ob.dep.notify(); +} + +/** + * Collect dependencies on array elements when the array is touched, since + * we cannot intercept array element access like property getters. + */ +function dependArray (value) { + for (var e = (void 0), i = 0, l = value.length; i < l; i++) { + e = value[i]; + e && e.__ob__ && e.__ob__.dep.depend(); + if (Array.isArray(e)) { + dependArray(e); + } + } +} + +/* */ + +/** + * Option overwriting strategies are functions that handle + * how to merge a parent option value and a child option + * value into the final value. + */ +var strats = config.optionMergeStrategies; + +/** + * Options with restrictions + */ +{ + strats.el = strats.propsData = function (parent, child, vm, key) { + if (!vm) { + warn( + "option \"" + key + "\" can only be used during instance " + + 'creation with the `new` keyword.' + ); + } + return defaultStrat(parent, child) + }; +} + +/** + * Helper that recursively merges two data objects together. + */ +function mergeData (to, from) { + if (!from) { return to } + var key, toVal, fromVal; + var keys = Object.keys(from); + for (var i = 0; i < keys.length; i++) { + key = keys[i]; + toVal = to[key]; + fromVal = from[key]; + if (!hasOwn(to, key)) { + set(to, key, fromVal); + } else if (isPlainObject(toVal) && isPlainObject(fromVal)) { + mergeData(toVal, fromVal); + } + } + return to +} + +/** + * Data + */ +function mergeDataOrFn ( + parentVal, + childVal, + vm +) { + if (!vm) { + // in a Vue.extend merge, both should be functions + if (!childVal) { + return parentVal + } + if (!parentVal) { + return childVal + } + // when parentVal & childVal are both present, + // we need to return a function that returns the + // merged result of both functions... no need to + // check if parentVal is a function here because + // it has to be a function to pass previous merges. + return function mergedDataFn () { + return mergeData( + typeof childVal === 'function' ? childVal.call(this) : childVal, + parentVal.call(this) + ) + } + } else if (parentVal || childVal) { + return function mergedInstanceDataFn () { + // instance merge + var instanceData = typeof childVal === 'function' + ? childVal.call(vm) + : childVal; + var defaultData = typeof parentVal === 'function' + ? parentVal.call(vm) + : undefined; + if (instanceData) { + return mergeData(instanceData, defaultData) + } else { + return defaultData + } + } + } +} + +strats.data = function ( + parentVal, + childVal, + vm +) { + if (!vm) { + if (childVal && typeof childVal !== 'function') { + "development" !== 'production' && warn( + 'The "data" option should be a function ' + + 'that returns a per-instance value in component ' + + 'definitions.', + vm + ); + + return parentVal + } + return mergeDataOrFn.call(this, parentVal, childVal) + } + + return mergeDataOrFn(parentVal, childVal, vm) +}; + +/** + * Hooks and props are merged as arrays. + */ +function mergeHook ( + parentVal, + childVal +) { + return childVal + ? parentVal + ? parentVal.concat(childVal) + : Array.isArray(childVal) + ? childVal + : [childVal] + : parentVal +} + +LIFECYCLE_HOOKS.forEach(function (hook) { + strats[hook] = mergeHook; +}); + +/** + * Assets + * + * When a vm is present (instance creation), we need to do + * a three-way merge between constructor options, instance + * options and parent options. + */ +function mergeAssets (parentVal, childVal) { + var res = Object.create(parentVal || null); + return childVal + ? extend(res, childVal) + : res +} + +ASSET_TYPES.forEach(function (type) { + strats[type + 's'] = mergeAssets; +}); + +/** + * Watchers. + * + * Watchers hashes should not overwrite one + * another, so we merge them as arrays. + */ +strats.watch = function (parentVal, childVal) { + // work around Firefox's Object.prototype.watch... + if (parentVal === nativeWatch) { parentVal = undefined; } + if (childVal === nativeWatch) { childVal = undefined; } + /* istanbul ignore if */ + if (!childVal) { return Object.create(parentVal || null) } + if (!parentVal) { return childVal } + var ret = {}; + extend(ret, parentVal); + for (var key in childVal) { + var parent = ret[key]; + var child = childVal[key]; + if (parent && !Array.isArray(parent)) { + parent = [parent]; + } + ret[key] = parent + ? parent.concat(child) + : Array.isArray(child) ? child : [child]; + } + return ret +}; + +/** + * Other object hashes. + */ +strats.props = +strats.methods = +strats.inject = +strats.computed = function (parentVal, childVal) { + if (!childVal) { return Object.create(parentVal || null) } + if (!parentVal) { return childVal } + var ret = Object.create(null); + extend(ret, parentVal); + extend(ret, childVal); + return ret +}; +strats.provide = mergeDataOrFn; + +/** + * Default strategy. + */ +var defaultStrat = function (parentVal, childVal) { + return childVal === undefined + ? parentVal + : childVal +}; + +/** + * Validate component names + */ +function checkComponents (options) { + for (var key in options.components) { + var lower = key.toLowerCase(); + if (isBuiltInTag(lower) || config.isReservedTag(lower)) { + warn( + 'Do not use built-in or reserved HTML elements as component ' + + 'id: ' + key + ); + } + } +} + +/** + * Ensure all props option syntax are normalized into the + * Object-based format. + */ +function normalizeProps (options) { + var props = options.props; + if (!props) { return } + var res = {}; + var i, val, name; + if (Array.isArray(props)) { + i = props.length; + while (i--) { + val = props[i]; + if (typeof val === 'string') { + name = camelize(val); + res[name] = { type: null }; + } else { + warn('props must be strings when using array syntax.'); + } + } + } else if (isPlainObject(props)) { + for (var key in props) { + val = props[key]; + name = camelize(key); + res[name] = isPlainObject(val) + ? val + : { type: val }; + } + } + options.props = res; +} + +/** + * Normalize all injections into Object-based format + */ +function normalizeInject (options) { + var inject = options.inject; + if (Array.isArray(inject)) { + var normalized = options.inject = {}; + for (var i = 0; i < inject.length; i++) { + normalized[inject[i]] = inject[i]; + } + } +} + +/** + * Normalize raw function directives into object format. + */ +function normalizeDirectives (options) { + var dirs = options.directives; + if (dirs) { + for (var key in dirs) { + var def = dirs[key]; + if (typeof def === 'function') { + dirs[key] = { bind: def, update: def }; + } + } + } +} + +/** + * Merge two option objects into a new one. + * Core utility used in both instantiation and inheritance. + */ +function mergeOptions ( + parent, + child, + vm +) { + { + checkComponents(child); + } + + if (typeof child === 'function') { + child = child.options; + } + + normalizeProps(child); + normalizeInject(child); + normalizeDirectives(child); + var extendsFrom = child.extends; + if (extendsFrom) { + parent = mergeOptions(parent, extendsFrom, vm); + } + if (child.mixins) { + for (var i = 0, l = child.mixins.length; i < l; i++) { + parent = mergeOptions(parent, child.mixins[i], vm); + } + } + var options = {}; + var key; + for (key in parent) { + mergeField(key); + } + for (key in child) { + if (!hasOwn(parent, key)) { + mergeField(key); + } + } + function mergeField (key) { + var strat = strats[key] || defaultStrat; + options[key] = strat(parent[key], child[key], vm, key); + } + return options +} + +/** + * Resolve an asset. + * This function is used because child instances need access + * to assets defined in its ancestor chain. + */ +function resolveAsset ( + options, + type, + id, + warnMissing +) { + /* istanbul ignore if */ + if (typeof id !== 'string') { + return + } + var assets = options[type]; + // check local registration variations first + if (hasOwn(assets, id)) { return assets[id] } + var camelizedId = camelize(id); + if (hasOwn(assets, camelizedId)) { return assets[camelizedId] } + var PascalCaseId = capitalize(camelizedId); + if (hasOwn(assets, PascalCaseId)) { return assets[PascalCaseId] } + // fallback to prototype chain + var res = assets[id] || assets[camelizedId] || assets[PascalCaseId]; + if ("development" !== 'production' && warnMissing && !res) { + warn( + 'Failed to resolve ' + type.slice(0, -1) + ': ' + id, + options + ); + } + return res +} + +/* */ + +function validateProp ( + key, + propOptions, + propsData, + vm +) { + var prop = propOptions[key]; + var absent = !hasOwn(propsData, key); + var value = propsData[key]; + // handle boolean props + if (isType(Boolean, prop.type)) { + if (absent && !hasOwn(prop, 'default')) { + value = false; + } else if (!isType(String, prop.type) && (value === '' || value === hyphenate(key))) { + value = true; + } + } + // check default value + if (value === undefined) { + value = getPropDefaultValue(vm, prop, key); + // since the default value is a fresh copy, + // make sure to observe it. + var prevShouldConvert = observerState.shouldConvert; + observerState.shouldConvert = true; + observe(value); + observerState.shouldConvert = prevShouldConvert; + } + { + assertProp(prop, key, value, vm, absent); + } + return value +} + +/** + * Get the default value of a prop. + */ +function getPropDefaultValue (vm, prop, key) { + // no default, return undefined + if (!hasOwn(prop, 'default')) { + return undefined + } + var def = prop.default; + // warn against non-factory defaults for Object & Array + if ("development" !== 'production' && isObject(def)) { + warn( + 'Invalid default value for prop "' + key + '": ' + + 'Props with type Object/Array must use a factory function ' + + 'to return the default value.', + vm + ); + } + // the raw prop value was also undefined from previous render, + // return previous default value to avoid unnecessary watcher trigger + if (vm && vm.$options.propsData && + vm.$options.propsData[key] === undefined && + vm._props[key] !== undefined + ) { + return vm._props[key] + } + // call factory function for non-Function types + // a value is Function if its prototype is function even across different execution context + return typeof def === 'function' && getType(prop.type) !== 'Function' + ? def.call(vm) + : def +} + +/** + * Assert whether a prop is valid. + */ +function assertProp ( + prop, + name, + value, + vm, + absent +) { + if (prop.required && absent) { + warn( + 'Missing required prop: "' + name + '"', + vm + ); + return + } + if (value == null && !prop.required) { + return + } + var type = prop.type; + var valid = !type || type === true; + var expectedTypes = []; + if (type) { + if (!Array.isArray(type)) { + type = [type]; + } + for (var i = 0; i < type.length && !valid; i++) { + var assertedType = assertType(value, type[i]); + expectedTypes.push(assertedType.expectedType || ''); + valid = assertedType.valid; + } + } + if (!valid) { + warn( + 'Invalid prop: type check failed for prop "' + name + '".' + + ' Expected ' + expectedTypes.map(capitalize).join(', ') + + ', got ' + Object.prototype.toString.call(value).slice(8, -1) + '.', + vm + ); + return + } + var validator = prop.validator; + if (validator) { + if (!validator(value)) { + warn( + 'Invalid prop: custom validator check failed for prop "' + name + '".', + vm + ); + } + } +} + +var simpleCheckRE = /^(String|Number|Boolean|Function|Symbol)$/; + +function assertType (value, type) { + var valid; + var expectedType = getType(type); + if (simpleCheckRE.test(expectedType)) { + valid = typeof value === expectedType.toLowerCase(); + } else if (expectedType === 'Object') { + valid = isPlainObject(value); + } else if (expectedType === 'Array') { + valid = Array.isArray(value); + } else { + valid = value instanceof type; + } + return { + valid: valid, + expectedType: expectedType + } +} + +/** + * Use function string name to check built-in types, + * because a simple equality check will fail when running + * across different vms / iframes. + */ +function getType (fn) { + var match = fn && fn.toString().match(/^\s*function (\w+)/); + return match ? match[1] : '' +} + +function isType (type, fn) { + if (!Array.isArray(fn)) { + return getType(fn) === getType(type) + } + for (var i = 0, len = fn.length; i < len; i++) { + if (getType(fn[i]) === getType(type)) { + return true + } + } + /* istanbul ignore next */ + return false +} + +/* */ + +var mark; +var measure; + +{ + var perf = inBrowser && window.performance; + /* istanbul ignore if */ + if ( + perf && + perf.mark && + perf.measure && + perf.clearMarks && + perf.clearMeasures + ) { + mark = function (tag) { return perf.mark(tag); }; + measure = function (name, startTag, endTag) { + perf.measure(name, startTag, endTag); + perf.clearMarks(startTag); + perf.clearMarks(endTag); + perf.clearMeasures(name); + }; + } +} + +/* not type checking this file because flow doesn't play well with Proxy */ + +var initProxy; + +{ + var allowedGlobals = makeMap( + 'Infinity,undefined,NaN,isFinite,isNaN,' + + 'parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,' + + 'Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,' + + 'require' // for Webpack/Browserify + ); + + var warnNonPresent = function (target, key) { + warn( + "Property or method \"" + key + "\" is not defined on the instance but " + + "referenced during render. Make sure to declare reactive data " + + "properties in the data option.", + target + ); + }; + + var hasProxy = + typeof Proxy !== 'undefined' && + Proxy.toString().match(/native code/); + + if (hasProxy) { + var isBuiltInModifier = makeMap('stop,prevent,self,ctrl,shift,alt,meta'); + config.keyCodes = new Proxy(config.keyCodes, { + set: function set (target, key, value) { + if (isBuiltInModifier(key)) { + warn(("Avoid overwriting built-in modifier in config.keyCodes: ." + key)); + return false + } else { + target[key] = value; + return true + } + } + }); + } + + var hasHandler = { + has: function has (target, key) { + var has = key in target; + var isAllowed = allowedGlobals(key) || key.charAt(0) === '_'; + if (!has && !isAllowed) { + warnNonPresent(target, key); + } + return has || !isAllowed + } + }; + + var getHandler = { + get: function get (target, key) { + if (typeof key === 'string' && !(key in target)) { + warnNonPresent(target, key); + } + return target[key] + } + }; + + initProxy = function initProxy (vm) { + if (hasProxy) { + // determine which proxy handler to use + var options = vm.$options; + var handlers = options.render && options.render._withStripped + ? getHandler + : hasHandler; + vm._renderProxy = new Proxy(vm, handlers); + } else { + vm._renderProxy = vm; + } + }; +} + +/* */ + +var VNode = function VNode ( + tag, + data, + children, + text, + elm, + context, + componentOptions, + asyncFactory +) { + this.tag = tag; + this.data = data; + this.children = children; + this.text = text; + this.elm = elm; + this.ns = undefined; + this.context = context; + this.functionalContext = undefined; + this.key = data && data.key; + this.componentOptions = componentOptions; + this.componentInstance = undefined; + this.parent = undefined; + this.raw = false; + this.isStatic = false; + this.isRootInsert = true; + this.isComment = false; + this.isCloned = false; + this.isOnce = false; + this.asyncFactory = asyncFactory; + this.asyncMeta = undefined; + this.isAsyncPlaceholder = false; +}; + +var prototypeAccessors = { child: {} }; + +// DEPRECATED: alias for componentInstance for backwards compat. +/* istanbul ignore next */ +prototypeAccessors.child.get = function () { + return this.componentInstance +}; + +Object.defineProperties( VNode.prototype, prototypeAccessors ); + +var createEmptyVNode = function (text) { + if ( text === void 0 ) text = ''; + + var node = new VNode(); + node.text = text; + node.isComment = true; + return node +}; + +function createTextVNode (val) { + return new VNode(undefined, undefined, undefined, String(val)) +} + +// optimized shallow clone +// used for static nodes and slot nodes because they may be reused across +// multiple renders, cloning them avoids errors when DOM manipulations rely +// on their elm reference. +function cloneVNode (vnode) { + var cloned = new VNode( + vnode.tag, + vnode.data, + vnode.children, + vnode.text, + vnode.elm, + vnode.context, + vnode.componentOptions, + vnode.asyncFactory + ); + cloned.ns = vnode.ns; + cloned.isStatic = vnode.isStatic; + cloned.key = vnode.key; + cloned.isComment = vnode.isComment; + cloned.isCloned = true; + return cloned +} + +function cloneVNodes (vnodes) { + var len = vnodes.length; + var res = new Array(len); + for (var i = 0; i < len; i++) { + res[i] = cloneVNode(vnodes[i]); + } + return res +} + +/* */ + +var normalizeEvent = cached(function (name) { + var passive = name.charAt(0) === '&'; + name = passive ? name.slice(1) : name; + var once$$1 = name.charAt(0) === '~'; // Prefixed last, checked first + name = once$$1 ? name.slice(1) : name; + var capture = name.charAt(0) === '!'; + name = capture ? name.slice(1) : name; + return { + name: name, + once: once$$1, + capture: capture, + passive: passive + } +}); + +function createFnInvoker (fns) { + function invoker () { + var arguments$1 = arguments; + + var fns = invoker.fns; + if (Array.isArray(fns)) { + var cloned = fns.slice(); + for (var i = 0; i < cloned.length; i++) { + cloned[i].apply(null, arguments$1); + } + } else { + // return handler return value for single handlers + return fns.apply(null, arguments) + } + } + invoker.fns = fns; + return invoker +} + +function updateListeners ( + on, + oldOn, + add, + remove$$1, + vm +) { + var name, cur, old, event; + for (name in on) { + cur = on[name]; + old = oldOn[name]; + event = normalizeEvent(name); + if (isUndef(cur)) { + "development" !== 'production' && warn( + "Invalid handler for event \"" + (event.name) + "\": got " + String(cur), + vm + ); + } else if (isUndef(old)) { + if (isUndef(cur.fns)) { + cur = on[name] = createFnInvoker(cur); + } + add(event.name, cur, event.once, event.capture, event.passive); + } else if (cur !== old) { + old.fns = cur; + on[name] = old; + } + } + for (name in oldOn) { + if (isUndef(on[name])) { + event = normalizeEvent(name); + remove$$1(event.name, oldOn[name], event.capture); + } + } +} + +/* */ + +function mergeVNodeHook (def, hookKey, hook) { + var invoker; + var oldHook = def[hookKey]; + + function wrappedHook () { + hook.apply(this, arguments); + // important: remove merged hook to ensure it's called only once + // and prevent memory leak + remove(invoker.fns, wrappedHook); + } + + if (isUndef(oldHook)) { + // no existing hook + invoker = createFnInvoker([wrappedHook]); + } else { + /* istanbul ignore if */ + if (isDef(oldHook.fns) && isTrue(oldHook.merged)) { + // already a merged invoker + invoker = oldHook; + invoker.fns.push(wrappedHook); + } else { + // existing plain hook + invoker = createFnInvoker([oldHook, wrappedHook]); + } + } + + invoker.merged = true; + def[hookKey] = invoker; +} + +/* */ + +function extractPropsFromVNodeData ( + data, + Ctor, + tag +) { + // we are only extracting raw values here. + // validation and default values are handled in the child + // component itself. + var propOptions = Ctor.options.props; + if (isUndef(propOptions)) { + return + } + var res = {}; + var attrs = data.attrs; + var props = data.props; + if (isDef(attrs) || isDef(props)) { + for (var key in propOptions) { + var altKey = hyphenate(key); + { + var keyInLowerCase = key.toLowerCase(); + if ( + key !== keyInLowerCase && + attrs && hasOwn(attrs, keyInLowerCase) + ) { + tip( + "Prop \"" + keyInLowerCase + "\" is passed to component " + + (formatComponentName(tag || Ctor)) + ", but the declared prop name is" + + " \"" + key + "\". " + + "Note that HTML attributes are case-insensitive and camelCased " + + "props need to use their kebab-case equivalents when using in-DOM " + + "templates. You should probably use \"" + altKey + "\" instead of \"" + key + "\"." + ); + } + } + checkProp(res, props, key, altKey, true) || + checkProp(res, attrs, key, altKey, false); + } + } + return res +} + +function checkProp ( + res, + hash, + key, + altKey, + preserve +) { + if (isDef(hash)) { + if (hasOwn(hash, key)) { + res[key] = hash[key]; + if (!preserve) { + delete hash[key]; + } + return true + } else if (hasOwn(hash, altKey)) { + res[key] = hash[altKey]; + if (!preserve) { + delete hash[altKey]; + } + return true + } + } + return false +} + +/* */ + +// The template compiler attempts to minimize the need for normalization by +// statically analyzing the template at compile time. +// +// For plain HTML markup, normalization can be completely skipped because the +// generated render function is guaranteed to return Array. There are +// two cases where extra normalization is needed: + +// 1. When the children contains components - because a functional component +// may return an Array instead of a single root. In this case, just a simple +// normalization is needed - if any child is an Array, we flatten the whole +// thing with Array.prototype.concat. It is guaranteed to be only 1-level deep +// because functional components already normalize their own children. +function simpleNormalizeChildren (children) { + for (var i = 0; i < children.length; i++) { + if (Array.isArray(children[i])) { + return Array.prototype.concat.apply([], children) + } + } + return children +} + +// 2. When the children contains constructs that always generated nested Arrays, +// e.g.