diff --git a/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.json b/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.json index 54f1ffa5..45b736dc 100644 --- a/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.json +++ b/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.json @@ -1,515 +1,142 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, "autoname": "E-CON-.YYYY.-.###", - "beta": 0, - "creation": "2017-07-06 16:20:28.662095", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", + "creation": "2017-07-06 16:20:28.662095", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "participant_details_section", + "participant_name", + "participant_designation", + "column_break_3", + "email", + "conference_details_section", + "conference", + "full_conference_tickets", + "user_conference_tickets", + "paid", + "column_break_10", + "tshirt_table", + "tshirt_size", + "currency", + "amount", + "thank_you_email_sent" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "participant_details_section", "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Participant Details", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "label": "Participant Details" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "participant_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Participant Name", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "participant_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Participant Name", + "reqd": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "column_break_3", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "fieldtype": "Column Break" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "", "fieldname": "email", "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, "label": "Email", - "length": 0, - "no_copy": 0, - "options": "User", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "options": "Email" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "conference_details_section", "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Conference Details", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "label": "Conference Details" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "", - "fieldname": "conference", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Conference", - "length": 0, - "no_copy": 0, - "options": "\n2017\n2018", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "conference", + "fieldtype": "Select", + "label": "Conference", + "options": "\n2017\n2018\n2019" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "full_conference_tickets", - "fieldtype": "Int", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Full Conference Tickets", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "full_conference_tickets", + "fieldtype": "Int", + "label": "Full Conference Tickets" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "user_conference_tickets", - "fieldtype": "Int", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "User Conference Tickets", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldname": "user_conference_tickets", + "fieldtype": "Int", + "label": "User Conference Tickets" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, + "default": "0", "fieldname": "paid", "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Paid", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "label": "Paid" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "column_break_10", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "fieldtype": "Column Break" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "tshirt_size", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, + "fieldtype": "Select", "label": "T-Shirt Size", - "length": 0, - "no_copy": 0, - "options": "S\nM\nL\nXL\nXXL\nXXXL", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "options": "S\nM\nL\nXL\nXXL\nXXXL" + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "currency", "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, + "in_list_view": 1, "label": "Currency", - "length": 0, - "no_copy": 0, "options": "USD\nINR", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "reqd": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "amount", "fieldtype": "Currency", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, "in_list_view": 1, - "in_standard_filter": 0, "label": "Amount", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, + "reqd": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "thank_you_email_sent", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Thank You Email Sent", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "default": "0", + "fieldname": "thank_you_email_sent", + "fieldtype": "Check", + "label": "Thank You Email Sent" + }, + { + "fieldname": "tshirt_table", + "fieldtype": "Table", + "label": "T-Shirt Sizes", + "options": "TShirt Sizes" + }, + { + "fieldname": "participant_designation", + "fieldtype": "Select", + "label": "Participant Designation", + "options": "\nCxO\nAnalyst\nConsultant\nDeveloper\nSystem Administrator\nOther" } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-10-02 12:44:37.868959", - "modified_by": "Administrator", - "module": "ERPNext Foundation", - "name": "Conference Participant", - "name_case": "", - "owner": "Administrator", + ], + "modified": "2019-08-02 19:07:44.339770", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "Conference Participant", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, "write": 1 } - ], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 + ], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 } \ No newline at end of file diff --git a/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py b/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py index 3e96ed0c..b8f99278 100644 --- a/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py +++ b/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py @@ -8,13 +8,11 @@ from frappe.model.document import Document class ConferenceParticipant(Document): def validate(self): - self.conference = '2018' - if self.owner not in ["Guest", "Administrator"] and not self.get("email"): - self.email = frappe.db.get_value('User', self.owner, "email") + self.conference = '2019' def validate_payment(self): - self.amount = self.full_conference_tickets * (4000 if self.currency == 'INR' else 60) + self.amount = self.full_conference_tickets * (5000 if self.currency == 'INR' else 70) def on_payment_authorized(self, status_changed_to=None): self.paid = 1 - self.save(ignore_permissions=True) + self.save(ignore_permissions=True) \ No newline at end of file diff --git a/foundation/erpnext_foundation/notification/conference_registration/__init__.py b/foundation/erpnext_foundation/doctype/conference_request/__init__.py similarity index 100% rename from foundation/erpnext_foundation/notification/conference_registration/__init__.py rename to foundation/erpnext_foundation/doctype/conference_request/__init__.py diff --git a/foundation/erpnext_foundation/doctype/conference_request/conference_request.js b/foundation/erpnext_foundation/doctype/conference_request/conference_request.js new file mode 100644 index 00000000..9d882c15 --- /dev/null +++ b/foundation/erpnext_foundation/doctype/conference_request/conference_request.js @@ -0,0 +1,8 @@ +// Copyright (c) 2019, EOSSF and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Conference Request', { + // refresh: function(frm) { + + // } +}); diff --git a/foundation/erpnext_foundation/doctype/conference_request/conference_request.json b/foundation/erpnext_foundation/doctype/conference_request/conference_request.json new file mode 100644 index 00000000..87a60778 --- /dev/null +++ b/foundation/erpnext_foundation/doctype/conference_request/conference_request.json @@ -0,0 +1,70 @@ +{ + "creation": "2019-08-02 20:23:43.195486", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "contact_name", + "contact_number", + "email", + "organization_name", + "request_type", + "message" + ], + "fields": [ + { + "fieldname": "contact_name", + "fieldtype": "Data", + "label": "Contact Name" + }, + { + "fieldname": "email", + "fieldtype": "Data", + "label": "Email", + "options": "Email" + }, + { + "fieldname": "contact_number", + "fieldtype": "Data", + "label": "Contact Number" + }, + { + "fieldname": "organization_name", + "fieldtype": "Data", + "label": "Organization Name" + }, + { + "fieldname": "request_type", + "fieldtype": "Select", + "label": "Request Type", + "options": "Sponsorship\nExhibit Program" + }, + { + "fieldname": "message", + "fieldtype": "Text Editor", + "label": "Message" + } + ], + "modified": "2019-08-02 20:26:28.760374", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "Conference Request", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/foundation/erpnext_foundation/doctype/conference_request/conference_request.py b/foundation/erpnext_foundation/doctype/conference_request/conference_request.py new file mode 100644 index 00000000..741b8085 --- /dev/null +++ b/foundation/erpnext_foundation/doctype/conference_request/conference_request.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, EOSSF and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class ConferenceRequest(Document): + pass diff --git a/foundation/erpnext_foundation/doctype/conference_request/test_conference_request.py b/foundation/erpnext_foundation/doctype/conference_request/test_conference_request.py new file mode 100644 index 00000000..bed08ebd --- /dev/null +++ b/foundation/erpnext_foundation/doctype/conference_request/test_conference_request.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, EOSSF and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestConferenceRequest(unittest.TestCase): + pass diff --git a/foundation/erpnext_foundation/doctype/tshirt_sizes/__init__.py b/foundation/erpnext_foundation/doctype/tshirt_sizes/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/erpnext_foundation/doctype/tshirt_sizes/tshirt_sizes.json b/foundation/erpnext_foundation/doctype/tshirt_sizes/tshirt_sizes.json new file mode 100644 index 00000000..c204aeda --- /dev/null +++ b/foundation/erpnext_foundation/doctype/tshirt_sizes/tshirt_sizes.json @@ -0,0 +1,38 @@ +{ + "creation": "2019-08-02 10:28:32.354345", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "size", + "quantity" + ], + "fields": [ + { + "fieldname": "size", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Size", + "options": "S\nM\nL\nXL\nXXL\nXXXL", + "reqd": 1 + }, + { + "fieldname": "quantity", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Quantity", + "reqd": 1 + } + ], + "istable": 1, + "modified": "2019-08-02 10:29:40.258477", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "TShirt Sizes", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/foundation/erpnext_foundation/doctype/tshirt_sizes/tshirt_sizes.py b/foundation/erpnext_foundation/doctype/tshirt_sizes/tshirt_sizes.py new file mode 100644 index 00000000..7f898794 --- /dev/null +++ b/foundation/erpnext_foundation/doctype/tshirt_sizes/tshirt_sizes.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, EOSSF and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class TShirtSizes(Document): + pass diff --git a/foundation/erpnext_foundation/notification/conference_registration/conference_registration.json b/foundation/erpnext_foundation/notification/conference_registration/conference_registration.json deleted file mode 100644 index 7ab06050..00000000 --- a/foundation/erpnext_foundation/notification/conference_registration/conference_registration.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "attach_print": 0, - "condition": "doc.paid and doc.amount and not doc.thank_you_email_sent", - "creation": "2017-07-07 11:29:54.935820", - "days_in_advance": 0, - "docstatus": 0, - "doctype": "Notification", - "channnel": "Email", - "document_type": "Conference Participant", - "enabled": 1, - "event": "Save", - "idx": 0, - "is_standard": 1, - "message": "Dear {{ doc.conference_participant }},

