From 05212ea7c10866958abe5386a06bc28452e4aef4 Mon Sep 17 00:00:00 2001
From: lthanhhieu <lthanhhieu@tma.com.vn>
Date: Tue, 26 Mar 2024 17:36:30 +0700
Subject: [PATCH 1/2] Fix-9127: Add the unique ticket code into the downlad CSV
 file

---
 app/controllers/events/view/tickets/attendees/list.js | 7 -------
 app/routes/events/view/tickets/attendees/list.js      | 6 ++++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/controllers/events/view/tickets/attendees/list.js b/app/controllers/events/view/tickets/attendees/list.js
index b17ae99d34c..4f595b4ddb2 100644
--- a/app/controllers/events/view/tickets/attendees/list.js
+++ b/app/controllers/events/view/tickets/attendees/list.js
@@ -42,13 +42,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         headerComponent : 'tables/headers/sort',
         isSortable      : true
       },
-      {
-        name            : 'Ticket Name',
-        width           : 80,
-        valuePath       : 'ticket.name',
-        headerComponent : 'tables/headers/sort',
-        isSortable      : true
-      },
       {
         name            : 'Tags',
         width           : 100,
diff --git a/app/routes/events/view/tickets/attendees/list.js b/app/routes/events/view/tickets/attendees/list.js
index 986db7d680e..2a210efed72 100644
--- a/app/routes/events/view/tickets/attendees/list.js
+++ b/app/routes/events/view/tickets/attendees/list.js
@@ -122,7 +122,7 @@ export default class extends Route.extend(EmberTableRouteMixin) {
 
 
     let queryString = {
-      include        : 'user,order',
+      include        : 'user,ticket',
       filter         : filterOptions,
       'page[size]'   : params.per_page,
       'page[number]' : params.page || 1
@@ -134,9 +134,11 @@ export default class extends Route.extend(EmberTableRouteMixin) {
       this.addDefaultValue(tags);
     }
     const attendees = await this.asArray(await eventDetails.query('attendees', queryString));
+    const orders = await this.asArray(await eventDetails.query('orders', {}));
     return {
       tags,
-      attendees
+      attendees,
+      orders
     };
   }
 }

From e7b00987e2025689476248ad8d8b1279726e2342 Mon Sep 17 00:00:00 2001
From: lthanhhieu <lthanhhieu@tma.com.vn>
Date: Wed, 27 Mar 2024 09:48:16 +0700
Subject: [PATCH 2/2] Fix-9127: Add the unique ticket code into the downlad CSV
 file

---
 .../events/view/tickets/attendees/list.js     |  5 +--
 .../view/tickets/attendees/cell-order.hbs     | 40 ++++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/controllers/events/view/tickets/attendees/list.js b/app/controllers/events/view/tickets/attendees/list.js
index 4f595b4ddb2..c7a7808fbdd 100644
--- a/app/controllers/events/view/tickets/attendees/list.js
+++ b/app/controllers/events/view/tickets/attendees/list.js
@@ -25,14 +25,13 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         },
         options: {
           tags: this.model.tags
-
         }
       },
       {
         name            : 'Order',
         width           : 190,
-        valuePath       : 'order',
-        extraValuePaths : ['user'],
+        valuePath       : 'order.identifier',
+        extraValuePaths : ['order'],
         cellComponent   : 'ui-table/cell/events/view/tickets/attendees/cell-order'
       },
       {
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs
index a183b12089e..b3af9736a51 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs
@@ -1,20 +1,22 @@
-<div class="ui tiny header">
-  <LinkTo @route="orders.view" @model={{this.record.identifier}}>{{this.record.identifier}}</LinkTo>
-  <div class="ui basic mini {{order-color this.record.status}} label attendees-margin">
-    {{this.record.status}}
+{{#if this.record}}
+  <div class="ui tiny header">
+    <LinkTo @route="orders.view" @model={{this.extraRecords.order.identifier}}>{{this.extraRecords.order.identifier}}</LinkTo>
+    <div class="ui basic mini {{order-color this.extraRecords.order.status}} label attendees-margin">
+      {{this.extraRecords.order.status}}
+    </div>
+    <div class="sub header">
+      {{#if this.extraRecords.order.paidVia}}
+        <span class="weight-800">
+          {{t 'Payment via'}} {{this.extraRecords.order.paidVia}}
+        </span>
+      {{/if}}
+      {{#if (eq this.extraRecords.order.status 'completed')}}
+        {{general-date this.extraRecords.order.completedAt 'date-time-short'}}
+        {{moment-from-now this.extraRecords.order.completedAt}}
+      {{else}}
+        {{general-date this.extraRecords.order.createdAt 'date-time-short'}}
+        {{moment-from-now this.extraRecords.order.createdAt}}
+      {{/if}}
+    </div>
   </div>
-  <div class="sub header">
-    {{#if this.record.paidVia}}
-      <span class="weight-800">
-        {{t 'Payment via'}} {{this.record.paidVia}}
-      </span>
-    {{/if}}
-    {{#if (eq this.record.status 'completed')}}
-      {{general-date this.record.completedAt 'date-time-short'}}
-      {{moment-from-now this.record.completedAt}}
-    {{else}}
-      {{general-date this.record.createdAt 'date-time-short'}}
-      {{moment-from-now this.record.createdAt}}
-    {{/if}}
-  </div>
-</div>
+{{/if}}
\ No newline at end of file