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

Merge pull request #43476 from cogk/fix-api-endpoint-for-frankfurter

Browse Source
This commit is contained in:
Sagar Vora
2024-10-02 14:40:55 +05:30
committed by GitHub
parent 6433019624 c444de017a
commit 70a7d1b75d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,7 +109,7 @@ def get_api_endpoint(service_provider: str | None = None, use_http: bool = False
if service_provider == "exchangerate.host": if service_provider == "exchangerate.host":
api = "api.exchangerate.host/convert" api = "api.exchangerate.host/convert"
elif service_provider == "frankfurter.app": elif service_provider == "frankfurter.app":
api = "frankfurter.app/{transaction_date}" api = "api.frankfurter.app/{transaction_date}"
protocol = "https://" protocol = "https://"
if use_http: if use_http:

4
erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
View File

@@ -68,9 +68,9 @@ def patched_requests_get(*args, **kwargs):
if kwargs["params"].get("date") and kwargs["params"].get("from") and kwargs["params"].get("to"): if kwargs["params"].get("date") and kwargs["params"].get("from") and kwargs["params"].get("to"):
if test_exchange_values.get(kwargs["params"]["date"]): if test_exchange_values.get(kwargs["params"]["date"]):
return PatchResponse({"result": test_exchange_values[kwargs["params"]["date"]]}, 200) return PatchResponse({"result": test_exchange_values[kwargs["params"]["date"]]}, 200)
elif args[0].startswith("https://frankfurter.app") and kwargs.get("params"): elif args[0].startswith("https://api.frankfurter.app") and kwargs.get("params"):
if kwargs["params"].get("base") and kwargs["params"].get("symbols"): if kwargs["params"].get("base") and kwargs["params"].get("symbols"):
date = args[0].replace("https://frankfurter.app/", "") date = args[0].replace("https://api.frankfurter.app/", "")
if test_exchange_values.get(date): if test_exchange_values.get(date):
return PatchResponse( return PatchResponse(
{"rates": {kwargs["params"].get("symbols"): test_exchange_values.get(date)}}, 200 {"rates": {kwargs["params"].get("symbols"): test_exchange_values.get(date)}}, 200

2
erpnext/setup/install.py
View File

@@ -84,7 +84,7 @@ def setup_currency_exchange():
ces.set("result_key", []) ces.set("result_key", [])
ces.set("req_params", []) ces.set("req_params", [])
ces.api_endpoint = "https://frankfurter.app/{transaction_date}" ces.api_endpoint = "https://api.frankfurter.app/{transaction_date}"
ces.append("result_key", {"key": "rates"}) ces.append("result_key", {"key": "rates"})
ces.append("result_key", {"key": "{to_currency}"}) ces.append("result_key", {"key": "{to_currency}"})
ces.append("req_params", {"key": "base", "value": "{from_currency}"}) ces.append("req_params", {"key": "base", "value": "{from_currency}"})