Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: currency exchange settings #27318

Merged
merged 27 commits into from
Jan 11, 2022
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ff19113
feat: currency exchange settings
rtdany10 Sep 2, 2021
e093863
feat: fetch api details from settings
rtdany10 Sep 3, 2021
d8b8032
feat: init CES default values
rtdany10 Sep 3, 2021
d56c8d4
Merge branch 'develop' into currency-exchange-settings
rtdany10 Sep 3, 2021
a86d9c9
chore: code clean up
rtdany10 Sep 3, 2021
227466c
chore: clean up layout and code
rtdany10 Sep 4, 2021
06340ad
feat: button to restore default settings
rtdany10 Sep 4, 2021
c8d313b
Merge branch 'develop' into currency-exchange-settings
rtdany10 Sep 4, 2021
f460229
Merge branch 'develop' into currency-exchange-settings
rtdany10 Sep 5, 2021
882da2f
Merge branch 'develop' into currency-exchange-settings
rtdany10 Oct 27, 2021
d869b39
Merge branch 'frappe:develop' into currency-exchange-settings
rtdany10 Nov 3, 2021
7291d9f
feat: option for preconfigured selectable service providers
rtdany10 Nov 3, 2021
08b2735
fix: make fields editable only when service provider is custom
rtdany10 Nov 4, 2021
e65a76b
chore: clean up
rtdany10 Nov 4, 2021
1f8be84
fix : remove mutable data structures from argument defaults
rtdany10 Nov 4, 2021
4a0f217
fix: pre-commit issues
rtdany10 Nov 4, 2021
4716523
fix: sider issues
rtdany10 Nov 4, 2021
01e7076
Merge branch 'develop' into currency-exchange-settings
rtdany10 Nov 6, 2021
e50893e
fix: eslint brace style issue
rtdany10 Nov 13, 2021
3f8ad54
Merge branch 'develop' into currency-exchange-settings
rtdany10 Nov 13, 2021
0931d17
Merge branch 'develop' into currency-exchange-settings
deepeshgarg007 Nov 23, 2021
0592096
Merge branch 'develop' into currency-exchange-settings
rtdany10 Dec 7, 2021
c68b2c3
Merge branch 'develop' into currency-exchange-settings
rtdany10 Dec 18, 2021
e2dab6f
fix: Cleanup and fixes
deepeshgarg007 Jan 10, 2022
3fdd47e
Merge branch 'develop' of https://github.com/frappe/erpnext into curr…
deepeshgarg007 Jan 10, 2022
ca5ea5f
fix: test cases
deepeshgarg007 Jan 10, 2022
93d784d
Merge branch 'develop' of https://github.com/frappe/erpnext into curr…
deepeshgarg007 Jan 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt

frappe.ui.form.on('Currency Exchange Settings', {
refresh: function(frm) {
frm.add_custom_button(__('Restore Defaults'), function(){
frm.doc.api_endpoint = "https://api.exchangerate.host/convert";
frm.clear_table("req_params")
frm.clear_table("result_key")
let params = {
date: '{transaction_date}',
from: '{from_currency}',
to: '{to_currency}'
}
var row;
$.each(params, function(key, value){
row = frm.add_child("req_params");
row.key = key;
row.value = value;
})
row = frm.add_child("result_key");
row.key = 'result';
frm.refresh_fields();
frm.save();
});
}
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"actions": [],
"creation": "2021-09-02 14:53:50.923529",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"api_details_section",
"api_endpoint",
"url",
"column_break_3",
"help",
"section_break_2",
"req_params",
"column_break_4",
"result_key"
],
"fields": [
{
"fieldname": "api_endpoint",
"fieldtype": "Data",
"in_list_view": 1,
"label": "API Endpoint",
"reqd": 1
},
{
"fieldname": "section_break_2",
"fieldtype": "Section Break",
"label": "Request Parameters"
},
{
"fieldname": "column_break_4",
"fieldtype": "Column Break"
},
{
"fieldname": "req_params",
"fieldtype": "Table",
"label": "Parameters",
"options": "Currency Exchange Settings Details",
"reqd": 1
},
{
"fieldname": "api_details_section",
"fieldtype": "Section Break",
"label": "API Details"
},
{
"fieldname": "column_break_3",
"fieldtype": "Column Break"
},
{
"fieldname": "result_key",
"fieldtype": "Table",
"label": "Result Key",
"options": "Currency Exchange Settings Result",
"reqd": 1
},
{
"fieldname": "url",
"fieldtype": "Data",
"label": "Example URL",
"read_only": 1
},
{
"fieldname": "help",
"fieldtype": "HTML",
"label": "Help",
"options": "<h3>Currency Exchange Settings Help</h3>\n<p>There are 3 variables that could be used within the endpoint, result key and in values of the parameter.</p>\n<p>Exchange rate between {from_currency} and {to_currency} on {transaction_date} is fetched by the API.</p>\n<p>Example: If your endpoint is exchange.com/2021-08-01, then, you will have to input exchange.com/{transaction_date}</p>"
}
],
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
"modified": "2021-09-04 11:41:34.375637",
"modified_by": "Administrator",
"module": "Setup",
"name": "Currency Exchange Settings",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"print": 1,
"read": 1,
"role": "System Manager",
"share": 1,
"write": 1
}
],
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt

import frappe
from frappe import _
from frappe.utils import nowdate
from frappe.model.document import Document

class CurrencyExchangeSettings(Document):
def validate(self):
transaction_date = nowdate()
from_currency = 'USD'
to_currency = 'INR'
params = {}
for row in self.req_params:
params[row.key] = row.value.format(
transaction_date=transaction_date,
to_currency=to_currency,
from_currency=from_currency
)
import requests
api_url = self.api_endpoint.format(
transaction_date=transaction_date,
to_currency=to_currency,
from_currency=from_currency
)
try:
response = requests.get(api_url, params=params)
except requests.exceptions.RequestException as e:
frappe.throw("Error: " + str(e))
response.raise_for_status()
value = response.json()
try:
for key in self.result_key:
value = value[str(key.key).format(
transaction_date=transaction_date,
to_currency=to_currency,
from_currency=from_currency
)]
except Exception:
frappe.throw("Invalid result key. Response: " + response.text)
if not isinstance(value, (int, float)):
frappe.throw(_("Returned exchange rate is neither integer not float."))
self.url = response.url
frappe.msgprint("Exchange rate of USD to INR is " + str(value))
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt

# import frappe
import unittest

class TestCurrencyExchangeSettings(unittest.TestCase):
pass
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"actions": [],
"creation": "2021-09-02 14:54:49.033512",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"key",
"value"
],
"fields": [
{
"fieldname": "key",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Key",
"reqd": 1
},
{
"fieldname": "value",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Value",
"reqd": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2021-09-04 17:49:17.383982",
"modified_by": "Administrator",
"module": "Setup",
"name": "Currency Exchange Settings Details",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt

# import frappe
from frappe.model.document import Document

class CurrencyExchangeSettingsDetails(Document):
pass
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"actions": [],
"creation": "2021-09-03 13:17:22.088259",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"key"
],
"fields": [
{
"fieldname": "key",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Key",
"reqd": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2021-09-04 17:49:33.858070",
"modified_by": "Administrator",
"module": "Setup",
"name": "Currency Exchange Settings Result",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt

# import frappe
from frappe.model.document import Document

class CurrencyExchangeSettingsResult(Document):
pass
11 changes: 10 additions & 1 deletion erpnext/setup/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,16 @@ def set_single_defaults():
pass

frappe.db.set_default("date_format", "dd-mm-yyyy")

ces = frappe.get_single('Currency Exchange Settings')
try:
ces.api_endpoint = "https://api.exchangerate.host/convert"
ces.append('result_key', {'key': 'result'})
ces.append('req_params', {'key': 'date', 'value': '{transaction_date}'})
ces.append('req_params', {'key': 'from', 'value': '{from_currency}'})
ces.append('req_params', {'key': 'to', 'value': '{to_currency}'})
ces.save()
except frappe.ValidationError:
pass

def create_compact_item_print_custom_field():
create_custom_field('Print Settings', {
Expand Down
27 changes: 20 additions & 7 deletions erpnext/setup/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,22 +100,35 @@ def get_exchange_rate(from_currency, to_currency, transaction_date=None, args=No

if not value:
import requests
api_url = "https://api.exchangerate.host/convert"
response = requests.get(api_url, params={
"date": transaction_date,
"from": from_currency,
"to": to_currency
})
settings = frappe.get_single('Currency Exchange Settings')
req_params = {
"transaction_date": transaction_date,
"from_currency": from_currency,
"to_currency": to_currency
}
params = {}
for row in settings.req_params:
params[row.key] = format_ces_api(row.value, req_params)
response = requests.get(format_ces_api(settings.api_endpoint, req_params), params=params)
# expire in 6 hours
response.raise_for_status()
value = response.json()["result"]
value = response.json()
for res_key in settings.result_key:
value = value[format_ces_api(str(res_key.key), req_params)]
cache.setex(name=key, time=21600, value=flt(value))
return flt(value)
except Exception:
frappe.log_error(title="Get Exchange Rate")
frappe.msgprint(_("Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually").format(from_currency, to_currency, transaction_date))
return 0.0

def format_ces_api(data="", param={}):
return data.format(
transaction_date=param["transaction_date"],
to_currency=param["to_currency"],
from_currency=param["from_currency"]
)

def enable_all_roles_and_domains():
""" enable all roles and domain for testing """
# add all roles to users
Expand Down