\n\n

Thank you for registering for the 2017 Conference!

\n\n

Here are your ticket details:

\n\n

\nFull Conference Tickets: {{ doc.full_conference_tickets or 0 }}\n
\nUser Conference Tickets: {{ doc.user_conference_tickets or 0 }}\n

\n\n

Total Amount Paid: {{ doc.get_formatted('amount') }}

\n\n

If you need any help, please email us at foundation@erpnext.com

", - "modified": "2017-07-07 16:06:47.764297", - "modified_by": "Administrator", - "module": "ERPNext Foundation", - "name": "Conference Registration", - "owner": "Administrator", - "property_value": "1", - "recipients": [ - { - "cc": "team@erpnext.com", - "email_by_document_field": "owner" - } - ], - "set_property_after_alert": "thank_you_email_sent", - "subject": "Thank you for Registering for the Conference" -} \ No newline at end of file diff --git a/foundation/erpnext_foundation/notification/conference_ticket_confirmation/__init__.py b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.json b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.json new file mode 100644 index 00000000..326da62b --- /dev/null +++ b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.json @@ -0,0 +1,30 @@ +{ + "attach_print": 1, + "channel": "Email", + "condition": "doc.paid and doc.amount and not doc.thank_you_email_sent", + "creation": "2019-08-02 21:12:16.938267", + "days_in_advance": 0, + "docstatus": 0, + "doctype": "Notification", + "document_type": "Conference Participant", + "enabled": 1, + "event": "Save", + "idx": 0, + "is_standard": 1, + "message": "

