erpnext/foundation
1
0
Fork 0
mirror of https://github.com/erpnext/foundation.git synced 2026-10-16 18:00:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: membership date format (#467)

Browse Source
This commit is contained in:
Shivam Mishra
2019-11-06 12:50:54 +05:30
committed by GitHub
parent 9d1105b7f4
commit b7fa085e52
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
foundation/erpnext_foundation/web_form/memberships/memberships.js
View File

@@ -6,8 +6,8 @@ frappe.ready(function() {
// $(".text-right .btn-primary").addClass('hidden'); // $(".text-right .btn-primary").addClass('hidden');
frappe._set_values = function() { frappe._set_values = function() {
let from_date = get_date(); let from_date = frappe.datetime.now_date();
let to_date = get_date(1); let to_date = frappe.datetime.add_months(from_date, 12)
frappe.web_form.set_value('from_date', from_date); frappe.web_form.set_value('from_date', from_date);
frappe.web_form.set_value('to_date', to_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]); 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.events.on('after_load', () => {
frappe.web_form.set_value('currency', 'INR'); frappe.web_form.set_value('currency', 'INR');
if(frappe.utils.get_url_arg('name')) { if(frappe.utils.get_url_arg('name')) {

12
foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js
View File

@@ -6,8 +6,8 @@ frappe.ready(function() {
// $(".text-right .btn-primary").addClass('hidden'); // $(".text-right .btn-primary").addClass('hidden');
frappe._set_values = function() { frappe._set_values = function() {
let from_date = get_date(); let from_date = frappe.datetime.now_date();
let to_date = get_date(1); let to_date = frappe.datetime.add_months(from_date, 12)
frappe.web_form.set_value('from_date', from_date); frappe.web_form.set_value('from_date', from_date);
frappe.web_form.set_value('to_date', to_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]); 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.events.on('after_load', () => {
frappe.web_form.set_value('currency', 'USD'); frappe.web_form.set_value('currency', 'USD');
if(frappe.utils.get_url_arg('name')) { if(frappe.utils.get_url_arg('name')) {