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

Added Discount Filter and Showing discount code in attendee overview #3343

Closed
wants to merge 1 commit into from
Closed

Conversation

LuD1161
Copy link
Contributor

@LuD1161 LuD1161 commented Mar 9, 2017

Solving issue #3332

@codecov-io
Copy link

codecov-io commented Mar 9, 2017

Codecov Report

Merging #3343 into development will decrease coverage by 0.12%.
The diff coverage is 41.66%.

@@              Coverage Diff               @@
##           development   #3343      +/-   ##
==============================================
- Coverage        75.63%   75.5%   -0.13%     
==============================================
  Files              226     226              
  Lines            14923   14934      +11     
==============================================
- Hits             11287   11276      -11     
- Misses            3636    3658      +22
Impacted Files Coverage Δ
app/helpers/ticketing.py 52.29% <28.57%> (-0.56%)
app/views/users/ticket_sales.py 62.5% <60%> (-0.06%)
app/helpers/deployment/heroku.py 59.09% <0%> (-27.28%)
app/views/super_admin/super_admin.py 71.42% <0%> (-12.5%)
app/helpers/helpers.py 48.98% <0%> (-0.68%)

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 1b30bd6...883a32f. Read the comment docs.

try:
discount_id = DiscountCode.query.filter_by(event_id=event_id).filter_by(code=discount_code) \
.filter(Order.user_id.isnot(None))[0].id
except Exception as e:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Resolved it

Copy link
Member

@niranjan94 niranjan94 left a comment

Choose a reason for hiding this comment

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

@LuD1161 please squash all your commits into one.

try:
discount_id = DiscountCode.query.filter_by(event_id=event_id).filter_by(code=discount_code) \
.filter(Order.user_id.isnot(None))[0].id
except Exception as e:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed

@mariobehling
Copy link
Member

Please also resolve conflicts.

Finished the Discount Filter

now displaying the applied Discount Filter

returning the discount_code to the template for rendering

Minor Modifications from previous

Modified to return blank when wrong Discount Code given

Moved "Published on" to bottom
@LuD1161
Copy link
Contributor Author

LuD1161 commented Mar 10, 2017

I don't get it , cause in the meantime I resolved one more issue #3339 and committed to my repo .
So , should I make a new pull request combining both the issues ?
Cause the new issue is what is making this conflict.

@mariobehling
Copy link
Member

Only commit what is relevant to solve this issue. If you are solving another issue in the meantime, you can create a different branch and commit later from this branch.

@LuD1161
Copy link
Contributor Author

LuD1161 commented Mar 10, 2017

@mariobehling
Sorry , I am a bit new to this .
Will take care from now onwards.
However now what should I do ...
Should I make a new pull request , joining both the issues or can you suggest something better ?

@niranjan94
Copy link
Member

@LuD1161 make two separate pull requests for each of the issues

@LuD1161
Copy link
Contributor Author

LuD1161 commented Mar 10, 2017

@niranjan94
But I didn't know to create branch and went on committing to the same.
I think I will have to redo the changes :(
Should I remove this pull request ?
and make a new one ?

@LuD1161 LuD1161 closed this Mar 10, 2017
@niranjan94
Copy link
Member

@LuD1161 please don't close and open PRs... Makes it very hard to track reviews/comments/conversation. Just force push to the same branch and the PR will automatically update.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants