From a44d40f3d2eedbdce143051a2f931d0e0a481042 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Thu, 20 Sep 2018 10:47:59 +0530 Subject: [PATCH] [fix][trigger] update membership_type to Link (input) fields - also allow read on all Link options --- .../web_form/memberships/memberships.js | 9 +++++--- .../web_form/memberships/memberships.json | 23 ++++++++++++++----- .../memberships_usd/memberships_usd.js | 13 +++++++---- .../memberships_usd/memberships_usd.json | 23 ++++++++++++++----- 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/foundation/erpnext_foundation/web_form/memberships/memberships.js b/foundation/erpnext_foundation/web_form/memberships/memberships.js index 627a2734..c23f4ffe 100644 --- a/foundation/erpnext_foundation/web_form/memberships/memberships.js +++ b/foundation/erpnext_foundation/web_form/memberships/memberships.js @@ -7,7 +7,7 @@ frappe.ready(function() { $(".text-right .btn-primary").addClass('hidden'); var set_amount = function() { - var membership_type = $('select[data-fieldname="membership_type"]').val(); + var membership_type = $('input[data-fieldname="membership_type"]').val(); amount = { 'Gold': 300000, 'Silver': 100000, @@ -25,7 +25,7 @@ frappe.ready(function() { } if(frappe.utils.get_url_arg('name')) { - $('select[data-fieldname="membership_type"]').prop('disabled', true); + $('input[data-fieldname="membership_type"]').prop('disabled', true); $('input[data-fieldname="currency"]').prop('disabled', true); $('.page-content .btn-form-submit').addClass('hidden'); } else { @@ -34,7 +34,10 @@ frappe.ready(function() { form.from_date.set_input(from_date); form.to_date.set_input(to_date); - $('select[data-fieldname="membership_type"]').on('change', function() { set_amount(); }); + $('input[data-fieldname="membership_type"]').on('change', function() { + set_amount(); + }); + form.currency.set_input('INR'); set_amount(); } diff --git a/foundation/erpnext_foundation/web_form/memberships/memberships.json b/foundation/erpnext_foundation/web_form/memberships/memberships.json index cf14d27d..9271cf45 100644 --- a/foundation/erpnext_foundation/web_form/memberships/memberships.json +++ b/foundation/erpnext_foundation/web_form/memberships/memberships.json @@ -19,7 +19,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2018-01-08 15:53:09.381486", + "modified": "2018-09-20 10:39:21.832396", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "memberships", @@ -29,12 +29,14 @@ "payment_gateway": "Razorpay", "published": 1, "route": "memberships", + "show_in_grid": 0, "show_sidebar": 1, "sidebar_items": [], "success_url": "/memberships", "title": "Memberships", "web_form_fields": [ { + "allow_read_on_all_link_options": 1, "fieldname": "membership_type", "fieldtype": "Link", "hidden": 0, @@ -43,9 +45,11 @@ "max_value": 0, "options": "Membership Type", "read_only": 0, - "reqd": 1 + "reqd": 1, + "show_in_filter": 0 }, { + "allow_read_on_all_link_options": 0, "fieldname": "from_date", "fieldtype": "Date", "hidden": 0, @@ -53,9 +57,11 @@ "max_length": 0, "max_value": 0, "read_only": 1, - "reqd": 1 + "reqd": 1, + "show_in_filter": 0 }, { + "allow_read_on_all_link_options": 0, "fieldname": "to_date", "fieldtype": "Date", "hidden": 0, @@ -63,9 +69,11 @@ "max_length": 0, "max_value": 0, "read_only": 1, - "reqd": 1 + "reqd": 1, + "show_in_filter": 0 }, { + "allow_read_on_all_link_options": 0, "fieldname": "currency", "fieldtype": "Select", "hidden": 0, @@ -74,9 +82,11 @@ "max_value": 0, "options": "USD\nINR", "read_only": 1, - "reqd": 0 + "reqd": 0, + "show_in_filter": 0 }, { + "allow_read_on_all_link_options": 0, "fieldname": "amount", "fieldtype": "Float", "hidden": 0, @@ -84,7 +94,8 @@ "max_length": 0, "max_value": 0, "read_only": 1, - "reqd": 0 + "reqd": 0, + "show_in_filter": 0 } ] } \ No newline at end of file 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 1983f8c0..d8c3cc03 100644 --- a/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js +++ b/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.js @@ -7,7 +7,7 @@ frappe.ready(function() { $(".text-right .btn-primary").addClass('hidden'); var set_amount = function() { - var membership_type = $('select[data-fieldname="membership_type"]').val(); + var membership_type = $('input[data-fieldname="membership_type"]').val(); amount = { 'Gold': 5000, @@ -27,7 +27,7 @@ frappe.ready(function() { } if(frappe.utils.get_url_arg('name')) { - $('select[data-fieldname="membership_type"]').prop('disabled', true); + $('input[data-fieldname="membership_type"]').prop('disabled', true); $('input[data-fieldname="currency"]').prop('disabled', true); $('.page-content .btn-form-submit').addClass('hidden'); } else { @@ -36,10 +36,13 @@ frappe.ready(function() { form.from_date.set_input(from_date); form.to_date.set_input(to_date); - $('select[data-fieldname="membership_type"]').on('change', function() { set_amount(); }); + $('input[data-fieldname="membership_type"]').on('change', function() { + set_amount(); + }); + form.currency.set_input('USD'); set_amount(); } - + }, 1000); -}) \ No newline at end of file +}) diff --git a/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.json b/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.json index 555a84e5..f7b5ea50 100644 --- a/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.json +++ b/foundation/erpnext_foundation/web_form/memberships_usd/memberships_usd.json @@ -19,7 +19,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2018-01-08 15:53:23.345945", + "modified": "2018-09-20 10:40:21.617269", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "memberships-usd", @@ -29,12 +29,14 @@ "payment_gateway": "PayPal", "published": 1, "route": "memberships-usd", + "show_in_grid": 0, "show_sidebar": 1, "sidebar_items": [], "success_url": "/memberships", "title": "Memberships", "web_form_fields": [ { + "allow_read_on_all_link_options": 1, "fieldname": "membership_type", "fieldtype": "Link", "hidden": 0, @@ -43,9 +45,11 @@ "max_value": 0, "options": "Membership Type", "read_only": 0, - "reqd": 1 + "reqd": 1, + "show_in_filter": 0 }, { + "allow_read_on_all_link_options": 0, "fieldname": "from_date", "fieldtype": "Date", "hidden": 0, @@ -53,9 +57,11 @@ "max_length": 0, "max_value": 0, "read_only": 1, - "reqd": 1 + "reqd": 1, + "show_in_filter": 0 }, { + "allow_read_on_all_link_options": 0, "fieldname": "to_date", "fieldtype": "Date", "hidden": 0, @@ -63,9 +69,11 @@ "max_length": 0, "max_value": 0, "read_only": 1, - "reqd": 1 + "reqd": 1, + "show_in_filter": 0 }, { + "allow_read_on_all_link_options": 0, "fieldname": "currency", "fieldtype": "Select", "hidden": 0, @@ -74,9 +82,11 @@ "max_value": 0, "options": "USD\nINR", "read_only": 1, - "reqd": 0 + "reqd": 0, + "show_in_filter": 0 }, { + "allow_read_on_all_link_options": 0, "fieldname": "amount", "fieldtype": "Float", "hidden": 0, @@ -84,7 +94,8 @@ "max_length": 0, "max_value": 0, "read_only": 1, - "reqd": 0 + "reqd": 0, + "show_in_filter": 0 } ] } \ No newline at end of file