From b7fa085e52aabcff214e44a0b4425523422f4bed Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 6 Nov 2019 12:50:54 +0530 Subject: [PATCH] fix: membership date format (#467) --- .../web_form/memberships/memberships.js | 12 ++---------- .../web_form/memberships_usd/memberships_usd.js | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/foundation/erpnext_foundation/web_form/memberships/memberships.js b/foundation/erpnext_foundation/web_form/memberships/memberships.js index 4a3733c2..7c20448c 100644 --- a/foundation/erpnext_foundation/web_form/memberships/memberships.js +++ b/foundation/erpnext_foundation/web_form/memberships/memberships.js @@ -6,8 +6,8 @@ frappe.ready(function() { // $(".text-right .btn-primary").addClass('hidden'); frappe._set_values = function() { - let from_date = get_date(); - let to_date = get_date(1); + let from_date = frappe.datetime.now_date(); + let to_date = frappe.datetime.add_months(from_date, 12) frappe.web_form.set_value('from_date', from_date); frappe.web_form.set_value('to_date', to_date); @@ -21,14 +21,6 @@ frappe.ready(function() { frappe.web_form.set_value('amount', amount[membership_type]); } - var get_date = (add_year = 0) => { - const today = new Date(); - const year = today.getFullYear() + add_year; - const month = ((today.getMonth() + 1) + '').padStart(2, '0'); - const day = today.getDate(); - return year + '-' + month + '-' + day; - } - frappe.web_form.events.on('after_load', () => { frappe.web_form.set_value('currency', 'INR'); if(frappe.utils.get_url_arg('name')) { diff --git a/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js b/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js index d77dd5a1..989f5f18 100644 --- a/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js +++ b/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js @@ -6,8 +6,8 @@ frappe.ready(function() { // $(".text-right .btn-primary").addClass('hidden'); frappe._set_values = function() { - let from_date = get_date(); - let to_date = get_date(1); + let from_date = frappe.datetime.now_date(); + let to_date = frappe.datetime.add_months(from_date, 12) frappe.web_form.set_value('from_date', from_date); frappe.web_form.set_value('to_date', to_date); @@ -21,14 +21,6 @@ frappe.ready(function() { frappe.web_form.set_value('amount', amount[membership_type]); } - var get_date = (add_year = 0) => { - const today = new Date(); - const year = today.getFullYear() + add_year; - const month = ((today.getMonth() + 1) + '').padStart(2, '0'); - const day = today.getDate(); - return year + '-' + month + '-' + day; - } - frappe.web_form.events.on('after_load', () => { frappe.web_form.set_value('currency', 'USD'); if(frappe.utils.get_url_arg('name')) {