pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website_event(_sale): make registration form responsive

Browse Source 
+ remove redirect that create loop if not child menu and state == 'done'

TODO: make attendees registration popup responsive

This commit closes #15473
This commit is contained in:
Jairo Llopis
2017-03-24 17:03:20 +01:00
committed by Jeremy Kersten
parent f4cba344aa
commit e7fdd6df73
5 changed files with 162 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_event/controllers/main.py
-3
View File
@@ -165,9 +165,6 @@ class WebsiteEventController(http.Controller):
@http.route(['/event/<model("event.event"):event>/register'], type='http', auth="public", website=True)
def event_register(self, event, **post):
if event.state == 'done':
return request.redirect("/event/%s" % slug(event))
values = {
'event': event,
'main_object': event,
addons/website_event/views/event_templates.xml
+107 -48
View File
@@ -412,59 +412,118 @@
<!-- Registration Templates -->
<template id="registration_template">
<form id="registration_form" t-attf-action="/event/#{slug(event)}/registration/new" method="post">
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
<table itemprop="offers" class="table table-striped">
<thead>
<tr>
<th class="col-sm-4 col-md-6">Ticket Type</th>
<th>End of Registration</th>
<th class="o_th_price">Price</th>
<th>Quantity</th>
</tr>
</thead>
<tbody>
<tr t-if="event.state == 'confirm'">
<td>Event Registration</td>
<td>
<t t-if="event.date_begin">
<span t-esc="event.date_begin_located"/>
<t t-set="tickets_available" t-value="event.seats_available or event.seats_availability == 'unlimited'"/>
<t t-set="buy" t-value="tickets_available and event.state == 'confirm'"/>
<div itemscope="itemscope" itemprop="offers" itemtype="http://schema.org/AggregateOffer">
<form id="registration_form" t-attf-action="/event/#{slug(event)}/registration/new" method="post" class="panel panel-default" t-if="buy">
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
<div class="panel-heading hidden-xs hidden-sm">
<div class="row">
<div class="col-md-3">
<h5><b>Ticket Type</b></h5>
</div>
<div class="col-md-3">
<h5><b>End of Registration</b></h5>
</div>
<div class="col-md-3">
<h5><b>Price</b></h5>
</div>
<div class="col-md-3">
<h5><b>Quantity</b></h5>
</div>
</div>
</div>
<t t-id="tickets" t-call="website_event.ticket">
<t t-set="name">
<span itemprop="name">Event Registration</span>
</t>
<t t-set="registration_end">
<t t-if="event.date_begin">
<span t-esc="event.date_begin_located"/>
</t>
<t t-if="not event.date_begin">
<span>Unlimited</span>
</t>
</t>
<t t-set="price">
<span itemprop="price" content="0">
Free
</span>
</t>
<t t-set="quantity">
<select name="nb_register-0" class="form-control">
<t t-foreach="range(0, (event.seats_availability == 'unlimited' or event.seats_available &gt; 9) and 10 or event.seats_available+1)" t-as="nb">
<option t-esc="nb" t-att-selected="nb == 1 and 'selected'"/>
</t>
<t t-if="not event.date_begin">
<span>Unlimited</span>
</t>
</td>
<td>Free</td>
<td>
<select t-if="event.seats_available or event.seats_availability == 'unlimited'" name="nb_register-0" class="form-control">
<t t-foreach="range(0, (event.seats_availability == 'unlimited' or event.seats_available > 9) and 10 or event.seats_available+1)" t-as="nb">
<t t-if="nb == 1">
<option t-esc="nb" selected="selected"/>
</t>
<t t-if="nb != 1">
<option t-esc="nb"/>
</t>
</t>
</select>
<span t-if="event.seats_availability == 'limited' and not event.seats_available">Sold Out</span>
</td>
</tr>
</tbody>
</table>
<button type="submit" t-if="event.state == 'confirm' and (event.seats_availability == 'unlimited' or event.seats_available)"
class="btn btn-primary btn-lg pull-right a-submit" t-attf-id="#{event.id}">Register Now</button>
<div t-if="not event.state == 'confirm'" class="alert alert-info">
<t t-if="event.state == 'draft'">
</select>
</t>
</t>
<div class="panel-footer">
<div class="row">
<div class="col-md-4 col-md-offset-8 col-lg-3 col-lg-offset-9">
<button type="submit" class="btn btn-primary btn-lg btn-block a-submit" t-attf-id="#{event.id}">
Register Now
</button>
</div>
</div>
</div>
</form>
<div t-if="not buy" class="alert alert-info">
<t t-if="event.state == 'draft'" itemprop="availability" content="http://schema.org/OutOfStock">
Event registration not yet started.
</t>
<t t-if="event.state != 'draft'">
<t t-if="event.state != 'draft'" itemprop="availability" content="http://schema.org/Discontinued">
Event registration is closed.
</t>
<t t-if="uid">
<i class="fa fa-plus-circle"><a t-attf-href="/web#id=#{event.id}&amp;view_type=form&amp;model=event.event"> <em>Configure and Launch Event Registration</em></a></i>
<a t-attf-href="/web#id=#{event.id}&amp;view_type=form&amp;model=event.event">
<i class="fa fa-plus-circle"></i>
<em>Configure and Launch Event Registration</em>
</a>
</t>
</div>
</form>
</div>
</template>
<template id="ticket" name="Ticket offer template">
<div class="col-xs-12 hidden-md hidden-lg panel-heading mb4">
<h5>
<strong>Ticket Type:</strong>
<t t-raw="name"/>
</h5>
<small t-if="description">
<t t-raw="description"/>
</small>
</div>
<div class="panel-body">
<div class="row" itemscope="itemscope" itemtype="http://schema.org/Offer">
<div class="col-md-3 hidden-xs hidden-sm" t-raw="name"/>
<div class="col-xs-6 hidden-md hidden-lg">
<h6>End of Registration</h6>
</div>
<div class="col-xs-6 col-md-3" itemprop="availabilityEnds" t-raw="registration_end"/>
<div class="clearfix hidden-md hidden-lg mb4"/>
<div class="col-xs-6 hidden-md hidden-lg">
<h6>Price</h6>
</div>
<div class="col-xs-6 col-md-3" t-raw="price"/>
<div class="clearfix hidden-md hidden-lg mb4"/>
<div class="col-xs-6 hidden-md hidden-lg">
<h6>Quantity</h6>
</div>
<div class="col-xs-6 col-md-3">
<t t-if="tickets_available">
<link itemprop="availability" content="http://schema.org/InStock"/>
<t t-raw="quantity"/>
</t>
<t t-else="">
<span itemprop="availability" content="http://schema.org/SoldOut">
Sold Out
</span>
</t>
</div>
</div>
</div>
</template>
<template id="registration_attendee_details" name="Registration Attendee Details">
@@ -529,7 +588,7 @@
</div>
<div class="col-md-9 mt16">
<h4><a t-attf-href="/event/#{slug(event)}"><t t-esc="event.name"/></a></h4>
<i class="fa fa-clock-o"/> <span itemprop="startDate" t-esc="event.date_begin_located"> </span> <i>to</i> <span itemprop="endDate" t-esc="event.date_end_located"> </span>
<i class="fa fa-clock-o"></i> <span itemprop="startDate" t-esc="event.date_begin_located"> </span> <i>to</i> <span itemprop="endDate" t-esc="event.date_end_located"> </span>
<div itemprop="location" class="mt16 mb8" t-field="event.address_id" t-options='{
"widget": "contact",
"fields": ["name", "address", "phone", "mobile", "fax", "email"]
@@ -623,7 +682,7 @@
</t>
<b><span t-esc="event_dict['date']"/>: <span><a t-att-href="event_dict['url']"><t t-esc="event_dict['event'].name"/></a></span></b>
</div>
<t t-if="len(events) > 5">
<t t-if="len(events) &gt; 5">
<div t-if="country">
<b><a t-att-href="'/event?country='+str(country.id)">See all events from <span t-esc="country.name"></span></a></b>
</div>
@@ -655,7 +714,7 @@
<!-- User Navbar -->
<template id="content_new_event" inherit_id="website.user_navbar">
<xpath expr="//div[@id='o_website_add_page_modal']//ul" position="inside">
<li groups="event.group_event_manager"><a href="#" data-action="new_event"><i class="fa fa-glass"/><p>New Event</p></a></li>
<li groups="event.group_event_manager"><a href="#" data-action="new_event"><i class="fa fa-glass"></i><p>New Event</p></a></li>
</xpath>
</template>
</odoo>
addons/website_event_sale/controllers/main.py
-4
View File
@@ -3,7 +3,6 @@
from odoo import http, _
from odoo.addons.website_event.controllers.main import WebsiteEventController
from odoo.addons.website.models.website import slug
from odoo.http import request
@@ -11,9 +10,6 @@ class WebsiteEventSaleController(WebsiteEventController):
@http.route(['/event/<model("event.event"):event>/register'], type='http', auth="public", website=True)
def event_register(self, event, **post):
if event.state == 'done':
return request.redirect("/event/%s" % slug(event))
event = event.with_context(pricelist=request.website.get_current_pricelist().id)
values = {
'event': event,
addons/website_event_sale/static/src/js/website.tour.event_sale.js
+1 -1
View File
@@ -29,7 +29,7 @@ tour.register('event_buy_tickets', {
{
content: "Click on `Order Now` button",
extra_trigger: 'select:eq(1):has(option:contains(2):propSelected)',
trigger: '.btn-primary:contains("Order Now")',
trigger: '.btn-primary:contains("Register Now")',
},
{
content: "Fill attendees details",
addons/website_event_sale/views/event_templates.xml
+54 -77
View File
@@ -19,87 +19,64 @@
</template>
<template id="registration_template" inherit_id="website_event.registration_template">
<xpath expr="//thead/tr/th[contains(@class, 'o_th_price')]" position="after">
<t t-set='show_tickets_left' t-value="any([ticket for ticket in event.event_ticket_ids if (ticket.seats_max and ((ticket.seats_reserved or 0)*100 / ticket.seats_max)&gt;75)])"/>
<th t-if="show_tickets_left"></th>
</xpath>
<xpath expr="//tbody" position="replace">
<tbody>
<t t-set="ticket_count" t-value="len([ticket for ticket in event.event_ticket_ids if not ticket.is_expired])"/>
<t t-foreach="event.event_ticket_ids" t-as="ticket">
<tr itemscope="itemscope" itemtype="http://data-vocabulary.org/Offer" t-if="not ticket.is_expired">
<td itemscope="itemscope" itemtype="http://data-vocabulary.org/Product">
<div itemprop="name" t-field="ticket.name"/>
<div><small itemprop="description" t-field="ticket.product_id.description_sale"/></div>
</td>
<td>
<t t-if="ticket.deadline">
<span itemprop="priceValidUntil" t-field="ticket.deadline"/>
</t>
<t t-if="not ticket.deadline">
<span>Unlimited</span>
</t>
</td>
<td>
<t t-if="ticket.price or editable">
<t t-if="(ticket.price-website.get_current_pricelist().currency_id.compute(ticket.price_reduce, event.company_id.sudo().currency_id)) &gt; 1">
<del class="text-danger mr4" style="white-space: nowrap;" t-field="ticket.price" t-options='{
"widget": "monetary",
"from_currency": event.company_id.sudo().currency_id,
"display_currency": website.get_current_pricelist().currency_id
<xpath expr="//t[@t-id='tickets']" position="replace">
<t t-set="saleable_tickets" t-value="event.event_ticket_ids.filtered(lambda t: not t.is_expired)"/>
<t t-id="tickets" t-foreach="saleable_tickets" t-as="ticket">
<t t-call="website_event.ticket">
<t t-set="name">
<span itemprop="name" t-field="ticket.name"/>
</t>
<t t-set="description">
<span itemprop="description" t-field="ticket.product_id.description_sale"/>
</t>
<t t-set="registration_end">
<t t-if="ticket.deadline">
<span itemprop="priceValidUntil" t-field="ticket.deadline"/>
</t>
<t t-if="not ticket.deadline">
<span>Unlimited</span>
</t>
</t>
<t t-set="price">
<t t-if="ticket.price or editable">
<t t-if="(ticket.price-website.get_current_pricelist().currency_id.compute(ticket.price_reduce, event.company_id.sudo().currency_id)) &gt; 1">
<del class="text-danger mr4" t-field="ticket.price" t-options='{
"widget": "monetary",
"from_currency": event.company_id.sudo().currency_id,
"display_currency": website.get_current_pricelist().currency_id
}'/>
</t>
<span t-field="ticket.price_reduce" t-options='{
"widget": "monetary",
"display_currency": website.pricelist_id.currency_id
}' groups="sale.group_show_price_subtotal"/>
<span t-field="ticket.price_reduce_taxinc" t-options='{
"widget": "monetary",
"display_currency": website.pricelist_id.currency_id
}' groups="sale.group_show_price_total"/>
<span itemprop="price" style="display:none;" t-esc="ticket.price"/>
<span itemprop="priceCurrency" style="display:none;" t-esc="website.pricelist_id.currency_id.name"/>
</t>
<t t-if="not ticket.price and not editable">
<span>Free</span>
<span t-field="ticket.price_reduce" t-options='{
"widget": "monetary",
"display_currency": website.pricelist_id.currency_id
}' groups="sale.group_show_price_subtotal"/>
<span t-field="ticket.price_reduce_taxinc" t-options='{
"widget": "monetary",
"display_currency": website.pricelist_id.currency_id
}' groups="sale.group_show_price_total"/>
<span itemprop="price" style="display:none;" t-esc="ticket.price"/>
<span itemprop="priceCurrency" style="display:none;" t-esc="website.pricelist_id.currency_id.name"/>
</t>
<t t-if="not ticket.price and not editable">
<span>Free</span>
</t>
<span t-if="ticket.seats_max and ((ticket.seats_reserved or 0)*100 / ticket.seats_max)&gt;75" class="badge" itemprop="availability" content="http://schema.org/LimitedAvailability">
<t t-esc="ticket.seats_max - ticket.seats_reserved"/>
<span>left</span>
</span>
</t>
<t t-set="quantity">
<select t-attf-name="nb_register-#{ticket.id}" class="form-control">
<t t-set="seats_max_ticket" t-value="(ticket.seats_availability == 'unlimited' or ticket.seats_available &gt; 9) and 10 or ticket.seats_available + 1"/>
<t t-set="seats_max_event" t-value="(event.seats_availability == 'unlimited' or event.seats_available &gt; 9) and 10 or event.seats_available + 1"/>
<t t-set="seats_max" t-value="min(seats_max_ticket, seats_max_event)"/>
<t t-foreach="range(0, seats_max)" t-as="nb">
<option t-esc="nb" t-att-selected="len(saleable_tickets) == 1 and nb == 1 and 'selected'"/>
</t>
</td>
<td t-if="show_tickets_left">
<span t-if="ticket.seats_max and ((ticket.seats_reserved or 0)*100 / ticket.seats_max)&gt;75" class="text-muted">
<t t-esc="ticket.seats_max - ticket.seats_reserved"/> <span>left</span>
</span>
</td>
<td>
<select t-if="(event.seats_available or event.seats_availability == 'unlimited') and (ticket.seats_available or ticket.seats_availability == 'unlimited')" t-attf-name="nb_register-#{ticket.id}" class="form-control">
<t t-set="seats_max_ticket" t-value="(ticket.seats_availability == 'unlimited' or ticket.seats_available > 9) and 10 or ticket.seats_available + 1"/>
<t t-set="seats_max_event" t-value="(event.seats_availability == 'unlimited' or event.seats_available > 9) and 10 or event.seats_available + 1"/>
<t t-set="seats_max" t-value="min(seats_max_ticket, seats_max_event)"/>
<t t-foreach="range(0, seats_max)" t-as="nb">
<t t-if="ticket_count == 1 and nb == 1">
<option t-esc="nb" selected="selected"/>
</t>
<t t-if="ticket_count != 1 or nb != 1">
<option t-esc="nb"/>
</t>
</t>
</select>
<span t-if="(not event.seats_available and event.seats_availability == 'limited') or (ticket.seats_availability == 'limited' and not ticket.seats_available)">Sold Out</span>
</td>
</tr>
</select>
</t>
</t>
</tbody>
</xpath>
<xpath expr="//button[@type='submit']" position="replace">
<t t-set="ticket_buy" t-value="any(ticket for ticket in event.event_ticket_ids if not ticket.is_expired and ticket.price)"/>
<button type="submit" t-if="event.state == 'confirm' and (event.seats_available or event.seats_availability == 'unlimited')"
class="btn btn-primary btn-lg pull-right a-submit" t-attf-id="#{event.id}">
<t t-if="ticket_buy">
Order Now
</t>
<t t-if="not ticket_buy">
Register Now
</t>
</button>
</t>
</xpath>
<xpath expr="//form[@id='registration_form']" position="attributes">
<attribute name="t-if">event.event_ticket_ids</attribute>