Merge pull request #450 from scmmishra/surge

feat: updated pricing
This commit is contained in:
Shivam Mishra
2019-10-07 21:07:38 +05:30
committed by GitHub
7 changed files with 9 additions and 9 deletions

View File

@@ -12,7 +12,7 @@ class ConferenceParticipant(Document):
self.conference = '2019' self.conference = '2019'
def validate_payment(self): 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): def on_payment_authorized(self, status_changed_to=None):
self.paid = 1 self.paid = 1
@@ -24,7 +24,7 @@ class ConferenceParticipant(Document):
if not transaction: if not transaction:
return return
naming_series = 'BC-19-20-' naming_series = 'BC-19-20-'
rate = '5000' rate = '6000'
currency = 'INR' currency = 'INR'
customer = 'ERPNext Conference 2019 Participant' customer = 'ERPNext Conference 2019 Participant'
item_income_account = 'Sales - Event Tickets - EF' item_income_account = 'Sales - Event Tickets - EF'
@@ -48,7 +48,7 @@ class ConferenceParticipant(Document):
if transaction.service == 'Paypal': if transaction.service == 'Paypal':
naming_series = 'EXP-19-20-' naming_series = 'EXP-19-20-'
rate = '80' rate = '90'
currency = 'USD' currency = 'USD'
account_type = 'Debtors USD - EF' account_type = 'Debtors USD - EF'
customer = 'ERPNext Conference 2019 Participant International' customer = 'ERPNext Conference 2019 Participant International'

View File

@@ -11,7 +11,7 @@
"event": "Save", "event": "Save",
"idx": 0, "idx": 0,
"is_standard": 1, "is_standard": 1,
"message": "<p>Dear {{ doc.participant_name }},</p>\n\n<p>Thank you for registering for the 2019 ERPNext Conference!</p>\n\n<p>Here are your ticket details:</p>\n\n<h4>Ticket Number {{ doc.name}}</h4>\n\n<table class=\"table table-bordered\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\" style=\"padding: 30px 0px\">\n\t<tr>\n\t\t<th style='width: 50%'>Ticket Type</th>\n\t\t<th style='width: 25%'>Qty</th>\n\t\t<th style='width: 25%'>Rate</th>\n\t</tr>\n\t<tr>\n\t\t<td>Conference Tickets + Lunch + Dinner</td>\n\t\t<td>{{ doc.full_conference_tickets or 0 }}</td>\n\t\t<td>{% if doc.currency==\"INR\" %}5000{% else %}80{% endif %}</td>\n\t</tr>\n</table>\n\n<h5>Total Amount: {{ doc.currency }} {{ doc.get_formatted('amount') }}</h5>\n\n\n<p>If you need any help, please email us at foundation@erpnext.com</p>", "message": "<p>Dear {{ doc.participant_name }},</p>\n\n<p>Thank you for registering for the 2019 ERPNext Conference!</p>\n\n<p>Here are your ticket details:</p>\n\n<h4>Ticket Number {{ doc.name}}</h4>\n\n<table class=\"table table-bordered\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\" style=\"padding: 30px 0px\">\n\t<tr>\n\t\t<th style='width: 50%'>Ticket Type</th>\n\t\t<th style='width: 25%'>Qty</th>\n\t\t<th style='width: 25%'>Rate</th>\n\t</tr>\n\t<tr>\n\t\t<td>Conference Tickets + Lunch + Dinner</td>\n\t\t<td>{{ doc.full_conference_tickets or 0 }}</td>\n\t\t<td>{% if doc.currency==\"INR\" %}6000{% else %}80{% endif %}</td>\n\t</tr>\n</table>\n\n<h5>Total Amount: {{ doc.currency }} {{ doc.get_formatted('amount') }}</h5>\n\n\n<p>If you need any help, please email us at foundation@erpnext.com</p>",
"modified": "2019-08-22 07:01:42.934136", "modified": "2019-08-22 07:01:42.934136",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "ERPNext Foundation", "module": "ERPNext Foundation",

View File

@@ -15,7 +15,7 @@
<tr> <tr>
<td>Conference Tickets + Lunch + Dinner</td> <td>Conference Tickets + Lunch + Dinner</td>
<td>{{ doc.full_conference_tickets or 0 }}</td> <td>{{ doc.full_conference_tickets or 0 }}</td>
<td>{% if doc.currency=="INR" %}5000{% else %}80{% endif %}</td> <td>{% if doc.currency=="INR" %}6000{% else %}90{% endif %}</td>
</tr> </tr>
</table> </table>

View File

@@ -2,7 +2,7 @@ frappe.ready(function() {
// bind events here // bind events here
frappe._calculate = function() { frappe._calculate = function() {
frappe.web_form.set_value('amount', 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
) )
}; };

View File

@@ -80,7 +80,7 @@
}, },
{ {
"allow_read_on_all_link_options": 0, "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", "fieldname": "full_conference_tickets",
"fieldtype": "Int", "fieldtype": "Int",
"hidden": 0, "hidden": 0,

View File

@@ -2,7 +2,7 @@ frappe.ready(function() {
// bind events here // bind events here
frappe._calculate = function() { frappe._calculate = function() {
frappe.web_form.set_value('amount', 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
) )
}; };

View File

@@ -84,7 +84,7 @@
}, },
{ {
"allow_read_on_all_link_options": 0, "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", "fieldname": "full_conference_tickets",
"fieldtype": "Int", "fieldtype": "Int",
"hidden": 0, "hidden": 0,