Merge pull request #368 from shariquerik/more-notification

fix: More Notifications

crm/api/comment.py

@@ -3,6 +3,7 @@ from collections.abc import Iterable
 import frappe
 from frappe import _
 from bs4 import BeautifulSoup
+from crm.fcrm.doctype.crm_notification.crm_notification import notify_user
 
 def on_update(self, method):
     notify_mentions(self)
@@ -29,22 +30,17 @@ def notify_mentions(doc):
                 <span class="font-medium text-gray-900">{ doc.reference_name }</span>
             </div>
         """
-        values = frappe._dict(
+        notify_user({
-            doctype="CRM Notification",
+            "owner": doc.owner,
-            from_user=doc.owner,
+            "assigned_to": mention.email,
-            to_user=mention.email,
+            "notification_type": "Mention",
-            type="Mention",
+            "message": doc.content,
-            message=doc.content,
+            "notification_text": notification_text,
-            notification_text=notification_text,
+            "reference_doctype": "Comment",
-            notification_type_doctype="Comment",
+            "reference_docname": doc.name,
-            notification_type_doc=doc.name,
+            "redirect_to_doctype": doc.reference_doctype,
-            reference_doctype=doc.reference_doctype,
+            "redirect_to_docname": doc.reference_name,
-            reference_name=doc.reference_name,
+        })
-        )
-
-        if frappe.db.exists("CRM Notification", values):
-            return
-        frappe.get_doc(values).insert()
 
 
 def extract_mentions(html):

crm/api/todo.py

@@ -1,4 +1,6 @@
 import frappe
+from frappe import _
+from crm.fcrm.doctype.crm_notification.crm_notification import notify_user
 
 def after_insert(doc, method):
 	if doc.reference_type in ["CRM Lead", "CRM Deal"] and doc.reference_name and doc.allocated_to:
@@ -6,3 +8,96 @@ def after_insert(doc, method):
 		lead_owner = frappe.db.get_value(doc.reference_type, doc.reference_name, fieldname)
 		if not lead_owner:
 			frappe.db.set_value(doc.reference_type, doc.reference_name, fieldname, doc.allocated_to)
+
+	if doc.reference_type in ["CRM Lead", "CRM Deal", "CRM Task"] and doc.reference_name and doc.allocated_to:
+		notify_assigned_user(doc)
+
+def on_update(doc, method):
+	if doc.has_value_changed("status") and doc.status == "Cancelled" and doc.reference_type in ["CRM Lead", "CRM Deal", "CRM Task"] and doc.reference_name and doc.allocated_to:
+		notify_assigned_user(doc, is_cancelled=True)
+
+def notify_assigned_user(doc, is_cancelled=False):
+	_doc = frappe.get_doc(doc.reference_type, doc.reference_name)
+	owner = frappe.get_cached_value("User", frappe.session.user, "full_name")
+	notification_text = get_notification_text(owner, doc, _doc, is_cancelled)
+
+	message = _("Your assignment on {0} {1} has been removed by {2}").format(
+		doc.reference_type,
+		doc.reference_name,
+		owner
+	) if is_cancelled else _("{0} assigned a {1} {2} to you").format(
+		owner,
+		doc.reference_type,
+		doc.reference_name
+	)
+
+	redirect_to_doctype, redirect_to_name = get_redirect_to_doc(doc)
+
+	notify_user({
+		"owner": frappe.session.user,
+		"assigned_to": doc.allocated_to,
+		"notification_type": "Assignment",
+		"message": message,
+		"notification_text": notification_text,
+		"reference_doctype": doc.reference_type,
+		"reference_docname": doc.reference_name,
+		"redirect_to_doctype": redirect_to_doctype,
+		"redirect_to_docname": redirect_to_name,
+	})
+
+def get_notification_text(owner, doc, reference_doc, is_cancelled=False):
+	name = doc.reference_name
+	doctype = doc.reference_type
+
+	if doctype.startswith("CRM "):
+		doctype = doctype[4:].lower()
+
+	if doctype in ["CRM Lead", "CRM Deal"]:
+		name = reference_doc.lead_name or name if doctype == "CRM Lead" else reference_doc.organization or reference_doc.lead_name or name
+
+		if is_cancelled:
+			return f"""
+				<div class="mb-2 leading-5 text-gray-600">
+					<span>{ _('Your assignment on {0} {1} has been removed by {2}').format(
+						doctype,
+						f'<span class="font-medium text-gray-900">{ name }</span>',
+						f'<span class="font-medium text-gray-900">{ owner }</span>'
+					) }</span>
+				</div>
+			"""
+
+		return f"""
+			<div class="mb-2 leading-5 text-gray-600">
+				<span class="font-medium text-gray-900">{ owner }</span>
+				<span>{ _('assigned a {0} {1} to you').format(
+					doctype,
+					f'<span class="font-medium text-gray-900">{ name }</span>'
+				) }</span>
+			</div>
+		"""
+
+	if doc.reference_type == "CRM Task":
+		if is_cancelled:
+			return f"""
+				<div class="mb-2 leading-5 text-gray-600">
+					<span>{ _('Your assignment on task {0} has been removed by {1}').format(
+						f'<span class="font-medium text-gray-900">{ reference_doc.title }</span>',
+						f'<span class="font-medium text-gray-900">{ owner }</span>'
+					) }</span>
+				</div>
+			"""
+		return f"""
+			<div class="mb-2 leading-5 text-gray-600">
+				<span class="font-medium text-gray-900">{ owner }</span>
+				<span>{ _('assigned a new task {0} to you').format(
+					f'<span class="font-medium text-gray-900">{ reference_doc.title }</span>'
+				) }</span>
+			</div>
+		"""
+
+def get_redirect_to_doc(doc):
+	if doc.reference_type == "CRM Task":
+		reference_doc = frappe.get_doc(doc.reference_type, doc.reference_name)
+		return reference_doc.reference_doctype, reference_doc.reference_docname
+
+	return doc.reference_type, doc.reference_name

crm/api/whatsapp.py

@@ -2,6 +2,7 @@ import frappe
 import json
 from frappe import _
 from crm.api.doc import get_assigned_users
+from crm.fcrm.doctype.crm_notification.crm_notification import notify_user
 
 
 def validate(doc, method):
@@ -29,30 +30,25 @@ def notify_agent(doc):
         if doctype.startswith("CRM "):
             doctype = doctype[4:].lower()
         notification_text = f"""
