nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ux] fixed primary action

Browse Source
This commit is contained in:
Rushabh Mehta
2014-08-07 15:24:26 +05:30
committed by Anand Doshi
parent d91cefb23d
commit 995185d02d
34 changed files with 206 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/support/doctype/customer_issue/customer_issue.js
View File

@@ -13,7 +13,8 @@ frappe.ui.form.on_change("Customer Issue", "contact_person",
erpnext.support.CustomerIssue = frappe.ui.form.Controller.extend({
refresh: function() {
if((cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
cur_frm.add_custom_button(__('Make Maintenance Visit'), this.make_maintenance_visit)
cur_frm.add_custom_button(__('Make Maintenance Visit'),
this.make_maintenance_visit, frappe.boot.doctype_icons["Maintenance Visit"], "btn-default")
}
},

4
erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
View File

@@ -28,7 +28,7 @@ erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({
company: me.frm.doc.company
}
});
});
}, "icon-download", "btn-default");
} else if (this.frm.doc.docstatus === 1) {
this.frm.add_custom_button(__("Make Maintenance Visit"), function() {
frappe.model.open_mapped_doc({
@@ -36,7 +36,7 @@ erpnext.support.MaintenanceSchedule = frappe.ui.form.Controller.extend({
source_name: me.frm.doc.name,
frm: me.frm
})
});
}, frappe.boot.doctype_icons["Maintenance Visit"]);
}
},

22
erpnext/support/doctype/maintenance_visit/maintenance_visit.js
View File

@@ -3,18 +3,18 @@
frappe.provide("erpnext.support");
frappe.ui.form.on_change("Maintenance Visit", "customer", function(frm) {
frappe.ui.form.on_change("Maintenance Visit", "customer", function(frm) {
erpnext.utils.get_party_details(frm) });
frappe.ui.form.on_change("Maintenance Visit", "customer_address",
frappe.ui.form.on_change("Maintenance Visit", "customer_address",
erpnext.utils.get_address_display);
frappe.ui.form.on_change("Maintenance Visit", "contact_person",
erpnext.utils.get_contact_details);
frappe.ui.form.on_change("Maintenance Visit", "contact_person",
erpnext.utils.get_contact_details);
// TODO commonify this code
erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({
refresh: function() {
if (this.frm.doc.docstatus===0) {
cur_frm.add_custom_button(__('From Maintenance Schedule'),
cur_frm.add_custom_button(__('From Maintenance Schedule'),
function() {
frappe.model.map_current_doc({
method: "erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit",
@@ -25,8 +25,8 @@ erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({
company: cur_frm.doc.company
}
})
});
cur_frm.add_custom_button(__('From Customer Issue'),
}, "icon-download", "btn-default");
cur_frm.add_custom_button(__('From Customer Issue'),
function() {
frappe.model.map_current_doc({
method: "erpnext.support.doctype.customer_issue.customer_issue.make_maintenance_visit",
@@ -37,8 +37,8 @@ erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({
company: cur_frm.doc.company
}
})
});
cur_frm.add_custom_button(__('From Sales Order'),
}, "icon-download", "btn-default");
cur_frm.add_custom_button(__('From Sales Order'),
function() {
frappe.model.map_current_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit",
@@ -50,7 +50,7 @@ erpnext.support.MaintenanceVisit = frappe.ui.form.Controller.extend({
company: cur_frm.doc.company
}
})
});
}, "icon-download", "btn-default");
}
},
});
@@ -91,4 +91,4 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) {
cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
return {query: "erpnext.controllers.queries.customer_query" }
}
}

2
erpnext/support/doctype/newsletter/newsletter.js
View File

@@ -20,7 +20,7 @@ cur_frm.cscript.refresh = function(doc) {
return $c_obj(doc, 'send_emails', '', function(r) {
cur_frm.refresh();
});
})
}, "icon-play", "btn-success");
}
cur_frm.cscript.setup_dashboard();

26
erpnext/support/doctype/support_ticket/support_ticket.js
View File

@@ -15,27 +15,29 @@ $.extend(cur_frm.cscript, {
<span class="help">'+__("Integrate incoming support emails to Support Ticket")+'</span></p>';
}
},
refresh: function(doc) {
erpnext.toggle_naming_series();
cur_frm.cscript.make_listing(doc);
if(!doc.__islocal) {
if(cur_frm.fields_dict.status.get_status()=="Write") {
if(doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cur_frm.cscript['Close Ticket']);
if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket', cur_frm.cscript['Re-Open Ticket']);
if(doc.status!='Closed') cur_frm.add_custom_button('Close',
cur_frm.cscript['Close Ticket'], "icon-ok", "btn-success");
if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket',
cur_frm.cscript['Re-Open Ticket'], null, "btn-default");
}
cur_frm.toggle_enable(["subject", "raised_by"], false);
cur_frm.toggle_display("description", false);
}
refresh_field('status');
},
make_listing: function(doc) {
var wrapper = cur_frm.fields_dict['thread_html'].wrapper;
var comm_list = frappe.get_list("Communication", {"parent": doc.name, "parenttype":"Support Ticket"})
if(!comm_list.length) {
comm_list.push({
"sender": doc.raised_by,
@@ -43,7 +45,7 @@ $.extend(cur_frm.cscript, {
"subject": doc.subject,
"content": doc.description});
}
cur_frm.communication_view = new frappe.views.CommunicationList({
list: comm_list,
parent: wrapper,
@@ -52,11 +54,11 @@ $.extend(cur_frm.cscript, {
})
},
'Close Ticket': function() {
cur_frm.cscript.set_status("Closed");
},
'Re-Open Ticket': function() {
cur_frm.cscript.set_status("Open");
},
@@ -72,8 +74,8 @@ $.extend(cur_frm.cscript, {
if(!r.exc) cur_frm.reload_doc();
}
})
}
})