From adb4404d183e0350a8e92fb7828dceef26906c40 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 7 Jul 2017 11:55:12 +0530 Subject: [PATCH] email alert and conference setting payment gateways --- .../conference_participant.json | 92 ++++++++++++------- .../email_alert/__init__.py | 0 .../conference_registration/__init__.py | 0 .../conference_registration.json | 28 ++++++ .../conference_registration.md | 1 + .../conference_registration.py | 7 ++ .../buy_tickets_inr/buy_tickets_inr.json | 6 +- .../buy_tickets_paypal.json | 6 +- foundation/public/css/style.css | 4 + 9 files changed, 107 insertions(+), 37 deletions(-) create mode 100644 foundation/erpnext_foundation/email_alert/__init__.py create mode 100644 foundation/erpnext_foundation/email_alert/conference_registration/__init__.py create mode 100644 foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json create mode 100644 foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.md create mode 100644 foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.py diff --git a/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.json b/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.json index 3e31293a..7dfbfcb8 100644 --- a/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.json +++ b/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.json @@ -102,36 +102,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 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, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -192,6 +162,66 @@ "search_index": 0, "set_only_once": 0, "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 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, + "unique": 0 + }, + { + "allow_bulk_edit": 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, + "unique": 0 } ], "has_web_view": 0, @@ -204,7 +234,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-07-06 16:20:50.952884", + "modified": "2017-07-07 11:36:26.163646", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "Conference Participant", diff --git a/foundation/erpnext_foundation/email_alert/__init__.py b/foundation/erpnext_foundation/email_alert/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/erpnext_foundation/email_alert/conference_registration/__init__.py b/foundation/erpnext_foundation/email_alert/conference_registration/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json b/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json new file mode 100644 index 00000000..cd4287b8 --- /dev/null +++ b/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.json @@ -0,0 +1,28 @@ +{ + "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": "Email Alert", + "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: {{ full_conference_tickets or 0 }}\n
\nUser Conference Tickets: {{ 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 11:54:20.782039", + "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/email_alert/conference_registration/conference_registration.md b/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.md new file mode 100644 index 00000000..95b4ba7c --- /dev/null +++ b/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.md @@ -0,0 +1 @@ +Add your message here \ No newline at end of file diff --git a/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.py b/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.py new file mode 100644 index 00000000..2334f8b2 --- /dev/null +++ b/foundation/erpnext_foundation/email_alert/conference_registration/conference_registration.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/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 b1d83fb4..701c8821 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 @@ -19,18 +19,18 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2017-07-06 16:25:22.393979", + "modified": "2017-07-07 11:06:02.141890", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "buy-tickets-inr", "owner": "Administrator", "payment_button_label": "Buy Now", - "payment_gateway": "", + "payment_gateway": "Razorpay", "published": 1, "route": "buy-tickets-inr", "show_sidebar": 1, "sidebar_items": [], - "success_url": "/buy-tickets-inr", + "success_url": "/conf/2017", "title": "Buy Tickets INR", "web_form_fields": [ { 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 5895cc98..b6480ebc 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 @@ -19,18 +19,18 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2017-07-06 16:24:38.015249", + "modified": "2017-07-07 11:06:27.726016", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "buy-tickets-paypal", "owner": "Administrator", "payment_button_label": "Buy Now", - "payment_gateway": "", + "payment_gateway": "PayPal", "published": 1, "route": "buy-tickets-paypal", "show_sidebar": 1, "sidebar_items": [], - "success_url": "/buy-tickets-paypal", + "success_url": "/conf/2017", "title": "Buy Tickets Paypal", "web_form_fields": [ { diff --git a/foundation/public/css/style.css b/foundation/public/css/style.css index 44e5b433..23d782e5 100644 --- a/foundation/public/css/style.css +++ b/foundation/public/css/style.css @@ -158,3 +158,7 @@ a:hover { font-size: 15px; /*color: #8D99A6;*/ } + +.full-name { + display: none; +} \ No newline at end of file