fix: Renamed ABDM Integration to ABDM Settings

earthians · Aug 25, 2022 · 4a51198 · 4a51198
1 parent 6d2ab06
commit 4a51198
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/...care/doctype/abdm_integration/__init__.py → ...lthcare/doctype/abdm_settings/__init__.py b/...care/doctype/abdm_integration/__init__.py → ...lthcare/doctype/abdm_settings/__init__.py
diff --git a/...type/abdm_integration/abdm_integration.js → ...re/doctype/abdm_settings/abdm_settings.js b/...type/abdm_integration/abdm_integration.js → ...re/doctype/abdm_settings/abdm_settings.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2022, healthcare and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('ABDM Integration', {
+frappe.ui.form.on('ABDM Settings', {
 	// refresh: function(frm) {
 
 	// }

diff --git a/...pe/abdm_integration/abdm_integration.json → .../doctype/abdm_settings/abdm_settings.json b/...pe/abdm_integration/abdm_integration.json → .../doctype/abdm_settings/abdm_settings.json
@@ -108,7 +108,7 @@
  "modified": "2022-04-18 14:59:24.279125",
  "modified_by": "Administrator",
  "module": "Healthcare",
- "name": "ABDM Integration",
+ "name": "ABDM Settings",
  "naming_rule": "By fieldname",
  "owner": "Administrator",
  "permissions": [

diff --git a/...type/abdm_integration/abdm_integration.py → ...re/doctype/abdm_settings/abdm_settings.py b/...type/abdm_integration/abdm_integration.py → ...re/doctype/abdm_settings/abdm_settings.py
@@ -4,5 +4,5 @@
 # import frappe
 from frappe.model.document import Document
 
-class ABDMIntegration(Document):
+class ABDMSettings(Document):
 	pass
diff --git a/...abdm_integration/test_abdm_integration.py → ...ctype/abdm_settings/test_abdm_settings.py b/...abdm_integration/test_abdm_integration.py → ...ctype/abdm_settings/test_abdm_settings.py
@@ -4,5 +4,5 @@
 # import frappe
 import unittest
 
-class TestABDMIntegration(unittest.TestCase):
+class TestABDMSettings(unittest.TestCase):
 	pass
diff --git a/healthcare/regional/india/abdm/js/patient.js b/healthcare/regional/india/abdm/js/patient.js
@@ -346,7 +346,7 @@ let create_abha = function (frm) {
 				fieldname: 'patient_consent_attach',
 				fieldtype: 'Attach',
 				description: `Please attach patient's signed consent for using
-						their Aadhar for ABHA creation`
+						their Aadhaar for ABHA creation`
 			},
 			{
 				label: 'OR',
@@ -395,7 +395,7 @@ let create_abha = function (frm) {
 		})
 	})
 
-	frappe.db.get_value('ABDM Integration', {
+	frappe.db.get_value('ABDM Settings', {
 		company: frappe.defaults.get_user_default("Company"),
 		default: 1
 	}, 'patient_aadhaar_consent')

diff --git a/healthcare/regional/india/abdm/test_abdm.py b/healthcare/regional/india/abdm/test_abdm.py
@@ -11,7 +11,7 @@ def setUpClass(cls):
         super().setUpClass()
 
         doc = frappe.get_doc({
-            'doctype': 'ABDM Integration',
+            'doctype': 'ABDM Settings',
             'default': 1,
             'auth_base_url': 'https://dev.abdm.gov.in/gateway/',
             'health_id_base_url': 'https://healthidsbx.abdm.gov.in/api/',

diff --git a/healthcare/regional/india/abdm/utils.py b/healthcare/regional/india/abdm/utils.py
@@ -8,7 +8,7 @@
 @frappe.whitelist()
 def get_authorization_token():
 	client_id, client_secret, auth_base_url = frappe.db.get_value(
-		'ABDM Integration',
+		'ABDM Settings',
 		{
 			'company': frappe.defaults.get_user_default("Company"),
 			'default': 1
@@ -26,7 +26,7 @@ def get_authorization_token():
 	if not auth_base_url:
 		frappe.throw(
 			title='Not Configured',
-			msg='Base URL not configured in ABDM Integration!',
+			msg='Base URL not configured in ABDM Settings!',
 		)
 
 	req = frappe.new_doc('ABDM Request')
@@ -69,7 +69,7 @@ def abdm_request(payload, url_key, req_type, rec_headers=None, to_be_enc=None, p
 		url_type = 'health_id_base_url'
 
 	base_url = frappe.db.get_value(
-		'ABDM Integration',
+		'ABDM Settings',
 		{
 			'company': frappe.defaults.get_user_default("Company"),
 			'default': 1
@@ -79,7 +79,7 @@ def abdm_request(payload, url_key, req_type, rec_headers=None, to_be_enc=None, p
 	if not base_url:
 		frappe.throw(
 			title='Not Configured',
-			msg='Base URL not configured in ABDM Integration!'
+			msg='Base URL not configured in ABDM Settings!'
 		)
 
 	config = get_url(url_key)
@@ -156,7 +156,7 @@ def abdm_request(payload, url_key, req_type, rec_headers=None, to_be_enc=None, p
 
 def get_encrypted_message(message):
 	base_url = frappe.db.get_value(
-		'ABDM Integration',
+		'ABDM Settings',
 		{
 			'company': frappe.defaults.get_user_default("Company"),
 			'default': 1
@@ -243,7 +243,7 @@ def get_health_data(otp, txnId, auth_method):
 # patient after_insert
 def set_consent_attachment_details(doc, method=None):
 	if frappe.db.exists(
-		"ABDM Integration",
+		"ABDM Settings",
 		{"company": frappe.defaults.get_user_default("Company"), "default": 1},
 	):
 		if doc.consent_for_aadhaar_use: