Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix-9127: Add the unique ticket code into the downlad CSV file #9184

Closed
wants to merge 25 commits into from
Closed

Fix-9127: Add the unique ticket code into the downlad CSV file #9184

wants to merge 25 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Mar 26, 2024

Fixes #fossasia/open-event-server#9127

Short description of what this resolves:

  • Add the unique ticket code into the downlad CSV file

Changes proposed in this pull request:

  • Add the unique ticket code into the downlad CSV file

Checklist

  • I have read the Contribution & Best practices Guide.
  • My branch is up-to-date with the Upstream development branch.
  • The acceptance, integration, unit tests and linter pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

weblate and others added 24 commits August 18, 2023 02:21
Currently translated at 99.9% (2552 of 2554 strings)

Translation: Open Event/Open Event Frontend
Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/

Co-authored-by: Mario Behling <mb@mariobehling.de>
* feature-9082: Enhance language dropdown button

* feature-9082: Enhance language dropdown button

* fix css

* fix UI

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* avoid using css inline

* feature-9082: Fix css dropdown side panel

* feature-9082: Fix css dropdown side panel

* feature-9082: Fix css dropdown side panel

* fix-9082
language dropdown not showing up

* fix-9082
language dropdown not showing up

---------

Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com>
Co-authored-by: ntthitrinh <ntthitrinh@tma.com.vn>
…ng filtered page (#9145)

* fix-7016: Link redirect of current day results in user forward to wrong filtered page

* fix-7016: Link redirect of current day results in user forward to wrong filtered page
* feature-9082: Enhance language dropdown button

* feature-9082: Enhance language dropdown button

* fix css

* fix UI

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* avoid using css inline

* feature-9082: Fix css dropdown side panel

* feature-9082: Fix css dropdown side panel

* feature-9082: Fix css dropdown side panel

* fix-9082
language dropdown not showing up

* fix-9082
language dropdown not showing up

* feature-9082: Enhance language dropdown button

* feature-9082: Enhance language dropdown button

---------

Co-authored-by: nnhathung <nnhathung@tma.com.vn>
Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com>
Co-authored-by: ntthitrinh <ntthitrinh@tma.com.vn>
…9115)

* fix-9080: There was no result for searching with Ticket price 0.0

* fix-9080: There was no result for searching with Ticket price 0.0

---------

Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com>
…ttendees page (#9078)

* fix-9076: Cannot show all entries when selecting 'Show All' in View Attendees page

* fix-9076: Cannot show all entries when selecting 'Show All' in View Attendees page

* fix-9076: Cannot show all entries when selecting 'Show All' in View Attendees page

---------

Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com>
#9157)

* fix-9154: [Badge Wizard] Showing <a> tag in custom field when organizer tries to add custom question to badge

* fix-9154: [Badge Wizard] Showing <a> tag in custom field when organizer tries to add custom question to badge
)

* feature-9020: Filter options for orders and attendees not working

* feature-9020: Filter options for orders and attendees not working

* feature-9020: Filter options for orders and attendees not working

* feature-9020: Filter options for orders and attendees not working

* feature-9020: Fix UI filter date

* feature-9020: Fix UI filter date

* feature-9020: Fix UI filter date at the order

* feature-9020: Filter options for orders and attendees not working

---------

Co-authored-by: odkhang <odkhang@tma.com.vn>
Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com>
* feature-9125: Fix top menu for mobile screens

* feature-9125: Fix top menu for mobile screens

* feature-9125: Fix top menu for mobile screens

* feature-9125: Fix top menu for mobile screens

* feature-9125: Fix top menu for mobile screens

* feature-9125: Fix top menu for mobile screens

* feature-9125: Fix top menu for mobile screens

---------

Co-authored-by: ntthitrinh <ntthitrinh@tma.com.vn>
* fix-9127: Top align table content on manage event dashboard

* fix-9127: Top align table content on manage event dashboard
* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Add option to tag attendees

