accounting/books
2
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2024-12-25 20:11:15 +00:00
Code Issues Releases Activity

fix: Support JS Date in frappe.format

Browse Source
This commit is contained in:
Faris Ansari 2020-01-28 16:26:44 +05:30
parent 0a401d32cd
commit b00de586cf
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/format.js
View File

@ -25,7 +25,15 @@ module.exports = {
dateFormat = frappe.SystemSettings.dateFormat; dateFormat = frappe.SystemSettings.dateFormat;
} }
value = luxon.DateTime.fromISO(value).toFormat(dateFormat); if (typeof value === 'string') {
// ISO String
value = luxon.DateTime.fromISO(value);
} else if (Object.prototype.toString.call(value) === '[object Date]') {
// JS Date
value = luxon.DateTime.fromJSDate(value);
}
value = value.toFormat(dateFormat);
if (value === 'Invalid DateTime') { if (value === 'Invalid DateTime') {
value = ''; value = '';
} }