-			<div class="mb-2 leading-5 text-gray-600">
+            <div class="mb-2 leading-5 text-gray-600">
-				<span class="font-medium text-gray-900">{ _('You') }</span>
+                <span class="font-medium text-gray-900">{ _('You') }</span>
-				<span>{ _('received a whatsapp message in {0}').format(doctype) }</span>
+                <span>{ _('received a whatsapp message in {0}').format(doctype) }</span>
-				<span class="font-medium text-gray-900">{ doc.reference_name }</span>
+                <span class="font-medium text-gray-900">{ doc.reference_name }</span>
-			</div>
+            </div>
-		"""
+        """
         assigned_users = get_assigned_users(doc.reference_doctype, doc.reference_name)
         for user in assigned_users:
-            values = frappe._dict(
+            notify_user({
-                doctype="CRM Notification",
+                "owner": doc.owner,
-                from_user=doc.owner,
+                "assigned_to": user,
-                to_user=user,
+                "notification_type": "WhatsApp",
-                type="WhatsApp",
+                "message": doc.message,
-                message=doc.message,
+                "notification_text": notification_text,
-                notification_text=notification_text,
+                "reference_doctype": "WhatsApp Message",
-                notification_type_doctype="WhatsApp Message",
+                "reference_docname": doc.name,
-                notification_type_doc=doc.name,
+                "redirect_to_doctype": doc.reference_doctype,
-                reference_doctype=doc.reference_doctype,
+                "redirect_to_docname": doc.reference_name,
-                reference_name=doc.reference_name,
+            })
-            )
-
-            if frappe.db.exists("CRM Notification", values):
-                return
-            frappe.get_doc(values).insert(ignore_permissions=True)
 
 
 def get_lead_or_deal_from_number(number):
