From fe4c558703f1b77f301ef6aad6818ce232f5b571 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Fri, 19 Apr 2024 18:43:17 +0200 Subject: [PATCH] fix: merge conflicts --- .../payment_request/payment_request.py | 24 +++++++++++++++++-- .../subscription/subscription_transaction.py | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 91f4a451ab..15208cc10e 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -1,7 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors # For license information, please see license.txt - import json import warnings @@ -277,7 +276,7 @@ class PaymentRequest(Document): frappe.throw(_("Payment cannot be processed immediately for this payment request.")) def generate_payment_key(self): - self.payment_key = frappe.generate_hash(self.as_json()) + self.payment_key = frappe.generate_hash(length=70) def set_payment_url(self): self.payment_url = get_url("/payments?link={0}".format(self.payment_key)) @@ -892,6 +891,27 @@ def make_payment_entry(docname): def make_status_as_paid(doc, method): warnings.warn("make_status_as_paid will be deprecated since it is error prone.", FutureWarning) + for ref in doc.references: + payment_request_name = frappe.db.get_value( + "Payment Request", + { + "reference_doctype": ref.reference_doctype, + "reference_name": ref.reference_name, + "docstatus": 1, + }, + ) + + if payment_request_name: + doc = frappe.get_doc("Payment Request", payment_request_name) + if doc.status != "Paid": + doc.db_set("status", "Paid") + frappe.db.commit() + + +def update_payment_req_status(doc, method): + # TODO: Link with payment entry + from erpnext.accounts.doctype.payment_entry.payment_entry import get_reference_details + for ref in doc.references: payment_request_name = frappe.db.get_value( "Payment Request", diff --git a/erpnext/accounts/doctype/subscription/subscription_transaction.py b/erpnext/accounts/doctype/subscription/subscription_transaction.py index daa57a41cc..e8d6dc132d 100644 --- a/erpnext/accounts/doctype/subscription/subscription_transaction.py +++ b/erpnext/accounts/doctype/subscription/subscription_transaction.py @@ -353,7 +353,7 @@ class SubscriptionPaymentRequestGenerator: "party_type": "Customer", "party": self.subscription.customer, "submit_doc": False, - "mute_email": self.subscription.flags.mute_emails or self.subscription.email_template, + "mute_email": self.subscription.flags.mute_emails or not self.subscription.email_template, "currency": self.subscription.currency, "email_template": self.subscription.email_template, "print_format": self.subscription.print_format, -- GitLab