vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #35845 from Abdeali099/fix-contact-address-conditions

Browse source 
refactor: streamline address and contact rendering logic
This commit is contained in:
Ejaaz Khan 2026-01-21 13:02:56 +05:30 • committed by GitHub
commit e793d60fdc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
frappe/public/js/frappe/utils/address_and_contact.js
View file

@ -2,27 +2,42 @@ frappe.provide("frappe.contacts");
$.extend(frappe.contacts, {
clear_address_and_contact: function (frm) {
$(frm.fields_dict["address_html"].wrapper).html("");
frm.fields_dict["contact_html"] && $(frm.fields_dict["contact_html"].wrapper).html("");
for (const field of ["address_html", "contact_html"]) {
$(frm.fields_dict[field]?.wrapper)?.html("");
}
},
render_address_and_contact: function (frm) {
// render address
if (frm.fields_dict["address_html"] && "addr_list" in frm.doc.__onload) {
$(frm.fields_dict["address_html"].wrapper)
.html(frappe.render_template("address_list", frm.doc.__onload))
.find(".btn-address")
.on("click", () => new_record("Address", frm));
}
const items = [
{
field: "address_html",
data: "addr_list",
template: "address_list",
btn: ".btn-address",
doctype: "Address",
},
{
field: "contact_html",
data: "contact_list",
template: "contact_list",
btn: ".btn-contact",
doctype: "Contact",
},
];
// render contact
if (frm.fields_dict["contact_html"] && "contact_list" in frm.doc.__onload) {
$(frm.fields_dict["contact_html"].wrapper)
.html(frappe.render_template("contact_list", frm.doc.__onload))
.find(".btn-contact")
.on("click", () => new_record("Contact", frm));
for (const item of items) {
// render address or contact
const field_wrapper = frm.fields_dict[item.field]?.wrapper;
if (field_wrapper && frm.doc.__onload && item.data in frm.doc.__onload) {
$(field_wrapper)
.html(frappe.render_template(item.template, frm.doc.__onload))
.find(item.btn)
.on("click", () => new_record(item.doctype, frm));
}
}
},
get_last_doc: function (frm) {
const reverse_routes = frappe.route_history.slice().reverse();
const last_route = reverse_routes.find((route) => {
@ -38,6 +53,7 @@ $.extend(frappe.contacts, {
docname,
};
},
get_address_display: function (frm, address_field, display_field) {
if (frm.updating_party_details) {
return;