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

Get mobile nos for customer contact (#8674)

Browse Source
This commit is contained in:
Nabin Hait 2017-05-04 12:11:48 +05:30 committed by GitHub
parent 3ce41d6b1f
commit fcc0246b38
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/public/js/sms_manager.js
View File

@ -21,9 +21,9 @@ function SMSManager(doc) {
} }
if (in_list(['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice'], doc.doctype)) if (in_list(['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice'], doc.doctype))
this.show(doc.contact_person, 'customer', doc.customer, '', default_msg[doc.doctype]); this.show(doc.contact_person, 'Customer', doc.customer, '', default_msg[doc.doctype]);
else if (in_list(['Purchase Order', 'Purchase Receipt'], doc.doctype)) else if (in_list(['Purchase Order', 'Purchase Receipt'], doc.doctype))
this.show(doc.contact_person, 'supplier', doc.supplier, '', default_msg[doc.doctype]); this.show(doc.contact_person, 'Supplier', doc.supplier, '', default_msg[doc.doctype]);
else if (doc.doctype == 'Lead') else if (doc.doctype == 'Lead')
this.show('', '', '', doc.mobile_no, default_msg[doc.doctype]); this.show('', '', '', doc.mobile_no, default_msg[doc.doctype]);
else if (doc.doctype == 'Opportunity') else if (doc.doctype == 'Opportunity')
@ -33,13 +33,13 @@ function SMSManager(doc) {
}; };
this.get_contact_number = function(contact, key, value) { this.get_contact_number = function(contact, ref_doctype, ref_name) {
frappe.call({ frappe.call({
method: "erpnext.setup.doctype.sms_settings.sms_settings.get_contact_number", method: "erpnext.setup.doctype.sms_settings.sms_settings.get_contact_number",
args: { args: {
contact_name: contact, contact_name: contact,
value:value, ref_doctype: ref_doctype,
key:key ref_name: ref_name
}, },
callback: function(r) { callback: function(r) {
if(r.exc) { msgprint(r.exc); return; } if(r.exc) { msgprint(r.exc); return; }
@ -49,13 +49,13 @@ function SMSManager(doc) {
}); });
}; };
this.show = function(contact, key, value, mobile_nos, message) { this.show = function(contact, ref_doctype, ref_name, mobile_nos, message) {
this.message = message; this.message = message;
if (mobile_nos) { if (mobile_nos) {
me.number = mobile_nos; me.number = mobile_nos;
me.show_dialog(); me.show_dialog();
} else if (contact){ } else if (contact){
this.get_contact_number(contact, key, value) this.get_contact_number(contact, ref_doctype, ref_name)
} else { } else {
me.show_dialog(); me.show_dialog();
} }

11
erpnext/setup/doctype/sms_settings/sms_settings.py
View File

@ -40,10 +40,15 @@ def get_sender_name():
return sender_name return sender_name
@frappe.whitelist() @frappe.whitelist()
def get_contact_number(contact_name, value, key): def get_contact_number(contact_name, ref_doctype, ref_name):
"returns mobile number of the contact" "returns mobile number of the contact"
number = frappe.db.sql("""select mobile_no, phone from tabContact where name=%s and %s=%s""" % number = frappe.db.sql("""select mobile_no, phone from tabContact
('%s', frappe.db.escape(key), '%s'), (contact_name, value)) where name=%s
and exists(
select name from `tabDynamic Link` where link_doctype=%s and link_name=%s
)
""", (contact_name, ref_doctype, ref_name))
return number and (number[0][0] or number[0][1]) or '' return number and (number[0][0] or number[0][1]) or ''
@frappe.whitelist() @frappe.whitelist()