diff --git a/controllers/kalachakra.py b/controllers/kalachakra.py index 8877e70..99e094f 100644 --- a/controllers/kalachakra.py +++ b/controllers/kalachakra.py @@ -8,12 +8,13 @@ from datetime import datetime from odoo.tools import format_datetime, format_date, is_html_empty from dateutil.relativedelta import relativedelta from odoo.exceptions import UserError - +import babel +import babel.dates from odoo.addons.web.controllers.main import ensure_db, Home from odoo.addons.website_event.controllers.main import WebsiteEventController from odoo.addons.payment.controllers.portal import PaymentProcessing from odoo.addons.sale.controllers.portal import CustomerPortal - +from odoo.tools.misc import formatLang, format_date as odoo_format_date, get_lang from odoo.addons.portal.controllers.portal import pager as portal_pager, get_records_pager from odoo.addons.auth_signup.models.res_users import SignupError from odoo.addons.auth_signup.controllers.main import AuthSignupHome @@ -81,7 +82,7 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing): if country_code and event.country_id.code == country_code: result['country'] = country result['events'].append({ - "date": self.get_formated_date(event), + "date": self.get_formated_date2(event), "event": event, "url": event.website_url}) return request.env['ir.ui.view']._render_template("kalachakra.country_booking_events_list", result) @@ -103,11 +104,22 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing): if country_code and event.country_id.code == country_code: result['country'] = country result['events'].append({ - "date": self.get_formated_date(event), + "date": self.get_formated_date2(event), "event": event, "url": event.website_url}) return request.env['ir.ui.view']._render_template("website_event.country_events_list", result) + def get_formated_date2(self, event): + start_date = fields.Datetime.from_string(event.date_begin).date() + end_date = fields.Datetime.from_string(event.date_end).date() + month_start = babel.dates.get_month_names('abbreviated', locale=get_lang(event.env).code)[start_date.month] + month_end = babel.dates.get_month_names('abbreviated', locale=get_lang(event.env).code)[end_date.month] + if month_start==month_end: + return ('%s%s %s') % (start_date.strftime("%e"), (end_date != start_date and ("-" + end_date.strftime("%e")) or ""),month_start) + else: + return ('%s %s %s %s') % (start_date.strftime("%e"),month_start, "-"+end_date.strftime("%e"),month_end) + + def _extract_searched_event_tags(self, searches): tags = request.env['event.tag'] diff --git a/models/event.py b/models/event.py index 91d528e..3268d7f 100644 --- a/models/event.py +++ b/models/event.py @@ -116,6 +116,7 @@ class KalachakraEvent(models.Model): child_event.address_id=self.address_id child_event.online_only=self.online_only + child_event.no_online_payment=self.no_online_payment child_event.online_event=self.online_event child_event.online_link=self.online_link child_event.online_id=self.online_id @@ -230,6 +231,7 @@ class KalachakraEvent(models.Model): vals['online_event']=rec.online_event vals['online_link']=rec.online_link vals['online_id']=rec.online_id + vals['no_online_payment']=rec.no_online_payment vals['online_password']=rec.online_password vals['parent_event_id']=int(rec.id) vals['cover_properties']=rec.cover_properties diff --git a/views/website_snippets.xml b/views/website_snippets.xml index 07fb0d7..de958d7 100644 --- a/views/website_snippets.xml +++ b/views/website_snippets.xml @@ -25,25 +25,14 @@ - - - +