nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 20:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: introduce access_key field

Browse Source 
(cherry picked from commit 81591a34c2)

# Conflicts:
#	erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
This commit is contained in:
ruthra kumar
2023-10-04 15:23:29 +05:30
committed by Mergify
parent 52c0900576
commit 98a9007e9f
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
View File

@@ -8,6 +8,7 @@
"api_details_section", "api_details_section",
"service_provider", "service_provider",
"api_endpoint", "api_endpoint",
"access_key",
"url", "url",
"column_break_3", "column_break_3",
"help", "help",
@@ -77,12 +78,31 @@
"label": "Service Provider", "label": "Service Provider",
"options": "frankfurter.app\nexchangerate.host\nCustom", "options": "frankfurter.app\nexchangerate.host\nCustom",
"reqd": 1 "reqd": 1
<<<<<<< HEAD
=======
},
{
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
"label": "Disabled"
},
{
"depends_on": "eval:doc.service_provider == 'exchangerate.host';",
"fieldname": "access_key",
"fieldtype": "Data",
"label": "Access Key"
>>>>>>> 81591a34c2 (refactor: introduce access_key field)
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-01-10 15:51:14.521174", "modified": "2022-01-10 15:51:14.521174",
=======
"modified": "2023-10-04 15:30:25.333860",
>>>>>>> 81591a34c2 (refactor: introduce access_key field)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Currency Exchange Settings", "name": "Currency Exchange Settings",

10
erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
View File

@@ -18,11 +18,21 @@ class CurrencyExchangeSettings(Document):
def set_parameters_and_result(self): def set_parameters_and_result(self):
if self.service_provider == "exchangerate.host": if self.service_provider == "exchangerate.host":
if not self.access_key:
frappe.throw(
_("Access Key is required for Service Provider: {0}").format(
frappe.bold(self.service_provider)
)
)
self.set("result_key", []) self.set("result_key", [])
self.set("req_params", []) self.set("req_params", [])
self.api_endpoint = "https://api.exchangerate.host/convert" self.api_endpoint = "https://api.exchangerate.host/convert"
self.append("result_key", {"key": "result"}) self.append("result_key", {"key": "result"})
self.append("req_params", {"key": "access_key", "value": self.access_key})
self.append("req_params", {"key": "amount", "value": "1"})
self.append("req_params", {"key": "date", "value": "{transaction_date}"}) self.append("req_params", {"key": "date", "value": "{transaction_date}"})
self.append("req_params", {"key": "from", "value": "{from_currency}"}) self.append("req_params", {"key": "from", "value": "{from_currency}"})
self.append("req_params", {"key": "to", "value": "{to_currency}"}) self.append("req_params", {"key": "to", "value": "{to_currency}"})