fixup! fixup! fixup! fixup! fixup! fixup! fixup! [ADD] portal_event_t…

…ickets
it-projects-llc · Oct 14, 2024 · ec6e833 · ec6e833
1 parent 540c3cc
commit ec6e833
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 36 deletions.
diff --git a/portal_event_tickets/__manifest__.py b/portal_event_tickets/__manifest__.py
@@ -20,7 +20,8 @@
         "views/event_registration.xml",
         "views/event_event.xml",
         "data/mail_template_data.xml",
+        "views/assets.xml"
     ],
     "qweb": [],
-    "demo": ["views/assets_demo.xml", "data/res_users_demo.xml"],
+    "demo": ["data/res_users_demo.xml"],
 }
diff --git a/portal_event_tickets/static/src/js/portal.js b/portal_event_tickets/static/src/js/portal.js
@@ -0,0 +1,35 @@
+odoo.define('portal_event_tickets.portal', function (require) {
+    'use strict';
+
+    var publicWidget = require('web.public.widget');
+
+    publicWidget.registry.transferTicketWidget = publicWidget.Widget.extend({
+        selector: '#transfer_ticket',
+
+        start: function () {
+            var def = this._super.apply(this, arguments);
+
+            var event_name = this.$el.data("event-name");
+            var $modal = $('#modal_attendees_registration');
+
+            /* show form inline */
+            $modal.find('form').attr('action', '/my/tickets/transfer/receive');
+            $modal.removeClass('modal fade');
+
+            /* remove Cancel button; update title */
+            var $submit = $modal.find('[type=submit]');
+            $submit.parent().empty().append($submit);
+            $submit.text('Confirm');
+
+            /* remove Close button */
+            $modal.find('.close').remove();
+
+            /* make email non-editable */
+            $modal.find('[name=1-email]').attr('disabled', '1');
+
+            /* update title */
+            $modal.find('h4.modal-title').html('Receive the ticket for <b>' + event_name + '</b>');
+            return def;
+        },
+    });
+});
diff --git a/portal_event_tickets/static/src/js/ticket_transfer.tour.js b/portal_event_tickets/static/src/js/ticket_transfer.tour.js
@@ -4,7 +4,7 @@ odoo.define("portal_event_tickets.ticket_transfer_tour", function (require) {
     var tour = require("web_tour.tour");
 
     var options = {
-        // Test: true,
+        test: true,
         url: "/my/tickets/transfer/receive",
     };
 

diff --git a/portal_event_tickets/tests/common.py b/portal_event_tickets/tests/common.py
@@ -91,6 +91,7 @@ def _create_ticket(self, ticket_type, partner, event):
                 "order_id": sale_order.id,
                 "name": "sale order line",
                 "event_id": event.id,
+                "event_ticket_id": ticket_type.id,
             }
         )
 

diff --git a/portal_event_tickets/views/assets_demo.xml → portal_event_tickets/views/assets.xml b/portal_event_tickets/views/assets_demo.xml → portal_event_tickets/views/assets.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Tours">
+    <template id="assets_frontend" inherit_id="website.assets_frontend">
+        <xpath expr="//script[last()]" position="after">
+            <script type="text/javascript" src="/portal_event_tickets/static/src/js/portal.js"></script>
+        </xpath>
+    </template>
+
+    <template id="assets_tests" inherit_id="website.assets_tests">
         <xpath expr="." position="inside">
             <script
                 type="text/javascript"

diff --git a/portal_event_tickets/views/portal_templates.xml b/portal_event_tickets/views/portal_templates.xml
@@ -330,39 +330,15 @@
     <template id="portal_ticket_transfer_receive" name="Ticket">
         <t t-call="website.layout">
             <t t-set="autofill_user" t-value="env.user" />
-            <t t-call="website_event.registration_attendee_details">
-                <input
-                    name="transfer_ticket"
-                    t-att-value="transfer_ticket.id"
-                    type="hidden"
-                />
-            </t>
-            <script type="text/javascript">
-              document.addEventListener('DOMContentLoaded', function() {
-              var event_name = '<t t-esc="event.name" />';
-              $modal = $('#modal_attendees_registration');
-
-              /* show form inline */
-              $modal.find('form').attr('action', '/my/tickets/transfer/receive');
-              $modal.removeClass('modal fade');
-              //$modal.find('.modal-dialog.modal-lg').removeClass('modal-dialog modal-lg');
-
-              /* remove Cancel button; update title */
-              var $submit = $modal.find('[type=submit]');
-              $submit.parent().empty().append($submit);
-              $submit.text('Confirm');
-
-              /* remove Close button */
-              $modal.find('.close').remove();
-
-              /* make email non-editable */
-              $modal.find('[name=1-email]').attr('disabled', '1');
-
-              /* update title */
-              $modal.find('h4.modal-title').html('Receive the ticket for <b
-                >' + event_name + '</b>');
-              });
-          </script>
+            <div id="transfer_ticket" t-att-data-event-name="event.name">
+                <t t-call="website_event.registration_attendee_details">
+                    <input
+                        name="transfer_ticket"
+                        t-att-value="transfer_ticket.id"
+                        type="hidden"
+                        />
+                </t>
+            </div>
         </t>
     </template>
     <template id="message_origin_link">