Bank account lookup fix (#61)

* feat: fix lookup for non-existient bank account info, improve UX * fix: don't raise exception on bank account lookup
agritheory · Feb 28, 2023 · c4357a8 · c4357a8
1 parent 4ef8a91
commit c4357a8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/check_run/check_run/__init__.py b/check_run/check_run/__init__.py
@@ -4,6 +4,6 @@
 @frappe.whitelist()
 def show_bank_account_number(doctype, docname):
 	doc = frappe.get_doc(doctype, docname)
-	routing_number = frappe.get_value('Bank', doc.bank, 'aba_number')
-	account_number = doc.get_password('bank_account')
+	routing_number = frappe.get_value('Bank', doc.bank, 'aba_number') or ''
+	account_number = doc.get_password('bank_account', raise_exception=False) or ''
 	return {'routing_number': routing_number, 'account_number': account_number}
diff --git a/check_run/public/js/custom/employee_custom.js b/check_run/public/js/custom/employee_custom.js
@@ -41,4 +41,4 @@ function set_required_banking_fields(frm){
 			frm.set_df_property('bank_account', 'hidden', 1)
 		}
 	})
-}
+}
diff --git a/check_run/public/js/custom/supplier_custom.js b/check_run/public/js/custom/supplier_custom.js
@@ -18,27 +18,27 @@ function show_bank_account_number(frm) {
 	frappe.msgprint(msg, "Bank Information")
 } else {
 	frappe.xcall('check_run.check_run.show_bank_account_number', { doctype: frm.doc.doctype, docname: frm.doc.name })
-		.then(r => {
-			let msg = `Routing Number ${r.routing_number}<br>Account Number: ${r.account_number}`
-			frappe.msgprint(msg, "Bank Information")
-		})
+	.then(r => {
+		let msg = `Routing Number ${r.routing_number}<br>Account Number: ${r.account_number}`
+		frappe.msgprint(msg, "Bank Information")
+	})
 }
 }
 
 function set_required_banking_fields(frm) {
 	if (!frm.doc.supplier_default_mode_of_payment) { return }
 	frappe.db.get_value('Mode of Payment', frm.doc.supplier_default_mode_of_payment, 'type')
-		.then(r => {
-			if (r.message.type == 'Electronic') {
-				frm.set_df_property('bank', 'reqd', 1)
-				frm.set_df_property('bank', 'hidden', 0)
-				frm.set_df_property('bank_account', 'reqd', 1)
-				frm.set_df_property('bank_account', 'hidden', 0)
-			} else {
-				frm.set_df_property('bank', 'reqd', 0)
-				frm.set_df_property('bank', 'hidden', 1)
-				frm.set_df_property('bank_account', 'reqd', 0)
-				frm.set_df_property('bank_account', 'hidden', 1)
-			}
-		})
-}
+	.then(r => {
+		if (r.message.type == 'Electronic') {
+			frm.set_df_property('bank', 'reqd', 1)
+			frm.set_df_property('bank', 'hidden', 0)
+			frm.set_df_property('bank_account', 'reqd', 1)
+			frm.set_df_property('bank_account', 'hidden', 0)
+		} else {
+			frm.set_df_property('bank', 'reqd', 0)
+			frm.set_df_property('bank', 'hidden', 1)
+			frm.set_df_property('bank_account', 'reqd', 0)
+			frm.set_df_property('bank_account', 'hidden', 1)
+		}
+	})
+}