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

fix(Non Profit): Membership and Donation API fixes (#24900)

Browse Source 
* fix: Donation fixes

- differentiate between subscription payment and payment

- issue with donation amount

* fix: existing membership validation

* fix: ignore subscription payments while capturing donations
This commit is contained in:
Rucha Mahabal 2021-03-16 20:08:51 +05:30 committed by GitHub
parent b74436d535
commit 1482b2883f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/non_profit/doctype/donation/donation.py
View File

@ -91,6 +91,10 @@ def capture_razorpay_donations(*args, **kwargs):
if not data.event == 'payment.captured': if not data.event == 'payment.captured':
return return
# to avoid capturing subscription payments as donations
if payment.description and 'subscription' in str(payment.description).lower():
return
donor = get_donor(payment.email) donor = get_donor(payment.email)
if not donor: if not donor:
donor = create_donor(payment) donor = create_donor(payment)
@ -119,7 +123,7 @@ def create_donation(donor, payment):
'donor_name': donor.donor_name, 'donor_name': donor.donor_name,
'email': donor.email, 'email': donor.email,
'date': getdate(), 'date': getdate(),
'amount': flt(payment.amount), 'amount': flt(payment.amount) / 100, # Convert to rupees from paise
'mode_of_payment': payment.method, 'mode_of_payment': payment.method,
'razorpay_payment_id': payment.id 'razorpay_payment_id': payment.id
}).insert(ignore_mandatory=True) }).insert(ignore_mandatory=True)

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

@ -48,7 +48,7 @@ class Membership(Document):
last_membership = erpnext.get_last_membership(self.member) last_membership = erpnext.get_last_membership(self.member)
# if person applied for offline membership # if person applied for offline membership
if last_membership and not frappe.session.user == "Administrator": if last_membership and last_membership != self.name and not frappe.session.user == "Administrator":
# if last membership does not expire in 30 days, then do not allow to renew # if last membership does not expire in 30 days, then do not allow to renew
if getdate(add_days(last_membership.to_date, -30)) > getdate(nowdate()) : if getdate(add_days(last_membership.to_date, -30)) > getdate(nowdate()) :
frappe.throw(_("You can only renew if your membership expires within 30 days")) frappe.throw(_("You can only renew if your membership expires within 30 days"))
@ -287,7 +287,7 @@ def trigger_razorpay_subscription(*args, **kwargs):
membership.generate_invoice(with_payment_entry=settings.automate_membership_payment_entries, save=True) 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)
log = frappe.log_error(message, _("Error creating membership entry for {0}").format(member.name)) log = frappe.log_error(message, _("Error creating membership entry for {0}").format(member.name))
notify_failure(log) notify_failure(log)
return { "status": "Failed", "reason": e} return { "status": "Failed", "reason": e}

5
erpnext/regional/doctype/tax_exemption_80g_certificate/tax_exemption_80g_certificate.py
View File

@ -29,7 +29,10 @@ class TaxExemption80GCertificate(Document):
def validate_duplicates(self): def validate_duplicates(self):
if self.recipient == 'Donor': if self.recipient == 'Donor':
certificate = frappe.db.exists(self.doctype, {'donation': self.donation}) certificate = frappe.db.exists(self.doctype, {
'donation': self.donation,
'name': ('!=', self.name)
})
if certificate: if certificate:
frappe.throw(_('An 80G Certificate {0} already exists for the donation {1}').format( frappe.throw(_('An 80G Certificate {0} already exists for the donation {1}').format(
get_link_to_form(self.doctype, certificate), frappe.bold(self.donation) get_link_to_form(self.doctype, certificate), frappe.bold(self.donation)