CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Allow attendees to change selected add-ons of same price (#3150)

Browse Source
This commit is contained in:
Raphael Michel
2023-03-08 16:01:59 +01:00
committed by GitHub
parent 2ebbe82baf
commit 61ae434ab1
18 changed files with 615 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/presale/templates/pretixpresale/event/fragment_addon_choice.html
View File

@@ -70,6 +70,7 @@
</div>
<div class="col-md-2 col-sm-3 col-xs-6 price">
<p>
{% if not hide_prices %}
{% if c.price_included %}
<span class="sr-only">{% trans "free" context "price" %}</span>
{% elif item.free_price %}
@@ -87,6 +88,7 @@
{% else %}
{{ item.min_price|money:event.currency }}
{% endif %}
{% endif %}
</p>
</div>
<div class="col-md-2 col-sm-3 col-xs-6 availability-box">
@@ -117,6 +119,7 @@
{% endif %}
</div>
<div class="col-md-2 col-sm-3 col-xs-6 price">
{% if not hide_prices %}
{% if not c.price_included %}
{% if var.original_price %}
<del><span class="sr-only">{% trans "Original price:" %}</span>
@@ -169,6 +172,7 @@
{% else %}
<span class="sr-only">{% trans "free" context "price" %}</span>
{% endif %}
{% endif %}
</div>
{% if var.cached_availability.0 == 100 or var.initial %}
<div class="col-md-2 col-sm-3 col-xs-6 availability-box available">
@@ -240,6 +244,7 @@
</div>
<div class="col-md-2 col-sm-3 col-xs-6 price">
<p>
{% if not hide_prices %}
{% if not c.price_included %}
{% if item.original_price %}
<del><span class="sr-only">{% trans "Original price:" %}</span>
@@ -290,6 +295,7 @@
{% else %}
<span class="sr-only">{% trans "free" context "price" %}</span>
{% endif %}
{% endif %}
</p>
</div>
{% if item.cached_availability.0 == 100 or item.initial %}

191
src/pretix/presale/templates/pretixpresale/event/fragment_change_confirm.html Normal file
View File

@@ -0,0 +1,191 @@
{% load i18n %}
{% load classname %}
{% load eventurl %}
{% load money %}
<div class="row-fluid">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">
{% trans "Change summary" %}
</h3>
</div>
<table class="panel-body table table-hover">
{% for op in operations %}
{% if op|classname == "ItemOperation" %}
<tr>
<td>
{% if op.position.variation or op.variation %}
{% blocktrans trimmed with positionid=op.position.positionid old_item=op.position.item.name old_variation=op.position.variation new_item=op.item.name new_variation=op.variation %}
Change position #{{ positionid }} from "{{ old_item }} – {{ old_variation }}" to "{{ new_item }} – {{ new_variation }}"
{% endblocktrans %}
{% else %}
{% blocktrans trimmed with positionid=op.position.positionid old_item=op.position.item.name new_item=op.item.name %}
Change position #{{ positionid }} from "{{ old_item }}" to "{{ new_item }}"
{% endblocktrans %}
{% endif %}
{% if op.position.addon_to %}
<span class="text-muted">
<br>
<small>{% blocktrans with positionid=op.position.addon_to.positionid %}Add-on product to position #{{ positionid }}{% endblocktrans %}</small>
</span>
{% endif %}
</td>
<td class="text-right flip">
</td>
</tr>
{% elif op|classname == "SubeventOperation" %}
<tr>
<td>
{% blocktrans trimmed with positionid=op.position.positionid old=op.position.subevent new=op.subevent %}
Change date of position #{{ positionid }} from "{{ old }}" to "{{ new }}"
{% endblocktrans %}
</td>
<td class="text-right flip">
</td>
</tr>
{% elif op|classname == "PriceOperation" %}
<tr>
<td>
{% blocktrans trimmed with positionid=op.position.positionid old=op.position.price new=op.price %}
Change price of position #{{ positionid }} from {{ old }} to {{ new }}
{% endblocktrans %}
{% if op.position.addon_to %}
<span class="text-muted">
<br>
<small>{% blocktrans with positionid=op.position.addon_to.positionid %}Add-on product to position #{{ positionid }}{% endblocktrans %}</small>
</span>
{% endif %}
</td>
<td class="text-right flip">
{% if not hide_prices %}
{{ op.price_diff|money:request.event.currency }}
{% endif %}
</td>
</tr>
{% elif op|classname == "AddOperation" %}
<tr>
<td>
{% if op.variation %}
{% blocktrans trimmed with item=op.item.name variation=op.variation.value %}
Add position ({{ item }} – {{ variation }})
{% endblocktrans %}
{% else %}
{% blocktrans trimmed with item=op.item.name %}
Add position ({{ item }})
{% endblocktrans %}
{% endif %}
{% if op.addon_to %}
<span class="text-muted">
<br>
<small>{% blocktrans with positionid=op.addon_to.positionid %}Add-on product to position #{{ positionid }}{% endblocktrans %}</small>
</span>
{% endif %}
</td>
<td class="text-right flip">
{% if not hide_prices %}
{{ op.price.gross|money:request.event.currency }}
{% endif %}
</td>
</tr>
{% elif op|classname == "CancelOperation" %}
<tr>
<td>
{% if op.position.variation %}
{% blocktrans trimmed with positionid=op.position.positionid item=op.position.item.name variation=op.position.variation.value %}
Remove position #{{ positionid }} ({{ item }} – {{ variation }})
{% endblocktrans %}
{% else %}
{% blocktrans trimmed with positionid=op.position.positionid item=op.position.item.name %}
Remove position #{{ positionid }} ({{ item }})
{% endblocktrans %}
{% endif %}
{% if op.position.addon_to %}
<span class="text-muted">
<br>
<small>{% blocktrans with positionid=op.position.addon_to.positionid %}Add-on product to position #{{ positionid }}{% endblocktrans %}</small>
</span>
{% endif %}
</td>
<td class="text-right flip">
{% if not hide_prices %}
{{ op.price_diff|money:request.event.currency }}
{% endif %}
</td>
</tr>
{% endif %}
{% endfor %}
{% if not hide_prices %}
<tfoot>
<tr>
<td><strong>{% trans "Total price change" %}</strong></td>
<td class="text-right flip">
<strong>
{{ totaldiff|money:request.event.currency }}
</strong>
</td>
</tr>
{% if totaldiff %}
<tr>
<td><strong>{% trans "New order total" %}</strong></td>
<td class="text-right flip">
{{ totaldiff|add:order.total|money:request.event.currency }}
</td>
</tr>
<tr>
<td><strong>{% trans "You already paid" %}</strong></td>
<td class="text-right flip">
{{ order.payment_refund_sum|money:request.event.currency }}
</td>
</tr>
<tr>
<td>
{% if new_pending_sum > 0 %}
<strong>{% trans "You will need to pay" %}</strong>
<br>
<span class="text-muted">
{% trans "Your entire order will be considered unpaid until you paid this difference." %}
</span>
{% else %}
<strong>{% trans "You will be refunded" %}</strong>
<br>
<span class="text-muted">
{% if request.event.settings.cancel_allow_user_paid_refund_as_giftcard == "manually" %}
{% trans "The organizer will get in touch with you to clarify the details of your refund." %}
{% elif request.event.settings.cancel_allow_user_paid_refund_as_giftcard == "force" %}
{% trans "The refund will be issued in form of a gift card that you can use for further purchases." %}
{% else %}
{% if can_auto_refund %}
{% blocktrans trimmed %}
The refund amount will automatically be sent back to your original payment method. Depending
on the payment method, please allow for up to two weeks before this appears on your
statement.
{% endblocktrans %}
{% else %}
{% blocktrans trimmed %}
With the payment method you used, the refund amount <strong>can not be sent back to you
automatically</strong>. Instead, the event organizer will need to initiate the transfer
manually. Please be patient as this might take a bit longer.
{% endblocktrans %}
{% endif %}
{% endif %}
</span>
{% endif %}
</td>
<td class="text-right flip">
<strong>
{{ new_pending_sum|money:request.event.currency }}
</strong>
</td>
</tr>
{% endif %}
</tfoot>
{% endif %}
</table>
</div>
</div>
{% for k, l in request.POST.lists %}
{% for v in l %}
<input type="hidden" name="{{ k }}" value="{{ v }}">
{% endfor %}
{% endfor %}

58
src/pretix/presale/templates/pretixpresale/event/fragment_change_form.html Normal file
View File

@@ -0,0 +1,58 @@
{% load i18n %}
{% load bootstrap3 %}
{% load rich_text %}
{% for position, addon_positions in formgroups.items %}
<div class="panel panel-default items">
<div class="panel-heading">
<h3 class="panel-title">
<strong>{{ position.item }}</strong>
{% if position.variation %}
– {{ position.variation }}
{% endif %}
</h3>
</div>
<div class="panel-body addons">
<div class="form-order-change form-horizontal">
<div class="form-order-change-main">
{% if position.subevent %}
<div class="form-group">
<label class="col-md-3 control-label">
{% trans "Date" context "subevent" %}
</label>
<div class="col-md-9 form-control-text">
<ul class="addon-list">
{{ position.subevent.name }} &middot; {{ position.subevent.get_date_range_display_as_html }}
{% if position.event.settings.show_times %}
<span class="fa fa-clock-o" aria-hidden="true"></span>
{{ position.subevent.date_from|date:"TIME_FORMAT" }}
{% endif %}
</ul>
</div>
</div>
{% endif %}
{% for p in addon_positions %}
{% if p.pk != position.pk %}
{# Add-Ons #}
<legend>+ {{ p.item.name }}{% if p.variation %} – {{ p.variation.value }}{% endif %}</legend>
{% endif %}
{% if p.attendee_name %}
<div class="form-group">
<label class="col-md-3 control-label">
{% trans "Attendee name" %}
</label>
<div class="col-md-9 form-control-text">
{{ p.attendee_name }}
</div>
</div>
{% endif %}
{% bootstrap_form p.form layout="checkout" %}
{% endfor %}
</div>
</div>
{% if position.addon_form %}
{% include "pretixpresale/event/fragment_addon_choice.html" with form=position.addon_form hide_prices=hide_prices %}
{% endif %}
</div>
</div>
{% endfor %}

56
src/pretix/presale/templates/pretixpresale/event/order_change.html
View File

@@ -13,61 +13,7 @@
</h2>
<form method="post" href="">
{% csrf_token %}
{% for position, addon_positions in formgroups.items %}
<div class="panel panel-default items">
<div class="panel-heading">
<h3 class="panel-title">
<strong>{{ position.item }}</strong>
{% if position.variation %}
– {{ position.variation }}
{% endif %}
</h3>
</div>
<div class="panel-body addons">
<div class="form-order-change form-horizontal">
<div class="form-order-change-main">
{% if position.subevent %}
<div class="form-group">
<label class="col-md-3 control-label">
{% trans "Date" context "subevent" %}
</label>
<div class="col-md-9 form-control-text">
<ul class="addon-list">
{{ position.subevent.name }} &middot; {{ position.subevent.get_date_range_display_as_html }}
{% if position.event.settings.show_times %}
<span class="fa fa-clock-o" aria-hidden="true"></span>
{{ position.subevent.date_from|date:"TIME_FORMAT" }}
{% endif %}
</ul>
</div>
</div>
{% endif %}
{% for p in addon_positions %}
{% if p.pk != position.pk %}
{# Add-Ons #}
<legend>+ {{ p.item.name }}{% if p.variation %} – {{ p.variation.value }}{% endif %}</legend>
{% endif %}
{% if p.attendee_name %}
<div class="form-group">
<label class="col-md-3 control-label">
{% trans "Attendee name" %}
</label>
<div class="col-md-9 form-control-text">
{{ p.attendee_name }}
</div>
</div>
{% endif %}
{% bootstrap_form p.form layout="checkout" %}
{% endfor %}
</div>
</div>
{% if position.addon_form %}
{% include "pretixpresale/event/fragment_addon_choice.html" with form=position.addon_form %}
{% endif %}
</div>
</div>
{% endfor %}
{% include "pretixpresale/event/fragment_change_form.html" %}
<div class="row checkout-button-row">
<div class="col-md-4">

187
src/pretix/presale/templates/pretixpresale/event/order_change_confirm.html
View File

@@ -17,193 +17,11 @@
{% csrf_token %}
<p>{% trans "Please confirm the following changes to your order." %}</p>
<div class="row-fluid">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">
{% trans "Change summary" %}
</h3>
</div>
<table class="panel-body table table-hover">
{% for op in operations %}
{% if op|classname == "ItemOperation" %}
<tr>
<td>
{% if op.position.variation or op.variation %}
{% blocktrans trimmed with positionid=op.position.positionid old_item=op.position.item.name old_variation=op.position.variation new_item=op.item.name new_variation=op.variation %}
Change position #{{ positionid }} from "{{ old_item }} – {{ old_variation }}
" to "{{ new_item }} – {{ new_variation }}"
{% endblocktrans %}
{% else %}
{% blocktrans trimmed with positionid=op.position.positionid old_item=op.position.item.name new_item=op.item.name %}
Change position #{{ positionid }} from "{{ old_item }}" to "{{ new_item }}"
{% endblocktrans %}
{% endif %}
{% if op.position.addon_to %}
<span class="text-muted">
<br>
<small>{% blocktrans with positionid=op.position.addon_to.positionid %}
Add-on product to position #{{ positionid }}{% endblocktrans %}</small>
</span>
{% endif %}
</td>
<td class="text-right flip">
</td>
</tr>
{% elif op|classname == "SubeventOperation" %}
<tr>
<td>
{% blocktrans trimmed with positionid=op.position.positionid old=op.position.subevent new=op.subevent %}
Change date of position #{{ positionid }} from "{{ old }}" to "{{ new }}"
{% endblocktrans %}
</td>
<td class="text-right flip">
</td>
</tr>
{% elif op|classname == "PriceOperation" %}
<tr>
<td>
{% blocktrans trimmed with positionid=op.position.positionid old=op.position.price new=op.price %}
Change price of position #{{ positionid }} from {{ old }} to {{ new }}
{% endblocktrans %}
{% if op.position.addon_to %}
<span class="text-muted">
<br>
<small>{% blocktrans with positionid=op.position.addon_to.positionid %}
Add-on product to position #{{ positionid }}{% endblocktrans %}</small>
</span>
{% endif %}
</td>
<td class="text-right flip">
{{ op.price_diff|money:request.event.currency }}
</td>
</tr>
{% elif op|classname == "AddOperation" %}
<tr>
<td>
{% if op.variation %}
{% blocktrans trimmed with item=op.item.name variation=op.variation.value %}
Add position ({{ item }} – {{ variation }})
{% endblocktrans %}
{% else %}
{% blocktrans trimmed with item=op.item.name %}
Add position ({{ item }})
{% endblocktrans %}
{% endif %}
{% if op.addon_to %}
<span class="text-muted">
<br>
<small>{% blocktrans with positionid=op.addon_to.positionid %}Add-on product
to position #{{ positionid }}{% endblocktrans %}</small>
</span>
{% endif %}
</td>
<td class="text-right flip">
{{ op.price.gross|money:request.event.currency }}
</td>
</tr>
{% elif op|classname == "CancelOperation" %}
<tr>
<td>
{% if op.position.variation %}
{% blocktrans trimmed with positionid=op.position.positionid item=op.position.item.name variation=op.position.variation.value %}
Remove position #{{ positionid }} ({{ item }} – {{ variation }})
{% endblocktrans %}
{% else %}
{% blocktrans trimmed with positionid=op.position.positionid item=op.position.item.name %}
Remove position #{{ positionid }} ({{ item }})
{% endblocktrans %}
{% endif %}
{% if op.position.addon_to %}
<span class="text-muted">
<br>
<small>{% blocktrans with positionid=op.position.addon_to.positionid %}
Add-on product to position #{{ positionid }}{% endblocktrans %}</small>
</span>
{% endif %}
</td>
<td class="text-right flip">
{{ op.price_diff|money:request.event.currency }}
</td>
</tr>
{% endif %}
{% endfor %}
<tfoot>
<tr>
<td><strong>{% trans "Total price change" %}</strong></td>
<td class="text-right flip">
<strong>
{{ totaldiff|money:request.event.currency }}
</strong>
</td>
</tr>
{% if totaldiff %}
<tr>
<td><strong>{% trans "New order total" %}</strong></td>
<td class="text-right flip">
{{ totaldiff|add:order.total|money:request.event.currency }}
</td>
</tr>
<tr>
<td><strong>{% trans "You already paid" %}</strong></td>
<td class="text-right flip">
{{ order.payment_refund_sum|money:request.event.currency }}
</td>
</tr>
<tr>
<td>
{% if new_pending_sum > 0 %}
<strong>{% trans "You will need to pay" %}</strong>
<br>
<span class="text-muted">
{% trans "Your entire order will be considered unpaid until you paid this difference." %}
</span>
{% else %}
<strong>{% trans "You will be refunded" %}</strong>
<br>
<span class="text-muted">
{% if request.event.settings.cancel_allow_user_paid_refund_as_giftcard == "manually" %}
{% trans "The organizer will get in touch with you to clarify the details of your refund." %}
{% elif request.event.settings.cancel_allow_user_paid_refund_as_giftcard == "force" %}
{% trans "The refund will be issued in form of a gift card that you can use for further purchases." %}
{% else %}
{% if can_auto_refund %}
{% blocktrans trimmed %}
The refund amount will automatically be sent back to your original payment method. Depending
on the payment method, please allow for up to two weeks before this appears on your
statement.
{% endblocktrans %}
{% else %}
{% blocktrans trimmed %}
With the payment method you used, the refund amount <strong>can not be sent back to you
automatically</strong>. Instead, the event organizer will need to initiate the transfer
manually. Please be patient as this might take a bit longer.
{% endblocktrans %}
{% endif %}
{% endif %}
</span>
{% endif %}
</td>
<td class="text-right flip">
<strong>
{{ new_pending_sum|money:request.event.currency }}
</strong>
</td>
</tr>
{% endif %}
</tfoot>
</table>
</div>
</div>
{% for k, l in request.POST.lists %}
{% for v in l %}
<input type="hidden" name="{{ k }}" value="{{ v }}">
{% endfor %}
{% endfor %}
{% include "pretixpresale/event/fragment_change_confirm.html" %}
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{% eventurl request.event "presale:event.order.change" secret=order.secret order=order.code %}">
href="{% eventurl request.event "presale:event.order.change" secret=order.secret order=order.code %}">
{% trans "Back" %}
</a>
</div>
@@ -215,5 +33,4 @@
<div class="clearfix"></div>
</div>
</form>
{% endblock %}

29
src/pretix/presale/templates/pretixpresale/event/position.html
View File

@@ -51,4 +51,33 @@
</div>
</div>
{% eventsignal event "pretix.presale.signals.position_info" order=order position=position request=request %}
{% if attendee_change_allowed %}
<div class="panel panel-default panel-cancellation">
<div class="panel-heading">
<h3 class="panel-title">
{% trans "Change your ticket" context "action" %}
</h3>
</div>
<div class="panel-body">
<p>
{% blocktrans trimmed %}
If you want to make changes to the components of your ticket, you can click on the following button.
{% endblocktrans %}
</p>
<p class="help-block">
{% blocktrans trimmed with email=order.email %}
You can only make some changes to this ticket yourself. For additional changes, please
get in touch with the person who bought the ticket ({{ email }}).
{% endblocktrans %}
</p>
<p>
<a href="{% eventurl event 'presale:event.order.position.change' secret=position.web_secret position=position.positionid order=order.code %}"
class="btn btn-default">
<span class="fa fa-edit" aria-hidden="true"></span>
{% trans "Change ticket" %}
</a>
</p>
</div>
</div>
{% endif %}
{% endblock %}

35
src/pretix/presale/templates/pretixpresale/event/position_change.html Normal file
View File

@@ -0,0 +1,35 @@
{% extends "pretixpresale/event/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% load rich_text %}
{% block title %}{% blocktrans trimmed %}
Change ticket
{% endblocktrans %}{% endblock %}
{% block content %}
<h2>
{% blocktrans trimmed %}
Change ticket
{% endblocktrans %}
</h2>
<form method="post" href="">
{% csrf_token %}
<p>{% trans "Please select the desired changes to your ticket. Note that you can only perform changes that do not change the total price of the ticket." %}</p>
{% include "pretixpresale/event/fragment_change_form.html" with hide_prices=request.event.settings.hide_prices_from_attendees %}
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{{ view.get_position_url }}">
{% trans "Cancel" %}
</a>
</div>
<div class="col-md-4 col-md-offset-4">
<button class="btn btn-block btn-primary btn-lg" type="submit">
{% trans "Continue" %}
</button>
</div>
<div class="clearfix"></div>
</div>
</form>
{% endblock %}

36
src/pretix/presale/templates/pretixpresale/event/position_change_confirm.html Normal file
View File

@@ -0,0 +1,36 @@
{% extends "pretixpresale/event/base.html" %}
{% load i18n %}
{% load classname %}
{% load eventurl %}
{% load money %}
{% block title %}{% blocktrans trimmed %}
Change ticket
{% endblocktrans %}{% endblock %}
{% block content %}
<h2>
{% blocktrans trimmed %}
Change ticket
{% endblocktrans %}
</h2>
<form method="post" class="form-horizontal" href="">
{% csrf_token %}
<p>{% trans "Please confirm the following changes to your ticket." %}</p>
{% include "pretixpresale/event/fragment_change_confirm.html" with hide_prices=request.event.settings.hide_prices_from_attendees %}
<div class="row checkout-button-row">
<div class="col-md-4">
<a class="btn btn-block btn-default btn-lg"
href="{% eventurl request.event "presale:event.order.position.change" secret=position.web_secret position=position.positionid order=order.code %}">
{% trans "Back" %}
</a>
</div>
<div class="col-md-4 col-md-offset-4">
<button class="btn btn-block btn-primary btn-lg" type="submit" name="confirm" value="true">
{% trans "Perform changes" %}
</button>
</div>
<div class="clearfix"></div>
</div>
</form>
{% endblock %}