From 254e28aa9379ee821756d3de093bc2d1b100f238 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 15 Mar 2018 13:09:18 +0530 Subject: [PATCH 1/2] Fix moment on erpnextorg --- .../web_form/memberships/memberships.js | 17 +++++++++++++---- .../memberships_usd/memberships_usd.js | 18 ++++++++++++++---- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/foundation/erpnext_foundation/web_form/memberships/memberships.js b/foundation/erpnext_foundation/web_form/memberships/memberships.js index 8d07c366..6a013ea3 100644 --- a/foundation/erpnext_foundation/web_form/memberships/memberships.js +++ b/foundation/erpnext_foundation/web_form/memberships/memberships.js @@ -14,14 +14,23 @@ frappe.ready(function() { $('[data-fieldname="amount"]').val(amount[membership_type]); } - if(get_url_arg('name')) { + 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; + } + + if(frappe.utils.get_url_arg('name')) { $('[data-fieldname="membership_type"]').prop('disabled', true); $('[data-fieldname="currency"]').prop('disabled', true); $('.page-content .btn-form-submit').addClass('hidden'); } else { - var m = moment(); - $('[data-fieldname="from_date"]').val(m.format()).trigger('change'); - $('[data-fieldname="to_date"]').val(m.add(1, 'year').format()).trigger('change'); + const from_date = get_date(); + const to_date = get_date(1); + $('[data-fieldname="from_date"]').val(from_date).trigger('change'); + $('[data-fieldname="to_date"]').val(to_date).trigger('change'); $('[data-fieldname="membership_type"]').on('change', function() { set_amount(); }); $('[data-fieldname="currency"]').val("INR"); set_amount(); 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 26399c02..13c1512f 100644 --- a/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js +++ b/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js @@ -17,14 +17,24 @@ frappe.ready(function() { $('[data-fieldname="amount"]').val(amount[membership_type]); } - - if(get_url_arg('name')) { + 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; + } + + + if(frappe.utils.get_url_arg('name')) { $('[data-fieldname="membership_type"]').prop('disabled', true); $('[data-fieldname="currency"]').prop('disabled', true); $('.page-content .btn-form-submit').addClass('hidden'); } else { - $('[data-fieldname="from_date"]').val(m.format()).trigger('change'); - $('[data-fieldname="to_date"]').val(m.add(1, 'year').format()).trigger('change'); + const from_date = get_date(); + const to_date = get_date(1); + $('[data-fieldname="from_date"]').val(from_date).trigger('change'); + $('[data-fieldname="to_date"]').val(to_date).trigger('change'); $('[data-fieldname="membership_type"]').on('change', function() { set_amount(); }); $('[data-fieldname="currency"]').val('USD'); set_amount(); From fa0c7c8fd779b8ae62336bf013adc0cf488fc618 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 15 Mar 2018 13:10:47 +0530 Subject: [PATCH 2/2] remove moment --- .../web_form/memberships_usd/memberships_usd.js | 2 -- 1 file changed, 2 deletions(-) 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 13c1512f..2c66b34d 100644 --- a/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js +++ b/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js @@ -3,8 +3,6 @@ frappe.ready(function() { $(".page-header-actions-block .btn-primary, .page-header-actions-block .btn-default").addClass('hidden'); $(".text-right .btn-primary").addClass('hidden'); - var m = moment(); - var set_amount = function() { var membership_type = $('[data-fieldname="membership_type"]').val(); var currency = $('[data-fieldname="currency"]').val();