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: Update Ticket and Registration Section on Event Public Page #7819

Merged
merged 6 commits into from Sep 21, 2021

Conversation

divyamtayal
Copy link
Member

@divyamtayal divyamtayal commented Sep 20, 2021

Fixes #7815
Fixes #7814
Fixes #7809

Short description of what this resolves:

  • Update Tax amount showing below text box on updating ticket price.
  • Change text of Subtotal, included and Grand Total
  • Registrations: Move tax info below price

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)

@auto-label auto-label bot added the fix label Sep 20, 2021
@vercel
Copy link

vercel bot commented Sep 20, 2021

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/eventyay/open-event-frontend/Daa1R6ciSBiLfoLpJXPMdgs9em9V
✅ Preview: https://open-event-frontend-git-fork-daretobedifferent1-f29524-eventyay.vercel.app

@divyamtayal
Copy link
Member Author

@mariobehling this issue is only for when tax is included and working fine for tax on top.
Fixed now.

@codecov
Copy link

codecov bot commented Sep 20, 2021

Codecov Report

Merging #7819 (12970e7) into development (46b0549) will decrease coverage by 0.04%.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           development    #7819      +/-   ##
===============================================
- Coverage        18.61%   18.57%   -0.05%     
===============================================
  Files              613      613              
  Lines             7198     7198              
  Branches           149      149              
===============================================
- Hits              1340     1337       -3     
- Misses            5831     5834       +3     
  Partials            27       27              
Impacted Files Coverage Δ
app/models/ticket.js 0.00% <ø> (ø)
app/controllers/public/index.js 6.41% <100.00%> (ø)
app/components/tabbed-navigation.js 33.33% <0.00%> (-20.00%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46b0549...12970e7. Read the comment docs.

@divyamtayal
Copy link
Member Author

Desktop Mobile
Screenshot from 2021-09-20 06-05-28 Screenshot from 2021-09-20 06-06-16

@divyamtayal
Copy link
Member Author

Screenshot from 2021-09-20 06-12-24

@maze-runnar
Copy link
Contributor

@daretobedifferent18 resolve conflict

@divyamtayal divyamtayal changed the title fix: Update ticket tax price on change in ticket price fix: Update Ticket and Registration Section on Event Public Page Sep 20, 2021
@maze-runnar maze-runnar merged commit 708b833 into fossasia:development Sep 21, 2021
@divyamtayal divyamtayal deleted the donationTax#7815 branch September 22, 2021 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants