Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected moving to doctype for email

Browse Source
This commit is contained in:
Pranav Nachanekar 2019-09-23 14:16:13 +05:30
parent 7b7962d28c
commit b6b27d9256
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/crm/doctype/appointment/appointment.py
View File

@ -8,6 +8,7 @@ from collections import Counter
from datetime import timedelta from datetime import timedelta
import frappe import frappe
from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.desk.form.assign_to import add as add_assignemnt from frappe.desk.form.assign_to import add as add_assignemnt
@ -15,10 +16,9 @@ from frappe.desk.form.assign_to import add as add_assignemnt
class Appointment(Document): class Appointment(Document):
def find_lead_by_email(self): def find_lead_by_email(self):
lead_list = frappe.get_list('Lead', filters = {'email_id':self.email}, ignore_permissions = True) lead_list = frappe.get_list('Lead', filters = {'email_id':self.customer_email}, ignore_permissions = True)
if lead_list: if lead_list:
return lead_list[0].name return lead_list[0].name
self.email = email
return None return None
def before_insert(self): def before_insert(self):
@ -40,9 +40,9 @@ class Appointment(Document):
# Set status to unverified # Set status to unverified
self.status = 'Unverified' self.status = 'Unverified'
# Send email to confirm # Send email to confirm
verify_url = ''.join([frappe.utils.get_url(),'/book-appointment/verify?email=',self.email,'&appoitnment=',self.name]) verify_url = ''.join([frappe.utils.get_url(),'/book-appointment/verify?email=',self.customer_email,'&appoitnment=',self.name])
message = ''.join(['Please click the following link to confirm your appointment:']+verify_url) message = ''.join(['Please click the following link to confirm your appointment:',verify_url])
frappe.sendmail(recipients=[self.email], frappe.sendmail(recipients=[self.customer_email],
message=message, message=message,
subject=_('Appointment Confirmation')) subject=_('Appointment Confirmation'))
frappe.msgprint('Please check your email to confirm the appointment') frappe.msgprint('Please check your email to confirm the appointment')
@ -54,7 +54,7 @@ class Appointment(Document):
cal_event.save() cal_event.save()
def set_verified(self,email): def set_verified(self,email):
if not email == self.email: if not email == self.customer_email:
frappe.throw('Email verification failed.') frappe.throw('Email verification failed.')
# Create new lead # Create new lead
self.create_lead() self.create_lead()

2
erpnext/www/book-appointment/index.py
View File

@ -98,7 +98,7 @@ def create_appointment(date, time, contact):
appointment.customer_phone_number = contact['number'] appointment.customer_phone_number = contact['number']
appointment.customer_skype = contact['skype'] appointment.customer_skype = contact['skype']
appointment.customer_details = contact['notes'] appointment.customer_details = contact['notes']
appointment.email = contact['email'] appointment.customer_email = contact['email']
appointment.status = 'Open' appointment.status = 'Open'
appointment.insert() appointment.insert()