diff --git a/lms/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py
index 68ac25a7..8cd2c7d8 100644
--- a/lms/lms/doctype/lms_batch/lms_batch.py
+++ b/lms/lms/doctype/lms_batch/lms_batch.py
@@ -384,11 +384,9 @@ def get_timetable_details(timetable):
@frappe.whitelist()
-def send_email_to_students(batch, subject, message):
+def send_email_to_students(batch, subject, reply_to, message):
frappe.only_for("Moderator")
students = frappe.get_all("Batch Student", {"parent": batch}, pluck="student")
frappe.sendmail(
- recipients=students,
- subject=subject,
- message=message,
+ recipients=students, subject=subject, reply_to=reply_to, message=message
)
diff --git a/lms/lms/doctype/lms_payment/lms_payment.json b/lms/lms/doctype/lms_payment/lms_payment.json
index 696d5af9..c0019aef 100644
--- a/lms/lms/doctype/lms_payment/lms_payment.json
+++ b/lms/lms/doctype/lms_payment/lms_payment.json
@@ -8,8 +8,10 @@
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
+ "payment_for_document_type",
"member",
"column_break_rqkd",
+ "payment_for_document",
"billing_name",
"payment_received",
"payment_details_section",
@@ -115,11 +117,23 @@
"fieldname": "amount_with_gst",
"fieldtype": "Currency",
"label": "Amount with GST"
+ },
+ {
+ "fieldname": "payment_for_document_type",
+ "fieldtype": "Select",
+ "label": "Payment for Document Type",
+ "options": "\nLMS Course\nLMS Batch"
+ },
+ {
+ "fieldname": "payment_for_document",
+ "fieldtype": "Dynamic Link",
+ "label": "Payment for Document",
+ "options": "payment_for_document_type"
}
],
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2023-09-12 10:40:22.721371",
+ "modified": "2023-10-17 23:17:50.334975",
"modified_by": "Administrator",
"module": "LMS",
"name": "LMS Payment",
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index f7dbe489..b41af0dd 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -4,7 +4,6 @@ import frappe
import json
import razorpay
import requests
-import base64
from frappe import _
from frappe.desk.doctype.dashboard_chart.dashboard_chart import get_result
from frappe.desk.doctype.notification_log.notification_log import make_notification_logs
@@ -1029,6 +1028,8 @@ def record_payment(address, response, client, doctype, docname):
"amount_with_gst": payment_details["amount_with_gst"],
"gstin": address.gstin,
"pan": address.pan,
+ "payment_for_document_type": doctype,
+ "payment_for_document": docname,
}
)
payment_doc.save(ignore_permissions=True)
diff --git a/lms/www/batch/edit.html b/lms/www/batch/edit.html
index 60b886fa..312e060f 100644
--- a/lms/www/batch/edit.html
+++ b/lms/www/batch/edit.html
@@ -127,7 +127,7 @@
{%- block script %}
{{ super() }}
-
+
{% endblock %}
diff --git a/lms/www/batches/batch.js b/lms/www/batches/batch.js
index f4fbb885..8adc88ac 100644
--- a/lms/www/batches/batch.js
+++ b/lms/www/batches/batch.js
@@ -785,6 +785,12 @@ const email_to_students = () => {
label: __("Subject"),
reqd: 1,
},
+ {
+ fieldtype: "Data",
+ fieldname: "reply_to",
+ label: __("Reply To"),
+ reqd: 0,
+ },
{
fieldtype: "Text Editor",
fieldname: "message",
@@ -807,6 +813,7 @@ const send_email = (values) => {
args: {
batch: $(".class-details").data("batch"),
subject: values.subject,
+ reply_to: values.reply_to,
message: values.message,
},
callback: (r) => {