diff --git a/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py b/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py index 3ff30097..29fc8f94 100644 --- a/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py +++ b/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py @@ -12,7 +12,7 @@ class ConferenceParticipant(Document): self.conference = '2019' def validate_payment(self): - self.amount = self.full_conference_tickets * (5000 if self.currency == 'INR' else 80) + self.amount = self.full_conference_tickets * (6000 if self.currency == 'INR' else 90) def on_payment_authorized(self, status_changed_to=None): self.paid = 1 @@ -24,7 +24,7 @@ class ConferenceParticipant(Document): if not transaction: return naming_series = 'BC-19-20-' - rate = '5000' + rate = '6000' currency = 'INR' customer = 'ERPNext Conference 2019 Participant' item_income_account = 'Sales - Event Tickets - EF' @@ -48,7 +48,7 @@ class ConferenceParticipant(Document): if transaction.service == 'Paypal': naming_series = 'EXP-19-20-' - rate = '80' + rate = '90' currency = 'USD' account_type = 'Debtors USD - EF' customer = 'ERPNext Conference 2019 Participant International' 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 index 861f03f5..41ef1dd8 100644 --- a/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.json +++ b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.json @@ -11,7 +11,7 @@ "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 %}80{% 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

", + "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\" %}6000{% else %}80{% 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-22 07:01:42.934136", "modified_by": "Administrator", "module": "ERPNext Foundation", diff --git a/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.md b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.md index f7b768f9..79251e07 100644 --- a/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.md +++ b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.md @@ -15,7 +15,7 @@ Conference Tickets + Lunch + Dinner {{ doc.full_conference_tickets or 0 }} - {% if doc.currency=="INR" %}5000{% else %}80{% endif %} + {% if doc.currency=="INR" %}6000{% else %}90{% endif %} 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 c260e4d6..d0e58740 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 @@ -2,7 +2,7 @@ frappe.ready(function() { // bind events here frappe._calculate = function() { frappe.web_form.set_value('amount', - parseInt(frappe.web_form.get_value('full_conference_tickets') || 0) * 5000 + parseInt(frappe.web_form.get_value('full_conference_tickets') || 0) * 6000 ) }; 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 c9231d61..15ef518b 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 @@ -80,7 +80,7 @@ }, { "allow_read_on_all_link_options": 0, - "description": "\u20b9 5000 per person. Includes lunch and dinner on both days", + "description": "\u20b9 6000 per person. Includes lunch and dinner on both days", "fieldname": "full_conference_tickets", "fieldtype": "Int", "hidden": 0, 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 20477c76..cf9ef339 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 @@ -2,7 +2,7 @@ frappe.ready(function() { // bind events here frappe._calculate = function() { frappe.web_form.set_value('amount', - parseInt(frappe.web_form.get_value('full_conference_tickets') || 0) * 80 + parseInt(frappe.web_form.get_value('full_conference_tickets') || 0) * 90 ) }; 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 05bc806d..0a80eb64 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 @@ -84,7 +84,7 @@ }, { "allow_read_on_all_link_options": 0, - "description": "$80 per person. Includes lunch and dinner on both days", + "description": "$90 per person. Includes lunch and dinner on both days", "fieldname": "full_conference_tickets", "fieldtype": "Int", "hidden": 0,