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

[Fix] Delivery notification for delivery trip (#13543)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-04-06 14:26:26 +05:30 committed by Rushabh Mehta
parent 2ae6cfda5f
commit c0f149a3be
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/stock/doctype/delivery_trip/delivery_trip.py
View File

@ -9,7 +9,7 @@ import googlemaps
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.utils.user import get_user_fullname from frappe.utils.user import get_user_fullname
from frappe.utils import getdate from frappe.utils import getdate, cstr
from frappe.integrations.doctype.google_maps.google_maps import round_timedelta from frappe.integrations.doctype.google_maps.google_maps import round_timedelta
from frappe.integrations.doctype.google_maps.google_maps import format_address from frappe.integrations.doctype.google_maps.google_maps import format_address
@ -152,17 +152,18 @@ def notify_customers(docname, date, driver, vehicle, sender_email, delivery_noti
delivery_stops = frappe.get_all('Delivery Stop', {"parent": docname}) delivery_stops = frappe.get_all('Delivery Stop', {"parent": docname})
attachments = [] attachments = []
for delivery_stop in delivery_stops: parent_doc = frappe.get_doc('Delivery Trip', docname)
delivery_stop_info = frappe.db.get_value( args = parent_doc.as_dict()
"Delivery Stop",
delivery_stop.name, for delivery_stop in parent_doc.delivery_stops:
["notified_by_email", "estimated_arrival", "details", "contact", "delivery_notes"], contact_info = frappe.db.get_value("Contact", delivery_stop.contact,
as_dict=1)
contact_info = frappe.db.get_value("Contact", delivery_stop_info.contact,
["first_name", "last_name", "email_id", "gender"], as_dict=1) ["first_name", "last_name", "email_id", "gender"], as_dict=1)
if delivery_stop_info.delivery_notes: args.update(delivery_stop.as_dict())
delivery_notes = (delivery_stop_info.delivery_notes).split(",") args.update(contact_info)
if delivery_stop.delivery_notes:
delivery_notes = (delivery_stop.delivery_notes).split(",")
default_print_format = frappe.get_meta('Delivery Note').default_print_format default_print_format = frappe.get_meta('Delivery Note').default_print_format
attachments = [] attachments = []
for delivery_note in delivery_notes: for delivery_note in delivery_notes:
@ -172,21 +173,14 @@ def notify_customers(docname, date, driver, vehicle, sender_email, delivery_noti
file_name="Delivery Note", file_name="Delivery Note",
print_format=default_print_format or "Standard")) print_format=default_print_format or "Standard"))
if not delivery_stop_info.notified_by_email and contact_info.email_id: if not delivery_stop.notified_by_email and contact_info.email_id:
driver_info = frappe.db.get_value("Driver", driver, ["full_name", "cell_number"], as_dict=1) driver_info = frappe.db.get_value("Driver", driver, ["full_name", "cell_number"], as_dict=1)
sender_designation = frappe.db.get_value("Employee", sender_email, ["designation"]) sender_designation = frappe.db.get_value("Employee", sender_email, ["designation"])
estimated_arrival = str(delivery_stop_info.estimated_arrival)[:-3] estimated_arrival = cstr(delivery_stop.estimated_arrival)[:-3]
email_template = frappe.get_doc("Standard Reply", delivery_notification) email_template = frappe.get_doc("Standard Reply", delivery_notification)
message = frappe.render_template( message = frappe.render_template(email_template.response, args)
email_template.response,
dict(contact_info=contact_info, sender_name=sender_name,
details=delivery_stop_info.details,
estimated_arrival=estimated_arrival,
date=getdate(date).strftime('%d.%m.%y'), vehicle=vehicle,
driver_info=driver_info,
sender_designation=sender_designation)
)
frappe.sendmail( frappe.sendmail(
recipients=contact_info.email_id, recipients=contact_info.email_id,
sender=sender_email, sender=sender_email,