@@ -62,10 +58,10 @@ def get_lead_or_deal_from_number(number):
         mobile_no = parse_mobile_no(mobile_no)
 
         query = f"""
-			SELECT name, mobile_no
+            SELECT name, mobile_no
-			FROM `tab{doctype}`
+            FROM `tab{doctype}`
-			WHERE CONCAT('+', REGEXP_REPLACE(mobile_no, '[^0-9]', '')) = {mobile_no}
+            WHERE CONCAT('+', REGEXP_REPLACE(mobile_no, '[^0-9]', '')) = {mobile_no}
-		"""
+        """
 
         data = frappe.db.sql(query + where, as_dict=True)
         return data[0].name if data else None

crm/fcrm/doctype/crm_notification/crm_notification.json

@@ -34,7 +34,7 @@
    "fieldtype": "Select",
    "in_list_view": 1,
    "label": "Type",
-   "options": "Mention\nWhatsApp",
+   "options": "Mention\nTask\nAssignment\nWhatsApp",
    "reqd": 1
   },
   {
@@ -116,7 +116,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-04-25 16:26:07.484857",
+ "modified": "2024-09-23 19:34:08.635305",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Notification",

crm/fcrm/doctype/crm_notification/crm_notification.py

@@ -2,9 +2,35 @@
 # For license information, please see license.txt
 
 import frappe
+from frappe import _
 from frappe.model.document import Document
 
 
 class CRMNotification(Document):
-    def on_update(self):
+	def on_update(self):
-        frappe.publish_realtime("crm_notification")
+		frappe.publish_realtime("crm_notification")
+
+def notify_user(args):
+	"""
+	Notify the assigned user
+	"""
+	args = frappe._dict(args)
+	if args.owner == args.assigned_to:
+		return
+
+	values = frappe._dict(
+		doctype="CRM Notification",
+		from_user=args.owner,
+		to_user=args.assigned_to,
+		type=args.notification_type,
+		message=args.message,
+		notification_text=args.notification_text,
+		notification_type_doctype=args.reference_doctype,
+		notification_type_doc=args.reference_docname,
+		reference_doctype=args.redirect_to_doctype,
+		reference_name=args.redirect_to_docname,
+	)
+
+	if frappe.db.exists("CRM Notification", values):
+		return
+	frappe.get_doc(values).insert(ignore_permissions=True)

crm/fcrm/doctype/crm_task/crm_task.py

@@ -1,11 +1,38 @@
 # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-# import frappe
+import frappe
+from frappe import _
 from frappe.model.document import Document
+from frappe.desk.form.assign_to import add as assign, remove as unassign
+from crm.fcrm.doctype.crm_notification.crm_notification import notify_user
 
 
 class CRMTask(Document):
+	def after_insert(self):
+		self.assign_to()
+
+	def validate(self):
+		if self.is_new() or not self.assigned_to:
+			return
+
+		if self.get_doc_before_save().assigned_to != self.assigned_to:
+			self.unassign_from_previous_user(self.get_doc_before_save().assigned_to)
+			self.assign_to()
+
+	def unassign_from_previous_user(self, user):
+		unassign(self.doctype, self.name, user)
+
+	def assign_to(self):
+		if self.assigned_to:
+			assign({
+				"assign_to": [self.assigned_to],
+				"doctype": self.doctype,
+				"name": self.name,
+				"description": self.title or self.description,
+			})
+
+
 	@staticmethod
 	def default_list_data():
 		columns = [

crm/hooks.py

@@ -144,6 +144,7 @@ doc_events = {
 	},
 	"ToDo": {
 		"after_insert": ["crm.api.todo.after_insert"],
+		"on_update": ["crm.api.todo.on_update"],
 	},
 	"Comment": {
 		"on_update": ["crm.api.comment.on_update"],
@@ -152,8 +153,8 @@ doc_events = {
 		"validate": ["crm.api.whatsapp.validate"],
 		"on_update": ["crm.api.whatsapp.on_update"],
 	},
-    "CRM Deal": {
+	"CRM Deal": {
-        "on_update": ["crm.fcrm.doctype.erpnext_crm_settings.erpnext_crm_settings.create_customer_in_erpnext"],
+		"on_update": ["crm.fcrm.doctype.erpnext_crm_settings.erpnext_crm_settings.create_customer_in_erpnext"],
 	},
 }