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
Conversation
Codecov Report
@@ 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
Continue to review full report at Codecov.
|
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: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resolved it
There was a problem hiding this 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: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed
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
I don't get it , cause in the meantime I resolved one more issue #3339 and committed to my repo . |
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. |
@mariobehling |
@LuD1161 make two separate pull requests for each of the issues |
@niranjan94 |
@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. |
Solving issue #3332