Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849)

Browse Source
This commit is contained in:
Rucha Mahabal 2021-03-11 15:27:22 +05:30 committed by GitHub
parent be2c1fca7b
commit d1e331f77f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/non_profit/doctype/membership/membership.py
View File

@ -282,8 +282,9 @@ def trigger_razorpay_subscription(*args, **kwargs):
member.flags.ignore_mandatory = True member.flags.ignore_mandatory = True
member.save() member.save()
automate_payment = frappe.db.get_single_value("Membership Settings", "automate_membership_payment_entries") settings = frappe.get_doc("Non Profit Settings")
membership.generate_invoice(with_payment_entry=automate_payment, save=True) if settings.allow_invoicing and settings.automate_membership_invoicing:
membership.generate_invoice(with_payment_entry=settings.automate_membership_payment_entries, save=True)
except Exception as e: except Exception as e:
message = "{0}\n\n{1}\n\n{2}: {3}".format(e, frappe.get_traceback(), __("Payment ID"), payment.id) message = "{0}\n\n{1}\n\n{2}: {3}".format(e, frappe.get_traceback(), __("Payment ID"), payment.id)

2
erpnext/non_profit/doctype/non_profit_settings/non_profit_settings.py
View File

@ -9,7 +9,7 @@ from frappe.integrations.utils import get_payment_gateway_controller
from frappe.model.document import Document from frappe.model.document import Document
class NonProfitSettings(Document): class NonProfitSettings(Document):
def generate_webhook_secret(self, field): def generate_webhook_secret(self, field="membership_webhook_secret"):
key = frappe.generate_hash(length=20) key = frappe.generate_hash(length=20)
self.set(field, key) self.set(field, key)
self.save() self.save()