* feature-8684: Merge code development
…n full (#9160)

* fix-9140: The value of the status dropdown list cannot be displayed in full

* fix-9140: The value of the status dropdown list cannot be displayed in full
* feature-9082: Enhance language dropdown button

* feature-9082: Enhance language dropdown button

* fix css

* fix UI

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* avoid using css inline

* feature-9082: Fix css dropdown side panel

* feature-9082: Fix css dropdown side panel

* feature-9082: Fix css dropdown side panel

* fix-9082
language dropdown not showing up

* fix-9082
language dropdown not showing up

* feature-9082: Enhance language dropdown button

* feature-9082: Enhance language dropdown button

* feature-9082: Enhance language dropdown button

---------

Co-authored-by: nnhathung <nnhathung@tma.com.vn>
Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com>
Co-authored-by: ntthitrinh <ntthitrinh@tma.com.vn>
* feature-9082: Enhance language dropdown button

* feature-9082: Enhance language dropdown button

* fix css

* fix UI

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* fix missing header

* avoid using css inline

* feature-9082: Fix css dropdown side panel

* feature-9082: Fix css dropdown side panel

* feature-9082: Fix css dropdown side panel

* fix-9082
language dropdown not showing up

* fix-9082
language dropdown not showing up

* feature-9082: Enhance language dropdown button

* feature-9082: Enhance language dropdown button

* feature-9082: Enhance language dropdown button

* feature-9082: Enhance language dropdown button

---------

Co-authored-by: nnhathung <nnhathung@tma.com.vn>
Co-authored-by: Khang On - TMA <135116292+khangon@users.noreply.github.com>
Co-authored-by: ntthitrinh <ntthitrinh@tma.com.vn>
Currently translated at 100.0% (2554 of 2554 strings)

Translation: Open Event/Open Event Frontend
Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/

Co-authored-by: Kristoffer Grundström <swedishsailfishosuser@tutanota.com>
* Translated using Weblate (Swedish)

Currently translated at 100.0% (2554 of 2554 strings)

Translation: Open Event/Open Event Frontend
Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/

* Translated using Weblate (Swedish)

Currently translated at 99.9% (2552 of 2554 strings)

Translation: Open Event/Open Event Frontend
Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/sv/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (2554 of 2554 strings)

Translation: Open Event/Open Event Frontend
Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/es/

* Translated using Weblate (Polish)

Currently translated at 100.0% (2554 of 2554 strings)

Translation: Open Event/Open Event Frontend
Translate-URL: https://hosted.weblate.org/projects/open-event/frontend/pl/

---------

Co-authored-by: Kristoffer Grundström <swedishsailfishosuser@tutanota.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: Eryk Michalak <gnu.ewm@protonmail.com>
Copy link

vercel bot commented Mar 26, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
open-event-frontend ❌ Failed (Inspect) Mar 26, 2024 7:43am

@ghost ghost marked this pull request as ready for review March 26, 2024 06:40
@ghost ghost requested review from mariobehling, norbusan and marcoag March 26, 2024 06:40
@ghost
Copy link
Author

ghost commented Mar 26, 2024

After I tried to figure out the problem, the UI crashed on the 'View attendees' screen.
I see 2 problems:
1/ If the order has 2 or more tickets, the UI will not display the "Order Id" price.
2/ The "View attendees" screen has 2 columns "Ticket number". I checked the source code and found out this problem happened 7 months ago.

After fixing the above two issues, at "View Attendees" I noticed that the "Order" Column is not the "Ticket ID" in the QR and CSV. Do you want to change the value of the "Orders" column?
Table

@norbusan
Copy link
Member

@lthanhhieu you cannot merge development, sorry.
please:

  • checkout development-backup20240326 branch
  • make a diff from that branch to your code
  • only include the diff into a new PR.

I just did this and it showed far less changes:

diff --git a/app/components/public/stream/video-stream.ts b/app/components/public/stream/video-stream.ts
index 4553e7ac..dddea07c 100644
--- a/app/components/public/stream/video-stream.ts
+++ b/app/components/public/stream/video-stream.ts
@@ -166,7 +166,6 @@ export default class PublicStreamVideoStream extends Component<Args> {
   async setupRoomChat(stream:any) {
     this.currentRoom = stream;
     this.shown = false;
-    this.eventCheckIn(this.args.event.identifier, stream.microlocationId)
   }
 
   @action
diff --git a/app/controllers/events/view/tickets/attendees/list.js b/app/controllers/events/view/tickets/attendees/list.js
index b17ae99d..4f595b4d 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 986db7d6..2a210efe 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
     };
   }
 }

The reason is that we had to force push development, and your PR would bring in all the other stuff again.

@norbusan
Copy link
Member

In the above diff I sent, I am NOT sure that the removal of the line

this.eventCheckIn(this.args.event.identifier, stream.microlocationId)

is correct.

@ghost ghost closed this by deleting the head repository Mar 26, 2024
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants