diff --git a/portal_event_tickets/__manifest__.py b/portal_event_tickets/__manifest__.py index 65320a1..8b09e68 100644 --- a/portal_event_tickets/__manifest__.py +++ b/portal_event_tickets/__manifest__.py @@ -3,7 +3,7 @@ "summary": """Allows to customers see their tickets for events at the Portal""", "category": "Marketing", "images": ["images/banner.jpg"], - "version": "17.0.1.1.0", + "version": "17.0.2.0.0", "author": "IT-Projects LLC", "support": "apps@it-projects.info", "website": "https://github.com/it-projects-llc/website-addons", diff --git a/portal_event_tickets/controllers/main.py b/portal_event_tickets/controllers/main.py index 8a6e08f..702b614 100644 --- a/portal_event_tickets/controllers/main.py +++ b/portal_event_tickets/controllers/main.py @@ -44,7 +44,7 @@ def account(self, *args, **kw): return response @http.route( - ["/my/tickets", "/my/tickets/page/"], + ["/my/registrations", "/my/registrations/page/"], type="http", auth="user", website=True, @@ -64,7 +64,7 @@ def portal_my_tickets(self, page=1, date_begin=None, date_end=None, **kw): ticket_count = Registration.search_count(domain) # make pager pager = request.website.pager( - url="/my/tickets", + url="/my/registrations", url_args={"date_begin": date_begin, "date_end": date_end}, total=ticket_count, page=page, @@ -80,7 +80,7 @@ def portal_my_tickets(self, page=1, date_begin=None, date_end=None, **kw): "page_name": "tickets", "tickets": tickets, "pager": pager, - "default_url": "/my/tickets", + "default_url": "/my/registrations", } ) return request.render("portal_event_tickets.portal_my_tickets", values) @@ -120,7 +120,9 @@ def _has_ticket_access(self, ticket, to_update=False): return env.user.has_group("event.group_event_manager") - @http.route(["/my/tickets/"], type="http", auth="user", website=True) + @http.route( + ["/my/registrations/"], type="http", auth="user", website=True + ) def ticket_page(self, ticket=None, **kw): values = self._prepare_portal_layout_values() ticket = request.env["event.registration"].browse(ticket) @@ -135,7 +137,10 @@ def ticket_page(self, ticket=None, **kw): return request.render("portal_event_tickets.portal_ticket_page", values) @http.route( - ["/my/tickets/pdf/"], type="http", auth="user", website=True + ["/my/registrations/pdf/"], + type="http", + auth="user", + website=True, ) def portal_get_ticket(self, ticket_id=None, **kw): ticket = request.env["event.registration"].browse(ticket_id) @@ -165,7 +170,7 @@ def portal_get_ticket(self, ticket_id=None, **kw): return request.make_response(pdf, headers=pdfhttpheaders) @http.route( - ["/my/tickets/transfer"], + ["/my/registrations/transfer"], type="http", auth="user", methods=["GET"], @@ -181,7 +186,7 @@ def ticket_transfer_editor(self, **kw): return request.render("portal_event_tickets.portal_ticket_transfer", values) @http.route( - ["/my/tickets/transfer"], + ["/my/registrations/transfer"], type="http", auth="user", methods=["POST"], @@ -238,7 +243,7 @@ def _ticket_transfer(self, env, to_email, ticket_id): return error @http.route( - ["/my/tickets/transfer/receive"], + ["/my/registrations/transfer/receive"], type="http", auth="user", methods=["GET", "POST"], @@ -312,10 +317,14 @@ def ticket_transfer_receive(self, transfer_ticket=None, **kw): receiver.sudo().write(partner_vals) ticket.sudo().transferring_finished() - return request.redirect("/my/tickets") + return request.redirect("/my/registrations") @http.route( - ["/my/tickets/change"], type="http", auth="user", methods=["POST"], website=True + ["/my/registrations/change"], + type="http", + auth="user", + methods=["POST"], + website=True, ) def ticket_change(self, ticket_id, **kw): ticket = request.env["event.registration"].browse(int(ticket_id)) diff --git a/portal_event_tickets/data/mail_template_data.xml b/portal_event_tickets/data/mail_template_data.xml index e1fdaf3..cf074c9 100644 --- a/portal_event_tickets/data/mail_template_data.xml +++ b/portal_event_tickets/data/mail_template_data.xml @@ -19,7 +19,7 @@

diff --git a/portal_event_tickets/i18n/portal_event_tickets.pot b/portal_event_tickets/i18n/portal_event_tickets.pot index 4b98328..5b4410c 100644 --- a/portal_event_tickets/i18n/portal_event_tickets.pot +++ b/portal_event_tickets/i18n/portal_event_tickets.pot @@ -24,7 +24,7 @@ msgid "\n" "\n" " \n" " You \n" diff --git a/portal_event_tickets/static/src/js/portal.esm.js b/portal_event_tickets/static/src/js/portal.esm.js index 1718a61..91060c4 100644 --- a/portal_event_tickets/static/src/js/portal.esm.js +++ b/portal_event_tickets/static/src/js/portal.esm.js @@ -12,7 +12,7 @@ publicWidget.registry.TransferTicketWidget = publicWidget.Widget.extend({ const $modal = $("#modal_attendees_registration"); /* Show form inline */ - $modal.find("form").attr("action", "/my/tickets/transfer/receive"); + $modal.find("form").attr("action", "/my/registrations/transfer/receive"); $modal.removeClass("modal fade"); /* Remove Cancel button; update title */ diff --git a/portal_event_tickets/static/src/js/ticket_transfer.tour.esm.js b/portal_event_tickets/static/src/js/ticket_transfer.tour.esm.js index 4709640..14d9984 100644 --- a/portal_event_tickets/static/src/js/ticket_transfer.tour.esm.js +++ b/portal_event_tickets/static/src/js/ticket_transfer.tour.esm.js @@ -4,7 +4,7 @@ import {registry} from "@web/core/registry"; registry.category("web_tour.tours").add("ticket_transfer_receive", { test: true, - url: "/my/tickets/transfer/receive", + url: "/my/registrations/transfer/receive", steps: () => [ { content: "Fill attendees details", @@ -20,7 +20,7 @@ registry.category("web_tour.tours").add("ticket_transfer_receive", { trigger: 'button:contains("Confirm")', }, { - content: "We are redirected to /my/tickets page", + content: "We are redirected to /my/registrations page", trigger: ".breadcrumb-item:contains(Tickets)", run: function () { // It's needed to don't make a click on the link diff --git a/portal_event_tickets/static/src/js/ticket_upgrade.tour.esm.js b/portal_event_tickets/static/src/js/ticket_upgrade.tour.esm.js index 79dcefc..054d492 100644 --- a/portal_event_tickets/static/src/js/ticket_upgrade.tour.esm.js +++ b/portal_event_tickets/static/src/js/ticket_upgrade.tour.esm.js @@ -5,7 +5,7 @@ import wsTourUtils from "@website_sale/js/tours/tour_utils"; registry.category("web_tour.tours").add("portal_event_tickets.ticket_upgrade_tour", { test: true, - url: "/my/tickets", + url: "/my/registrations", steps: () => [ { content: "Choose first ticket", diff --git a/portal_event_tickets/tests/test_ticket_pdf.py b/portal_event_tickets/tests/test_ticket_pdf.py index b7df33a..dd93045 100644 --- a/portal_event_tickets/tests/test_ticket_pdf.py +++ b/portal_event_tickets/tests/test_ticket_pdf.py @@ -15,5 +15,7 @@ def test_ticket_access_pdf(self): login = self.user_portal1.login self.authenticate(login, login) - r = self.url_open(f"/my/tickets/pdf/{self.ticket1.id}", allow_redirects=False) + r = self.url_open( + f"/my/registrations/pdf/{self.ticket1.id}", allow_redirects=False + ) self.assertEqual(r.status_code, 200) diff --git a/portal_event_tickets/tests/test_ticket_upgrade.py b/portal_event_tickets/tests/test_ticket_upgrade.py index 192cba5..15d5aae 100644 --- a/portal_event_tickets/tests/test_ticket_upgrade.py +++ b/portal_event_tickets/tests/test_ticket_upgrade.py @@ -50,7 +50,7 @@ def test_ticket_upgrade(self): self.assertEqual(len(reg), 1, "Unexpected behavior") self.start_tour( - "/my/tickets", + "/my/registrations", "portal_event_tickets.ticket_upgrade_tour", login="portal", step_delay=500, diff --git a/portal_event_tickets/views/portal_templates.xml b/portal_event_tickets/views/portal_templates.xml index d35c930..7ce9980 100644 --- a/portal_event_tickets/views/portal_templates.xml +++ b/portal_event_tickets/views/portal_templates.xml @@ -24,7 +24,7 @@ Tickets / Ticket # @@ -45,7 +45,7 @@ Tickets - + View your tickets # - + @@ -144,7 +146,7 @@ Upgrade / Change ticket @@ -184,7 +186,10 @@ >