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.

Sign up for GitHub

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

Jump to bottom

enh: rearranges tabs in order and attendee view #3235

Merged
merged 2 commits into from
Jul 4, 2019
Merged

enh: rearranges tabs in order and attendee view #3235

merged 2 commits into from
Jul 4, 2019

Conversation

shreyanshdwivedi
Copy link
Member

@shreyanshdwivedi shreyanshdwivedi commented Jul 4, 2019 •
edited
Loading

Fixes #3233

Short description of what this resolves:

The orders and attendee tab show "All" orders immediately. This is not necessary

Changes proposed in this pull request:

  • Show "Completed" in front
  • Move "All" to the last place
  • Take out "Pending" from the organizer view. It is not relevant for them.

Admin Access

  • Orders
    Screenshot_2019-07-04 Orders Tickets AddOwnerEvent Events Open Event

  • Attendees
    Screenshot_2019-07-04 Attendees Tickets AddOwnerEvent Events Open Event

Non Admin (Organizer)

  • Orders
    Screenshot_2019-07-04 Orders Tickets AddOwnerEvent Events Open Event(1)

  • Attendees
    Screenshot_2019-07-04 Attendees Tickets AddOwnerEvent Events Open Event(1)

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)

@shreyanshdwivedi
Copy link
Member Author

@uds5501 @CosmicCoder96 @kushthedude please review

pradeepgangwar
pradeepgangwar previously approved these changes Jul 4, 2019
View reviewed changes
kushthedude
kushthedude reviewed Jul 4, 2019
View reviewed changes
Copy link
Member

@kushthedude kushthedude left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shreyanshdwivedi Can you add pending order for admin? , Or if we have to completely remove them then we should delete the corresponding routes and controllers too ?

kushthedude
kushthedude suggested changes Jul 4, 2019
View reviewed changes
app/controllers/events/view/tickets/attendees.js Outdated Show resolved Hide resolved
app/controllers/events/view/tickets/orders.js Outdated Show resolved Hide resolved
@shreyanshdwivedi
enh: rearranges tabs in order and attendee view
5e9df87 
include pending tickets for admin/superadmin

updates the condition
@shreyanshdwivedi
Copy link
Member Author

@kushthedude @pradeepgangwar @uds5501 I've updated the logic. Please review.

@fossasia fossasia deleted a comment Jul 4, 2019
@abhinavk96 abhinavk96 merged commit 6be6610 into fossasia:development Jul 4, 2019
@shreyanshdwivedi shreyanshdwivedi deleted the viewTickets branch August 20, 2019 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kushthedude kushthedude kushthedude requested changes

@niranjan94 niranjan94 niranjan94 approved these changes

@abhinavk96 abhinavk96 abhinavk96 approved these changes

@pradeepgangwar pradeepgangwar pradeepgangwar left review comments

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Make Orders and Attendee View in Ticket Tab Logical
5 participants
@shreyanshdwivedi @niranjan94 @abhinavk96 @pradeepgangwar @kushthedude