Dear {{ doc.participant_name }},

\n\n

Thank you for registering for the 2019 ERPNext Conference!

\n\n

Here are your ticket details:

\n\n

Ticket Number {{ doc.name}}

\n\n\n\t\n\t\t\n\t\t\n\t\t\n\t\n\t\n\t\t\n\t\t\n\t\t\n\t\n
Ticket TypeQtyRate
Conference Tickets + Lunch + Dinner{{ doc.full_conference_tickets or 0 }}{% if doc.currency==\"INR\" %}5000{% else %}70{% endif %}
\n\n
Total Amount: {{ doc.currency }} {{ doc.get_formatted('amount') }}
\n\n\n

If you need any help, please email us at foundation@erpnext.com

", + "modified": "2019-08-02 21:12:20.926229", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "Conference Ticket Confirmation", + "owner": "Administrator", + "print_format": "Conference Ticket", + "property_value": "1", + "recipients": [ + { + "cc": "team@erpnext.com", + "email_by_document_field": "owner" + } + ], + "set_property_after_alert": "thank_you_email_sent", + "subject": "Thank you for Registering for the Conference" +} \ No newline at end of file diff --git a/foundation/erpnext_foundation/notification/conference_registration/conference_registration.html b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.md similarity index 83% rename from foundation/erpnext_foundation/notification/conference_registration/conference_registration.html rename to foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.md index a529bbb7..1907d1ea 100644 --- a/foundation/erpnext_foundation/notification/conference_registration/conference_registration.html +++ b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.md @@ -1,6 +1,6 @@

Dear {{ doc.participant_name }},

-

Thank you for registering for the 2018 ERPNext Conference!

+

Thank you for registering for the 2019 ERPNext Conference!

Here are your ticket details:

@@ -15,7 +15,7 @@ Conference Tickets + Lunch + Dinner {{ doc.full_conference_tickets or 0 }} - {% if doc.currency=="INR" %}4000{% else %}60{% endif %} + {% if doc.currency=="INR" %}5000{% else %}70{% endif %} diff --git a/foundation/erpnext_foundation/notification/conference_registration/conference_registration.py b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.py similarity index 100% rename from foundation/erpnext_foundation/notification/conference_registration/conference_registration.py rename to foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.py diff --git a/foundation/erpnext_foundation/print_format/__init__.py b/foundation/erpnext_foundation/print_format/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/erpnext_foundation/print_format/conference_ticket/__init__.py b/foundation/erpnext_foundation/print_format/conference_ticket/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/erpnext_foundation/print_format/conference_ticket/conference_ticket.json b/foundation/erpnext_foundation/print_format/conference_ticket/conference_ticket.json new file mode 100644 index 00000000..7b4411e4 --- /dev/null +++ b/foundation/erpnext_foundation/print_format/conference_ticket/conference_ticket.json @@ -0,0 +1,24 @@ +{ + "align_labels_right": 1, + "creation": "2019-08-02 18:45:55.172830", + "custom_format": 0, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Conference Participant", + "docstatus": 0, + "doctype": "Print Format", + "font": "Default", + "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"
\\t\\t\\t\\t

ERPNext Conference {{ doc.conference }}
{{ doc.name }}\\t\\t\\t\\t

\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Participant Details\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"participant_name\", \"align\": \"left\", \"label\": \"Name\"}, {\"print_hide\": 0, \"fieldname\": \"email\", \"label\": \"Email\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"paid\", \"align\": \"left\", \"label\": \"Paid\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Conference Details\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"full_conference_tickets\", \"align\": \"left\", \"label\": \"Number of Tickets\"}, {\"print_hide\": 0, \"fieldname\": \"conference\", \"label\": \"Conference\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"tshirt_size\", \"label\": \"T-Shirt Size\"}, {\"print_hide\": 0, \"fieldname\": \"currency\", \"label\": \"Currency\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"align\": \"left\", \"label\": \"Amount\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"size\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"quantity\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"tshirt_table\", \"label\": \"T-Shirt Sizes\"}]", + "idx": 0, + "line_breaks": 1, + "modified": "2019-08-02 18:57:14.603108", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "Conference Ticket", + "owner": "Administrator", + "print_format_builder": 0, + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 1, + "standard": "Yes" +} \ No newline at end of file diff --git a/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.js b/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.js index 5c0d8fce..c260e4d6 100644 --- a/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.js +++ b/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.js @@ -1,17 +1,41 @@ frappe.ready(function() { // bind events here frappe._calculate = function() { - frappe.web_form.field_group.set_value('amount', - parseInt(frappe.web_form.field_group.get_value('full_conference_tickets') || 0) * 4000 + frappe.web_form.set_value('amount', + parseInt(frappe.web_form.get_value('full_conference_tickets') || 0) * 5000 ) }; - setTimeout(() => { + $('.btn-form-submit').hide(); + + frappe.web_form.events.on('after_load', () => { + frappe.web_form.set_df_property('tshirt_table', 'hidden', 1); $('input[data-fieldname="full_conference_tickets"]').on('keyup', function() { frappe._calculate(); + let value = frappe.web_form.get_value('full_conference_tickets') + console.log(value) + if (value > 1) { + frappe.web_form.set_df_property('tshirt_table', 'hidden', 0); + frappe.web_form.set_df_property('tshirt_size', 'hidden', 1); + } else { + frappe.web_form.set_df_property('tshirt_table', 'hidden', 1); + frappe.web_form.set_df_property('tshirt_size', 'hidden', 0); + + } }); frappe._calculate(); - }, 1000); + }) - $('.btn-form-submit').hide(); + frappe.web_form.validate = () => { + let tickets = frappe.web_form.get_value('full_conference_tickets'); + if (tickets > 1) { + tshirts = frappe.web_form.fields_dict.tshirt_table.get_value(); + total_tees = tshirts.reduce(function (acc, obj) { return acc + obj.quantity; }, 0); + if (total_tees > tickets) { + frappe.throw(`You can only choose ${tickets} T-Shirts.`) + } else if (total_tees < tickets) { + frappe.throw(`You have selected sizes for only ${total_tees} T-Shirts, you can choose ${tickets - total_tees} more`) + } + } + } }) \ No newline at end of file diff --git a/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.json b/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.json index aedd11a9..045f4160 100644 --- a/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.json +++ b/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.json @@ -1,102 +1,145 @@ { - "accept_payment": 1, - "allow_comments": 0, - "allow_delete": 0, - "allow_edit": 0, - "allow_incomplete": 0, - "allow_multiple": 1, - "allow_print": 1, - "amount": 0.0, - "amount_based_on_field": 1, - "amount_field": "amount", - "creation": "2017-07-06 16:25:22.393979", - "currency": "INR", - "doc_type": "Conference Participant", - "docstatus": 0, - "doctype": "Web Form", - "idx": 0, - "introduction_text": "", - "is_standard": 1, - "login_required": 1, - "max_attachment_size": 0, - "modified": "2018-10-25 11:55:10.928574", - "modified_by": "Administrator", - "module": "ERPNext Foundation", - "name": "buy-tickets-inr", - "owner": "Administrator", - "payment_button_label": "Buy Now", - "payment_gateway": "Razorpay", - "published": 0, - "route": "buy-tickets-inr", - "show_in_grid": 0, - "show_sidebar": 0, - "sidebar_items": [], - "success_url": "/conf/2017", - "title": "Buy Tickets INR", + "accept_payment": 1, + "allow_comments": 0, + "allow_delete": 0, + "allow_edit": 0, + "allow_incomplete": 0, + "allow_multiple": 1, + "allow_print": 1, + "amount": 0.0, + "amount_based_on_field": 1, + "amount_field": "amount", + "client_script": "", + "creation": "2017-07-06 16:25:22.393979", + "currency": "INR", + "doc_type": "Conference Participant", + "docstatus": 0, + "doctype": "Web Form", + "idx": 0, + "introduction_text": "", + "is_standard": 1, + "login_required": 0, + "max_attachment_size": 0, + "modified": "2019-08-02 20:42:18.541094", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "buy-tickets-inr", + "owner": "Administrator", + "payment_button_label": "Buy Now", + "payment_gateway": "Razorpay", + "published": 1, + "route": "buy-tickets-inr", + "route_to_success_link": 0, + "show_attachments": 0, + "show_in_grid": 0, + "show_sidebar": 0, + "sidebar_items": [], + "success_url": "/conf/2017", + "title": "Buy Tickets INR", "web_form_fields": [ { - "allow_read_on_all_link_options": 0, - "fieldname": "participant_name", - "fieldtype": "Data", - "hidden": 0, - "label": "Participant Name", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 1, + "allow_read_on_all_link_options": 0, + "fieldname": "participant_name", + "fieldtype": "Data", + "hidden": 0, + "label": "Participant Name", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 1, "show_in_filter": 0 - }, + }, { - "allow_read_on_all_link_options": 0, - "description": "Rs 4000 per person. Includes lunch and dinner on both days", - "fieldname": "full_conference_tickets", - "fieldtype": "Int", - "hidden": 0, - "label": "No of Tickets", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 0, + "allow_read_on_all_link_options": 0, + "fieldname": "participant_designation", + "fieldtype": "Select", + "hidden": 0, + "label": "Your role at your organization", + "max_length": 0, + "max_value": 0, + "options": "\nCxO\nAnalyst\nConsultant\nDeveloper\nSystem Administrator\nOther", + "read_only": 0, + "reqd": 0, "show_in_filter": 0 - }, + }, { - "allow_read_on_all_link_options": 0, - "fieldname": "tshirt_size", - "fieldtype": "Select", - "hidden": 0, - "label": "T-Shirt Size", - "max_length": 0, - "max_value": 0, - "options": "S\nM\nL\nXL\nXXL\nXXXL", - "read_only": 0, - "reqd": 0, + "allow_read_on_all_link_options": 0, + "default": "", + "fieldname": "email", + "fieldtype": "Data", + "hidden": 0, + "label": "Email", + "max_length": 0, + "max_value": 0, + "options": "Email", + "read_only": 0, + "reqd": 0, "show_in_filter": 0 - }, + }, { - "allow_read_on_all_link_options": 0, - "default": "INR", - "fieldname": "currency", - "fieldtype": "Select", - "hidden": 0, - "label": "Currency", - "max_length": 0, - "max_value": 0, - "options": "INR", - "read_only": 1, - "reqd": 1, + "allow_read_on_all_link_options": 0, + "description": "\u20b9 5000 per person. Includes lunch and dinner on both days", + "fieldname": "full_conference_tickets", + "fieldtype": "Int", + "hidden": 0, + "label": "No of Tickets", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, "show_in_filter": 0 - }, + }, { - "allow_read_on_all_link_options": 0, - "fieldname": "amount", - "fieldtype": "Data", - "hidden": 0, - "label": "Amount", - "max_length": 0, - "max_value": 0, - "read_only": 1, - "reqd": 1, + "allow_read_on_all_link_options": 0, + "fieldname": "tshirt_table", + "fieldtype": "Table", + "hidden": 0, + "label": "T-Shirt Sizes", + "max_length": 0, + "max_value": 0, + "options": "TShirt Sizes", + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "tshirt_size", + "fieldtype": "Select", + "hidden": 0, + "label": "T-Shirt Size", + "max_length": 0, + "max_value": 0, + "options": "S\nM\nL\nXL\nXXL\nXXXL", + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "default": "INR", + "fieldname": "currency", + "fieldtype": "Select", + "hidden": 0, + "label": "Currency", + "max_length": 0, + "max_value": 0, + "options": "INR", + "read_only": 1, + "reqd": 1, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "amount", + "fieldtype": "Data", + "hidden": 0, + "label": "Amount", + "max_length": 0, + "max_value": 0, + "read_only": 1, + "reqd": 1, "show_in_filter": 0 } ] -} +} \ No newline at end of file diff --git a/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.js b/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.js index 509dce75..554af93a 100644 --- a/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.js +++ b/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.js @@ -1,17 +1,41 @@ frappe.ready(function() { // bind events here frappe._calculate = function() { - frappe.web_form.field_group.set_value('amount', - parseInt(frappe.web_form.field_group.get_value('full_conference_tickets') || 0) * 60 + frappe.web_form.set_value('amount', + parseInt(frappe.web_form.get_value('full_conference_tickets') || 0) * 70 ) }; - setTimeout(() => { + $('.btn-form-submit').hide(); + + frappe.web_form.events.on('after_load', () => { + frappe.web_form.set_df_property('tshirt_table', 'hidden', 1); $('input[data-fieldname="full_conference_tickets"]').on('keyup', function() { frappe._calculate(); + let value = frappe.web_form.get_value('full_conference_tickets') + console.log(value) + if (value > 1) { + frappe.web_form.set_df_property('tshirt_table', 'hidden', 0); + frappe.web_form.set_df_property('tshirt_size', 'hidden', 1); + } else { + frappe.web_form.set_df_property('tshirt_table', 'hidden', 1); + frappe.web_form.set_df_property('tshirt_size', 'hidden', 0); + + } }); frappe._calculate(); - }, 1000); + }) - $('.btn-form-submit').hide(); + frappe.web_form.validate = () => { + let tickets = frappe.web_form.get_value('full_conference_tickets'); + if (tickets > 1) { + tshirts = frappe.web_form.fields_dict.tshirt_table.get_value(); + total_tees = tshirts.reduce(function (acc, obj) { return acc + obj.quantity; }, 0); + if (total_tees > tickets) { + frappe.throw(`You can only choose ${tickets} T-Shirts.`) + } else if (total_tees < tickets) { + frappe.throw(`You have selected sizes for only ${total_tees} T-Shirts, you can choose ${tickets - total_tees} more`) + } + } + } }) \ No newline at end of file diff --git a/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.json b/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.json index ab9c06e6..3f90712a 100644 --- a/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.json +++ b/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.json @@ -1,108 +1,150 @@ { - "accept_payment": 1, - "allow_comments": 0, - "allow_delete": 0, - "allow_edit": 0, - "allow_incomplete": 0, - "allow_multiple": 1, - "allow_print": 1, - "amount": 0.0, - "amount_based_on_field": 1, - "amount_field": "amount", - "creation": "2017-07-06 16:22:37.464680", - "currency": "USD", - "doc_type": "Conference Participant", - "docstatus": 0, - "doctype": "Web Form", - "idx": 0, - "introduction_text": "", - "is_standard": 1, - "login_required": 1, - "max_attachment_size": 0, - "modified": "2018-10-25 11:56:03.656894", - "modified_by": "Administrator", - "module": "ERPNext Foundation", - "name": "buy-tickets-paypal", - "owner": "Administrator", - "payment_button_label": "Buy Now", - "payment_gateway": "PayPal", - "published": 0, - "route": "buy-tickets-paypal", - "show_in_grid": 0, - "show_sidebar": 0, + "accept_payment": 1, + "allow_comments": 0, + "allow_delete": 0, + "allow_edit": 0, + "allow_incomplete": 0, + "allow_multiple": 1, + "allow_print": 1, + "amount": 0.0, + "amount_based_on_field": 1, + "amount_field": "amount", + "creation": "2017-07-06 16:22:37.464680", + "currency": "USD", + "doc_type": "Conference Participant", + "docstatus": 0, + "doctype": "Web Form", + "idx": 0, + "introduction_text": "", + "is_standard": 1, + "login_required": 0, + "max_attachment_size": 0, + "modified": "2019-08-02 20:43:12.676233", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "buy-tickets-paypal", + "owner": "Administrator", + "payment_button_label": "Buy Now", + "payment_gateway": "PayPal", + "published": 1, + "route": "buy-tickets-paypal", + "route_to_success_link": 0, + "show_attachments": 0, + "show_in_grid": 0, + "show_sidebar": 0, "sidebar_items": [ { - "enabled": 1, - "route": "/buy-tickets-paypal", + "enabled": 1, + "route": "/buy-tickets-paypal", "title": "My Tickets" } - ], - "success_url": "/conf/2017", - "title": "Buy Tickets Paypal", + ], + "success_url": "/conf/2017", + "title": "Buy Tickets Paypal", "web_form_fields": [ { - "allow_read_on_all_link_options": 0, - "fieldname": "participant_name", - "fieldtype": "Data", - "hidden": 0, - "label": "Participant Name", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 1, + "allow_read_on_all_link_options": 0, + "fieldname": "participant_name", + "fieldtype": "Data", + "hidden": 0, + "label": "Participant Name", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 1, "show_in_filter": 0 - }, + }, { - "allow_read_on_all_link_options": 0, - "description": "$60 per person. Includes lunch and dinner on both days", - "fieldname": "full_conference_tickets", - "fieldtype": "Int", - "hidden": 0, - "label": "No of Tickets", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 0, + "allow_read_on_all_link_options": 0, + "fieldname": "participant_designation", + "fieldtype": "Select", + "hidden": 0, + "label": "Your role at your organization", + "max_length": 0, + "max_value": 0, + "options": "\nCxO\nAnalyst\nConsultant\nDeveloper\nSystem Administrator\nOther", + "read_only": 0, + "reqd": 0, "show_in_filter": 0 - }, + }, { - "allow_read_on_all_link_options": 0, - "fieldname": "tshirt_size", - "fieldtype": "Select", - "hidden": 0, - "label": "T-Shirt Size", - "max_length": 0, - "max_value": 0, - "options": "S\nM\nL\nXL\nXXL\nXXXL", - "read_only": 0, - "reqd": 0, + "allow_read_on_all_link_options": 0, + "default": "", + "fieldname": "email", + "fieldtype": "Data", + "hidden": 0, + "label": "Email", + "max_length": 0, + "max_value": 0, + "options": "Email", + "read_only": 0, + "reqd": 0, "show_in_filter": 0 - }, + }, { - "allow_read_on_all_link_options": 0, - "default": "USD", - "fieldname": "currency", - "fieldtype": "Select", - "hidden": 0, - "label": "Currency", - "max_length": 0, - "max_value": 0, - "options": "USD\nINR", - "read_only": 1, - "reqd": 1, + "allow_read_on_all_link_options": 0, + "description": "$70 per person. Includes lunch and dinner on both days", + "fieldname": "full_conference_tickets", + "fieldtype": "Int", + "hidden": 0, + "label": "No of Tickets", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, "show_in_filter": 0 - }, + }, { - "allow_read_on_all_link_options": 0, - "fieldname": "amount", - "fieldtype": "Data", - "hidden": 0, - "label": "Amount", - "max_length": 0, - "max_value": 0, - "read_only": 1, - "reqd": 1, + "allow_read_on_all_link_options": 0, + "fieldname": "tshirt_table", + "fieldtype": "Table", + "hidden": 0, + "label": "T-Shirt Sizes", + "max_length": 0, + "max_value": 0, + "options": "TShirt Sizes", + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "tshirt_size", + "fieldtype": "Select", + "hidden": 0, + "label": "T-Shirt Size", + "max_length": 0, + "max_value": 0, + "options": "S\nM\nL\nXL\nXXL\nXXXL", + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "default": "USD", + "fieldname": "currency", + "fieldtype": "Select", + "hidden": 0, + "label": "Currency", + "max_length": 0, + "max_value": 0, + "options": "USD\nINR", + "read_only": 1, + "reqd": 1, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "amount", + "fieldtype": "Data", + "hidden": 0, + "label": "Amount", + "max_length": 0, + "max_value": 0, + "read_only": 1, + "reqd": 1, "show_in_filter": 0 } ] -} +} \ No newline at end of file diff --git a/foundation/erpnext_foundation/web_form/request_a_call/__init__.py b/foundation/erpnext_foundation/web_form/request_a_call/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.js b/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.js new file mode 100644 index 00000000..699703c5 --- /dev/null +++ b/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.js @@ -0,0 +1,3 @@ +frappe.ready(function() { + // bind events here +}) \ No newline at end of file diff --git a/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.json b/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.json new file mode 100644 index 00000000..4e2f0c4e --- /dev/null +++ b/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.json @@ -0,0 +1,112 @@ +{ + "accept_payment": 0, + "allow_comments": 0, + "allow_delete": 0, + "allow_edit": 0, + "allow_incomplete": 0, + "allow_multiple": 0, + "allow_print": 0, + "amount": 0.0, + "amount_based_on_field": 0, + "button_label": "Save", + "creation": "2019-08-02 20:24:57.913609", + "doc_type": "Conference Request", + "docstatus": 0, + "doctype": "Web Form", + "idx": 0, + "is_standard": 1, + "login_required": 0, + "max_attachment_size": 0, + "modified": "2019-08-02 20:27:05.106516", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "request-a-call", + "owner": "Administrator", + "payment_button_label": "Buy Now", + "published": 1, + "route": "request-a-call", + "route_to_success_link": 0, + "show_attachments": 0, + "show_in_grid": 0, + "show_sidebar": 0, + "sidebar_items": [], + "success_url": "/request-a-call", + "title": "Request a Call", + "web_form_fields": [ + { + "allow_read_on_all_link_options": 0, + "fieldname": "contact_name", + "fieldtype": "Data", + "hidden": 0, + "label": "Contact Name", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 1, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "contact_number", + "fieldtype": "Data", + "hidden": 0, + "label": "Contact Number", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "email", + "fieldtype": "Data", + "hidden": 0, + "label": "Email", + "max_length": 0, + "max_value": 0, + "options": "Email", + "read_only": 0, + "reqd": 1, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "organization_name", + "fieldtype": "Data", + "hidden": 0, + "label": "Organization Name", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "default": "Sponsorship", + "fieldname": "request_type", + "fieldtype": "Select", + "hidden": 0, + "label": "Request Type", + "max_length": 0, + "max_value": 0, + "options": "Sponsorship\nExhibit Program", + "read_only": 0, + "reqd": 1, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "message", + "fieldtype": "Text Editor", + "hidden": 0, + "label": "Message", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + } + ] +} \ No newline at end of file diff --git a/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.py b/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.py new file mode 100644 index 00000000..2334f8b2 --- /dev/null +++ b/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +import frappe + +def get_context(context): + # do your magic here + pass diff --git a/foundation/hooks.py b/foundation/hooks.py index a58bf17e..cef02693 100644 --- a/foundation/hooks.py +++ b/foundation/hooks.py @@ -47,17 +47,17 @@ website_context = { {"label": "ERPNext", "child_items":[ {"label": "User Stories", "url": "/stories"}, {"label": "Get ERPNext", "url": "/get-started"}, - {"label": "User Manual", "url": "/docs/user"}, + {"label": "User Manual", "url": "https://erpnext.com/docs/user"}, {"label": "Free Trial", "url": "https://erpnext.com"}, {"label": "Open Source", "url": "/open-source"}, {"label": "Contribute", "url": "/contribute"}, - {"label": "Version 11", "url": "/releases/version-11"} + {"label": "Version 12", "url": "https://erpnext.com/version-12"} ], "right":1}, {"label": "Community", "child_items":[ {"label": "Forum", "url": "https://discuss.erpnext.com", "target": "target='_blank'"}, {"label": "Chapters", "url": "/chapter-list"}, {"label": "Fellows", "url": "/fellows"}, - {"label": "Conference 2018", "url": "/conf/2018"}, + {"label": "Conference 2019", "url": "/conf/2019"}, ], "right":1}, {"label": "Services", "child_items":[ {"label": "Member Listing", "url": "/service-providers"}, diff --git a/foundation/public/img/conf/sponsors/frappe-logo.png b/foundation/public/img/conf/sponsors/frappe-logo.png index 1ddd15e1..59945d41 100644 Binary files a/foundation/public/img/conf/sponsors/frappe-logo.png and b/foundation/public/img/conf/sponsors/frappe-logo.png differ diff --git a/foundation/public/img/illustrations/baton.png b/foundation/public/img/illustrations/baton.png new file mode 100644 index 00000000..3065dd7e Binary files /dev/null and b/foundation/public/img/illustrations/baton.png differ diff --git a/foundation/public/img/illustrations/build.png b/foundation/public/img/illustrations/build.png new file mode 100644 index 00000000..342d5d2d Binary files /dev/null and b/foundation/public/img/illustrations/build.png differ diff --git a/foundation/public/img/illustrations/enterprise-buildings.png b/foundation/public/img/illustrations/enterprise-buildings.png new file mode 100644 index 00000000..1824fdac Binary files /dev/null and b/foundation/public/img/illustrations/enterprise-buildings.png differ diff --git a/foundation/public/img/illustrations/group.png b/foundation/public/img/illustrations/group.png new file mode 100644 index 00000000..9b2688f1 Binary files /dev/null and b/foundation/public/img/illustrations/group.png differ diff --git a/foundation/public/img/illustrations/people-hand-shake.png b/foundation/public/img/illustrations/people-hand-shake.png new file mode 100644 index 00000000..011d69b0 Binary files /dev/null and b/foundation/public/img/illustrations/people-hand-shake.png differ diff --git a/foundation/public/img/illustrations/typing-on-a-computer.png b/foundation/public/img/illustrations/typing-on-a-computer.png new file mode 100644 index 00000000..9c18f31b Binary files /dev/null and b/foundation/public/img/illustrations/typing-on-a-computer.png differ diff --git a/foundation/public/img/meetups/chennai.jpg b/foundation/public/img/meetups/chennai.jpg new file mode 100644 index 00000000..4ca802ec Binary files /dev/null and b/foundation/public/img/meetups/chennai.jpg differ diff --git a/foundation/public/img/meetups/zurich.jpg b/foundation/public/img/meetups/zurich.jpg new file mode 100644 index 00000000..5455c8be Binary files /dev/null and b/foundation/public/img/meetups/zurich.jpg differ diff --git a/foundation/public/img/no-image.png b/foundation/public/img/no-image.png new file mode 100644 index 00000000..d6798746 Binary files /dev/null and b/foundation/public/img/no-image.png differ diff --git a/foundation/templates/includes/custom.css b/foundation/templates/includes/custom.css index d9b89910..95e594d9 100644 --- a/foundation/templates/includes/custom.css +++ b/foundation/templates/includes/custom.css @@ -12,4 +12,12 @@ body[data-path*="erpnext-jobs"] .breadcrumb { .embed-responsive { margin-bottom: 2rem; +} + +.splash { + display: none; +} + +.row-index .hidden-xs { + display: inline-block !important; } \ No newline at end of file diff --git a/foundation/templates/includes/footer/footer.html b/foundation/templates/includes/footer/footer.html index 7e51c9a5..1295a17f 100644 --- a/foundation/templates/includes/footer/footer.html +++ b/foundation/templates/includes/footer/footer.html @@ -60,7 +60,7 @@
Community