From 63bfa30bc176e761e819084cbff79bb924add724 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Wed, 4 Nov 2020 11:54:01 +0530
Subject: [PATCH] chore: clean up einvoice actions

---
 erpnext/regional/india/e_invoice/einvoice.js | 188 +++++++++----------
 1 file changed, 90 insertions(+), 98 deletions(-)

diff --git a/erpnext/regional/india/e_invoice/einvoice.js b/erpnext/regional/india/e_invoice/einvoice.js
index e0db6c44e69..65cac992ff4 100644
--- a/erpnext/regional/india/e_invoice/einvoice.js
+++ b/erpnext/regional/india/e_invoice/einvoice.js
@@ -10,112 +10,104 @@ erpnext.setup_einvoice_actions = (doctype) => {
 			const { docstatus, irn, irn_cancelled, ewaybill, eway_bill_cancelled, doctype, name, __unsaved } = frm.doc;
 
 			if (docstatus == 0 && !irn && !__unsaved) {
-				frm.add_custom_button(
-					__("Generate IRN"),
-					() => {
-						frappe.call({
-							method: 'erpnext.regional.india.e_invoice.utils.generate_irn',
-							args: { doctype: doctype, name: name },
-							freeze: true,
-							callback: () => frm.reload_doc()
-						})
-					}, 
-					__("E Invoicing")
-				);
+				const action = () => {
+					frappe.call({
+						method: 'erpnext.regional.india.e_invoice.utils.generate_irn',
+						args: { doctype: doctype, name: name },
+						freeze: true,
+						callback: () => frm.reload_doc()
+					})
+				};
+
+				frm.add_custom_button(__("Generate IRN"), action, __('E Invoicing'));
 			}
 
 			if (docstatus == 1 && irn && !irn_cancelled) {
-				frm.add_custom_button(
-					__("Cancel IRN"),
-					() => {
-						const fields = [
-							{
-								"label" : "Reason", 
-								"fieldname": "reason", 
-								"fieldtype": "Select", 
-								"reqd": 1, 
-								"default": "1-Duplicate",
-								"options": ["1-Duplicate", "2-Data Entry Error", "3-Order Cancelled", "4-Other"]
-							},
-							{ 
-								"label": "Remark", 
-								"fieldname": "remark", 
-								"fieldtype": "Data", 
-								"reqd": 1
-							}
-						];
-						const d = new frappe.ui.Dialog({
-							title: __("Cancel IRN"),
-							fields: fields,
-							primary_action: function() {
-								const data = d.get_values();
-								frappe.call({
-									method: 'erpnext.regional.india.e_invoice.utils.cancel_irn',
-									args: { 
-										doctype: doctype,
-										name: name,
-										irn: irn,
-										reason: data.reason.split('-')[0],
-										remark: data.remark
-									},
-									freeze: true,
-									callback: () => frm.reload_doc() || d.hide(),
-									error: () => d.hide()
-								});
-							},
-							primary_action_label: __('Submit')
-						});
-						d.show();
+				const fields = [
+					{
+						"label" : "Reason",
+						"fieldname": "reason",
+						"fieldtype": "Select",
+						"reqd": 1,
+						"default": "1-Duplicate",
+						"options": ["1-Duplicate", "2-Data Entry Error", "3-Order Cancelled", "4-Other"]
 					},
-					__("E Invoicing")
-				)
+					{ 
+						"label": "Remark",
+						"fieldname": "remark",
+						"fieldtype": "Data",
+						"reqd": 1
+					}
+				];
+				const action = () => {
+					const d = new frappe.ui.Dialog({
+						title: __("Cancel IRN"),
+						fields: fields,
+						primary_action: function() {
+							const data = d.get_values();
+							frappe.call({
+								method: 'erpnext.regional.india.e_invoice.utils.cancel_irn',
+								args: { 
+									doctype: doctype,
+									name: name,
+									irn: irn,
+									reason: data.reason.split('-')[0],
+									remark: data.remark
+								},
+								freeze: true,
+								callback: () => frm.reload_doc() || d.hide(),
+								error: () => d.hide()
+							});
+						},
+						primary_action_label: __('Submit')
+					});
+					d.show();
+				};
+				frm.add_custom_button(__("Cancel IRN"), action, __("E Invoicing"));
 			}
 
 			if (docstatus == 1 && irn && !irn_cancelled && !eway_bill_cancelled) {
-				frm.add_custom_button(
-					__("Cancel E-Way Bill"),
-					() => {
-						const fields = [
-							{
-								"label" : "Reason",
-								"fieldname": "reason",
-								"fieldtype": "Select",
-								"reqd": 1,
-								"default": "1-Duplicate",
-								"options": ["1-Duplicate", "2-Data Entry Error", "3-Order Cancelled", "4-Other"]
-							},
-							{
-								"label": "Remark",
-								"fieldname": "remark",
-								"fieldtype": "Data",
-								"reqd": 1
-							}
-						]
-						const d = new frappe.ui.Dialog({
-							title: __('Cancel E-Way Bill'),
-							fields: fields,
-							primary_action: function() {
-								const data = d.get_values();
-								frappe.call({
-									method: 'erpnext.regional.india.e_invoice.utils.cancel_eway_bill',
-									args: {
-										doctype: doctype,
-										name: name,
-										eway_bill: ewaybill,
-										reason: data.reason.split('-')[0],
-										remark: data.remark
-									},
-									freeze: true,
-									callback: () => frm.reload_doc() || d.hide(),
-									error: () => d.hide()
-								})
-							},
-							primary_action_label: __('Submit')
-						});
-						d.show();
+				const fields = [
+					{
+						"label" : "Reason",
+						"fieldname": "reason",
+						"fieldtype": "Select",
+						"reqd": 1,
+						"default": "1-Duplicate",
+						"options": ["1-Duplicate", "2-Data Entry Error", "3-Order Cancelled", "4-Other"]
 					},
-					__("E Invoicing")
-				);
+					{
+						"label": "Remark",
+						"fieldname": "remark",
+						"fieldtype": "Data",
+						"reqd": 1
+					}
+				];
+				const action = () => {
+					const d = new frappe.ui.Dialog({
+						title: __('Cancel E-Way Bill'),
+						fields: fields,
+						primary_action: function() {
+							const data = d.get_values();
+							frappe.call({
+								method: 'erpnext.regional.india.e_invoice.utils.cancel_eway_bill',
+								args: {
+									doctype: doctype,
+									name: name,
+									eway_bill: ewaybill,
+									reason: data.reason.split('-')[0],
+									remark: data.remark
+								},
+								freeze: true,
+								callback: () => frm.reload_doc() || d.hide(),
+								error: () => d.hide()
+							})
+						},
+						primary_action_label: __('Submit')
+					});
+					d.show();
+				};
+				frm.add_custom_button(__("Cancel E-Way Bill"), action, __("E Invoicing"));
 			}
 		}
 	})