[IMP] website_event

bzr revid: chm@openerp.com-20130805150319-y5iy0zxkq4fkuk5h

diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py
index f871094..ad615c0 100644 (file)
--- a/addons/website_event/__openerp__.py
+++ b/addons/website_event/__openerp__.py
@@ -8,7 +8,7 @@ OpenERP Blog
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'event'],
+    'depends': ['website', 'event', 'website_sale'],
     'data': [
         'views/website_event.xml',
         'security/ir.model.access.csv',

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index c698112..a8b599b 100644 (file)
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -10,6 +10,7 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from openerp import tools
 import urllib
+import werkzeug
 
 
 class website_hr(http.Controller):
@@ -21,7 +22,7 @@ class website_hr(http.Controller):
         searches.setdefault('date', 'all')
         searches.setdefault('type', 'all')
         searches.setdefault('country', 'all')
-        
+
         domain_search = {}
 
         def sd(date):
@@ -81,7 +82,7 @@ class website_hr(http.Controller):
         countries.insert(0, {'country_id_count': event_obj.search(request.cr, request.uid, domain, count=True), 'country_id': ("all", _("All Countries"))})
 
 
-        obj_ids = event_obj.search(request.cr, request.uid, dom_without("none"))
+        obj_ids = event_obj.search(request.cr, request.uid, dom_without("none"), order="date_begin DESC")
         values = {
             'event_ids': event_obj.browse(request.cr, request.uid, obj_ids),
             'dates': dates,
@@ -96,7 +97,20 @@ class website_hr(http.Controller):
 
     @http.route(['/event/<int:event_id>'], type='http', auth="public")
     def event(self, event_id=None, **post):
-        return ""
+        event = request.registry['event.event'].browse(request.cr, request.uid, event_id)
+        values = {
+            'event_id': event,
+            'google_map_url': "http://maps.googleapis.com/maps/api/staticmap?center=%s&sensor=false&zoom=12&size=298x298" % urllib.quote_plus('%s, %s %s, %s' % (event.street, event.city, event.zip, event.country_id and event.country_id.name_get()[0][1] or ''))
+        }
+        html = website.render("website_event.detail", values)
+        return html
+
+    @http.route(['/event/<int:event_id>/add_cart'], type='http', auth="public")
+    def add_cart(self, event_id=None, **post):
+        if not post:
+            return werkzeug.utils.redirect("/event/%s/" % event_id)
+
+        return werkzeug.utils.redirect("/shop/checkout" % event_id)
 
     @http.route(['/event/publish'], type='http', auth="public")
     def publish(self, **post):

diff --git a/addons/website_event/event.py b/addons/website_event/event.py
index a1f6b32..72ad35a 100644 (file)
--- a/addons/website_event/event.py
+++ b/addons/website_event/event.py
@@ -7,5 +7,17 @@ class event(osv.osv):
     _inherit = 'event.event'
     _columns = {
         'website_published': fields.boolean('Available in the website'),
+        'description_website': fields.html('Description for the website'),
+        'product_ids': fields.one2many('event.event.product', "event_id", "Event"),
     }
 
+
+class event_product(osv.osv):
+    _name = 'event.event.product'
+    _columns = {
+        'event_id': fields.many2one('event.event', "Event"),
+        'product_id': fields.many2one('product.product', 'Product'),
+        'price': fields.float('Price'),
+        'qty': fields.integer('Current Registrations', readonly=True),
+        'max_qty': fields.integer('Maximum Registrations'),
+    }

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 01a2540..42f155d 100644 (file)
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -2,6 +2,29 @@
 <openerp>
 <data>
 
+    <record id="view_event_form" model="ir.ui.view">
+        <field name="name">view_event_form</field>
+        <field name="model">event.event</field>
+        <field name="inherit_id" ref="event.view_event_form"/>
+        <field name="arch" type="xml">
+            <data>
+                <xpath expr="//notebook" position="inside">
+                    <page string="Tarifs">
+                        <group colspan="4">
+                            <field name="product_ids">
+                                <tree string="Payments" editable="top">
+                                    <field name="product_id"/>
+                                    <field name="price"/>
+                                    <field name="max_qty"/>
+                                </tree>
+                            </field>
+                        </group>
+                    </page>
+                </xpath>
+           </data>
+        </field>
+    </record>
+
     <!-- Layout add nav and footer -->
 
     <record id="header_website_event" model="ir.ui.view">
@@ -28,6 +51,18 @@
     </record>
 
     <!-- Page --> 
+    <template id="button">
+        <t t-if="event_id.register_avail">
+            <span t-if="event_id.register_avail == 9999" class="label pull-right">No ticket available.</span>
+            <span t-if="event_id.register_avail != 9999" t-att-class="'label pull-right label-%%s' %% (event_id.register_avail &lt;= 10 and 'warning' or 'info')">
+                <t t-if="event_id.register_avail &lt;= 10">Only</t>
+                <t t-esc="event_id.register_avail"/>
+                <t t-if="event_id.register_avail &gt; 1">tickets </t>
+                <t t-if="event_id.register_avail == 1">ticket </t>
+                available.
+            </span>
+        </t>
+    </template>
 
     <template id="index">
         <t t-call="website.layout">
@@ -69,25 +104,12 @@
                             <t t-foreach="event_ids" t-as="event_id">
                                 <li class="media thumbnail">
                                     <div class="media-body">
-                                        <t t-if="event_id.register_avail">
-                                            <t t-if="event_id.register_avail == 9999">
-                                                <span class="label pull-right">No ticket available.</span>
-                                            </t>
-                                            <span t-if="event_id.register_avail != 9999" t-att-class="'label pull-right label-%%s' %% (event_id.register_avail &lt;= 10 and 'warning' or 'info')">
-                                                <t t-if="event_id.register_avail &lt;= 10">Only</t>
-                                                <t t-esc="event_id.register_avail"/>
-                                                <t t-if="event_id.register_avail &gt; 1">tickets </t>
-                                                <t t-if="event_id.register_avail == 1">ticket </t>
-                                                available.
-                                            </span>
-                                        </t>
-                                        <h4 class="media-heading"><a t-att-href="'event/%%s' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
-                                        <t t-if="editable">
-                                            <a href="#" t-att-data-id="event_id.id" class="pull-right">
-                                                <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
-                                                <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span>
-                                            </a>
-                                        </t>
+                                        <t t-call="website_event.button"/>
+                                        <h4 class="media-heading"><a t-att-href="'/event/%%s' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
+                                        <a t-if="editable" href="#" t-att-data-id="event_id.id" class="pull-right">
+                                            <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
+                                            <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span>
+                                        </a>
                                         <div>
                                             <span t-field="event_id.type">: </span>
                                             <t t-if="event_id.user_id">
@@ -100,7 +122,6 @@
                                         <div t-if="event_id.country_id">
                                             <i class="icon-map-marker"></i> <span t-field="event_id.city"> </span>  <span t-field="event_id.zip"> </span>, <span t-field="event_id.country_id"> </span>
                                         </div>
-                                        <div t-field="event_id.note"> </div>
                                     </div>
                                 </li>
                             </t>
@@ -110,5 +131,64 @@
             </div>
         </t>
     </template>
+
+    <template id="detail">
+        <t t-call="website.layout">
+            <t t-set="head">
+                <script type="text/javascript" src="/website_event/static/src/js/website_event.js"></script>
+                <t t-raw="head"/>
+            </t>
+            <t t-set="title">Events</t>
+            <div class="container mt48">
+                <div class="row">
+                    <div class="span4 css_noprint">
+                        <h4>When &amp; Where</h4>
+                        <img t-att-src="google_map_url"/>
+                        <address>
+                            <h4 t-field="event_id.address_id">Name</h4><br/>
+                            <span t-field="event_id.street"/><br/>
+                            <span t-field="event_id.city"/>, <span t-field="event_id.zip"/><br/>
+                            <span t-field="event_id.country_id"> </span><br/>
+                            <i class="icon-time"></i> <span t-field="event_id.date_begin"> </span><br/>
+                            <i class="icon-time"></i> <span t-field="event_id.date_end"> </span><br/>
+                            <br/>
+                            <t t-if="event_id.user_id">
+                                Organized by: <span t-field="event_id.user_id"/><br/>
+                                <span>&amp;#x2706; <span t-field="event_id.user_id.phone"></span></span><br/>
+                                <i class="icon-envelope"></i> <span t-field="event_id.user_id.email"></span>
+                            </t>
+                        </address>
+                    </div>
+                    <div class="span8">
+                        <div class="media-body">
+                            <t t-call="website_event.button"/>
+                            <h4 class="media-heading"><a t-att-href="'/event/%%s' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
+                            <a t-if="editable" href="#" t-att-data-id="event_id.id" class="pull-right">
+                                <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
+                                <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span>
+                            </a>
+                            <h4>Ticket Information</h4>
+                            <form t-att-action="'/event/%%s/add_cart' %% event_id.id">
+                                <div t-foreach="event_id.product_ids" t-as="prod">
+                                    <span t-field="prod.product_id"/>
+                                    <span t-field="prod.price"/>
+                                    <span t-field="prod.qty"/>
+                                    <span t-field="prod.max_qty"/>
+                                    <select t-att-name="'product[%%s]' %% prod.id">
+                                        <t t-foreach="range(0,10)" t-as="nb">
+                                            <option t-esc="nb"/>
+                                        </t>
+                                    </select>
+                                </div>
+                                <button type="submit" class="btn btn-primary">Order Now</button>
+                            </form>
+                            <h4>Event Details</h4>
+                            <div t-field="event_id.description_website"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </t>
+    </template>
  </data>
 </openerp>
\ No newline at end of file