From 6d83c11d8edc83fc04bc68416b1321907bcd168a Mon Sep 17 00:00:00 2001 From: David Date: Wed, 3 Apr 2024 00:03:40 +0200 Subject: [PATCH] refactor: explicate intent on make_payment_request interface --- .../doctype/payment_request/payment_request.py | 13 +++++++++---- .../doctype/payment_request/test_payment_request.py | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 8d20493706c..dfe17a78a6a 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -491,10 +491,15 @@ def make_payment_request(**args): "party_type": args.get("party_type") or "Customer", "party": args.get("party") or ref_doc.get("customer"), "bank_account": bank_account, - "make_sales_invoice": args.order_type == "Shopping Cart", - "mute_email": args.mute_email - or args.order_type == "Shopping Cart" - or gateway_account.get("payment_channel", "Email") != "Email", + "make_sales_invoice": ( + args.make_sales_invoice # new standard + or args.order_type == "Shopping Cart" # compat for webshop app + ), + "mute_email": ( + args.mute_email # new standard + or args.order_type == "Shopping Cart" # compat for webshop app + or gateway_account.get("payment_channel", "Email") != "Email" + ), } ) diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py index 5b36387e8da..caedb49822a 100644 --- a/erpnext/accounts/doctype/payment_request/test_payment_request.py +++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py @@ -194,7 +194,8 @@ class TestPaymentRequest(unittest.TestCase): dt="Sales Order", dn=so.name, payment_gateway_account="_Test Gateway - USD", # email channel - order_type="Shopping Cart", + make_sales_invoice=True, + mute_email=True, submit_doc=True, return_doc=True, )