eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: amount information in membership

Browse Source
This commit is contained in:
Jannat Patel
2023-08-17 14:20:30 +05:30
parent c2a6697f72
commit ed651959c1
3 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lms/lms/doctype/lms_batch_membership/lms_batch_membership.json
View File

@@ -14,10 +14,12 @@
"member_username", "member_username",
"billing_information_section", "billing_information_section",
"address", "address",
"payment_received", "amount",
"currency",
"column_break_rvzn", "column_break_rvzn",
"order_id", "order_id",
"payment_id", "payment_id",
"payment_received",
"section_break_8", "section_break_8",
"cohort", "cohort",
"subgroup", "subgroup",
@@ -149,11 +151,23 @@
"fieldname": "payment_id", "fieldname": "payment_id",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Payment ID" "label": "Payment ID"
},
{
"fieldname": "amount",
"fieldtype": "Data",
"label": "Amount",
"options": "currency"
},
{
"fieldname": "currency",
"fieldtype": "Link",
"label": "Currency",
"options": "Currency"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2023-08-11 15:39:50.194348", "modified": "2023-08-17 13:52:49.450499",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "LMS Batch Membership", "name": "LMS Batch Membership",

40
lms/lms/doctype/lms_course/lms_course.py
View File

@@ -446,23 +446,31 @@ def verify_payment(response, course, address, order_id):
} }
) )
return create_membership(address, response, course) return create_membership(address, response, course, client)
def create_membership(address, response, course): def create_membership(address, response, course, client):
address_name = save_address(address) try:
membership = frappe.new_doc("LMS Batch Membership") address_name = save_address(address)
membership = frappe.new_doc("LMS Batch Membership")
payment = client.payment.fetch(response["razorpay_payment_id"])
membership.update( membership.update(
{ {
"member": frappe.session.user, "member": frappe.session.user,
"course": course, "course": course,
"address": address_name, "address": address_name,
"payment_received": 1, "payment_received": 1,
"order_id": response["razorpay_order_id"], "order_id": response["razorpay_order_id"],
"payment_id": response["razorpay_payment_id"], "payment_id": response["razorpay_payment_id"],
} "amount": payment["amount"] / 100,
) "currency": payment["currency"],
membership.save(ignore_permissions=True) }
)
membership.save(ignore_permissions=True)
return f"/courses/{course}/learn/1.1" return f"/courses/{course}/learn/1.1"
except Exception as e:
frappe.throw(
_("Error during payment: {0}. Please contact the Administrator.").format(e)
)

2
lms/www/billing/billing.js
View File

@@ -105,7 +105,7 @@ const handle_success = (response, course, address, order_id) => {
}); });
setTimeout(() => { setTimeout(() => {
window.location.href = data.message; window.location.href = data.message;
}, 2000); }, 1000);
}, },
}); });
}; };