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

Widget: Clear CTA in active-cart message

Browse Source
This commit is contained in:
Raphael Michel
2018-08-09 15:40:09 +02:00
parent 5047e48de5
commit 79e6216669
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/static/pretixpresale/js/widget/widget.js
View File

@@ -21,8 +21,8 @@ var strings = {
'cart_error': django.pgettext('widget', 'The cart could not be created. Please try again later'), 'cart_error': django.pgettext('widget', 'The cart could not be created. Please try again later'),
'waiting_list': django.pgettext('widget', 'Waiting list'), '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' + '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' + ' products, they will be added to your existing cart.'),
' cart.'), 'resume_checkout': django.pgettext('widget', 'Resume checkout'),
'poweredby': django.pgettext('widget', '<a href="https://pretix.eu" target="_blank" rel="noopener">event' + 'poweredby': django.pgettext('widget', '<a href="https://pretix.eu" target="_blank" rel="noopener">event' +
' ticketing powered by pretix</a>'), ' ticketing powered by pretix</a>'),
'redeem_voucher': django.pgettext('widget', 'Redeem a voucher'), 'redeem_voucher': django.pgettext('widget', 'Redeem a voucher'),
@@ -555,13 +555,17 @@ Vue.component('pretix-widget', {
+ '<input type="hidden" name="_voucher_code" :value="$root.voucher_code" v-if="$root.voucher_code">' + '<input type="hidden" name="_voucher_code" :value="$root.voucher_code" v-if="$root.voucher_code">'
+ '<input type="hidden" name="subevent" :value="$root.subevent" />' + '<input type="hidden" name="subevent" :value="$root.subevent" />'
+ '<div class="pretix-widget-error-message" v-if="$root.error">{{ $root.error }}</div>' + '<div class="pretix-widget-error-message" v-if="$root.error">{{ $root.error }}</div>'
+ '<div class="pretix-widget-info-message pretix-widget-clickable" @click.prevent="resume"' + '<div class="pretix-widget-info-message pretix-widget-clickable"'
+ ' v-if="$root.cart_exists">' + ' v-if="$root.cart_exists">'
+ '<button @click.prevent="resume" class="pretix-widget-resume-button" type="button">'
+ strings['resume_checkout']
+ '</button>'
+ strings['cart_exists'] + strings['cart_exists']
+ '<div class="pretix-widget-clear"></div>'
+ '</div>' + '</div>'
+ '<category v-for="category in this.$root.categories" :category="category" :key="category.id"></category>' + '<category v-for="category in this.$root.categories" :category="category" :key="category.id"></category>'
+ '<div class="pretix-widget-action" v-if="$root.display_add_to_cart">' + '<div class="pretix-widget-action" v-if="$root.display_add_to_cart">'
+ '<button @click="buy">' + strings.buy + '</button>' + '<button @click="buy" type="submit">' + strings.buy + '</button>'
+ '</div>' + '</div>'
+ '</form>' + '</form>'
+ '<form method="get" :action="$root.voucherFormTarget" target="_blank" v-if="$root.vouchers_exist && !$root.voucher_code">' + '<form method="get" :action="$root.voucherFormTarget" target="_blank" v-if="$root.vouchers_exist && !$root.voucher_code">'

12
src/pretix/static/pretixpresale/scss/widget.scss
View File

@@ -93,6 +93,10 @@
min-height: 208px; min-height: 208px;
border-radius: $input-border-radius; border-radius: $input-border-radius;
.pretix-widget-resume-button {
float: right;
margin-left: 10px;
}
.pretix-widget-clickable { .pretix-widget-clickable {
cursor: pointer; cursor: pointer;
@@ -100,11 +104,11 @@
.pretix-widget-info-message { .pretix-widget-info-message {
padding: 10px; padding: 10px;
text-align: center; text-align: left;
margin: 10px 0; margin: 10px 0;
background-color: $alert-info-bg; background-color: white;
border-color: $alert-info-border; border: 2px solid $brand-info;
color: $alert-info-text; color: $brand-info;
border-radius: $alert-border-radius; border-radius: $alert-border-radius;
} }