LUMSX Payment System - Challan Voucher #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mumerfarooq000
force-pushed
the
umerF/lumsx-57/payment-system
branch
5 times, most recently
from
9986ea9
to
9aa82a0
Compare
mumerfarooq000
force-pushed
the
umerF/lumsx-57/payment-system
branch
3 times, most recently
from
c940633
to
f06c4e4
Compare
sheralim012
reviewed
Jan 15, 2021
| @@ -67,6 +67,7 @@ def is_valid_site_course(course_id, request): | |||
| ) | |||
| # We assume that the "short_code" value of ECOM site partner will always | |||
| # be the same as "short_name" value of its related edx organization in LMS | |||
| return True | |||
| if edx_org_short_name and course_key.org == edx_org_short_name and course_key.org == partner_short_code: | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
sheralim012
reviewed
Jan 15, 2021
Comment on lines
139
to
143
| if response.status_code == 200: | ||
| voucher_details = response.json() | ||
| url_for_online_payment = voucher_details.get('data', {}).get("url_for_online_payment") | ||
| url_for_download_voucher = voucher_details.get('data', {}).get("url_for_download_voucher") | ||
|
|
||
| context = { | ||
| 'configuration_helpers': configuration_helpers, | ||
| 'url_for_online_payment': url_for_online_payment, | ||
| 'url_for_download_voucher': url_for_download_voucher, | ||
| 'items_list': items, | ||
| "name": request.user.username, | ||
| "email": request.user.email, | ||
| "order_id": request.basket.order_number, | ||
| "user": request.user, | ||
| "lms_dashboard_url": get_lms_dashboard_url, | ||
| "is_paid": False, | ||
| "support_email": request.site.siteconfiguration.payment_support_email | ||
| } | ||
|
|
There was a problem hiding this comment.
I believe this is repeated request_already_existing_challan
There was a problem hiding this comment.
I dont get what you trying to say here?
sheralim012
requested changes
Jan 15, 2021
| return Basket.objects.filter(owner_id=request.user, lines__product_id__in=course_ids).first() | ||
|
|
||
| def is_basket_and_challan_exists(self, request): | ||
| if BasketChallanVoucher.objects.filter(basket=self.get_existing_basket(request)).exists(): |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
Comment on lines
104
to
107
| msg = 'user is anonymous cannot proceed to checkout page so redirecting to login' | ||
| if not url: | ||
| msg = 'Site configuration in ecommerce does not include payment API url' |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| </nav> | ||
| <div class="container"> | ||
| <div class="alert alert-warning" style="max-width: none;"> | ||
| Payment clearance to the course might take upto 45 minutes. |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| A confirmation email will be sent to you when you have made the payment and been enrolled in the course. | ||
| Please follow the steps in this email to access the course. </br></br> | ||
| Alternatively, after making the payment you go to your Dashboard to view the course. Please note that it | ||
| may take up to 45 minutes for your course to be made available to you. Kindly contact |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
mumerfarooq000
force-pushed
the
umerF/lumsx-57/payment-system
branch
from
f06c4e4
to
c06e33d
Compare
mumerfarooq000
force-pushed
the
umerF/lumsx-57/payment-system
branch
from
c06e33d
to
dc91d18
Compare
sheralim012
approved these changes
Jan 15, 2021
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added the payment system, will update desciption soon