From 947ab724414a71c26338cf2aa59cce2b43f095e2 Mon Sep 17 00:00:00 2001 From: Joseph Mania <60258622+maniamartial@users.noreply.github.com> Date: Sat, 4 Jan 2025 02:53:41 +0300 Subject: [PATCH 1/2] refactor: phone number field when channel is phone on Payment Request (#44949) Co-authored-by: maniamartial (cherry picked from commit cfa062df861481f0ef8d4d97bee85192c69fdadc) --- .../doctype/payment_request/payment_request.json | 15 +++++++++++++-- .../doctype/payment_request/payment_request.py | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 43ca6906467..2bdf2b17a06 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -60,7 +60,8 @@ "payment_order", "amended_from", "column_break_pnyv", - "payment_url" + "payment_url", + "phone_number" ], "fields": [ { @@ -378,6 +379,7 @@ "read_only": 1 }, { + "depends_on": "eval: doc.payment_channel==\"Phone\"", "fetch_from": "payment_gateway_account.payment_channel", "fieldname": "payment_channel", "fieldtype": "Select", @@ -444,13 +446,22 @@ "fieldtype": "Data", "label": "Party Name", "read_only": 1 + }, + { + "fieldname": "column_break_iiuv", + "fieldtype": "Column Break" + }, + { + "fieldname": "phone_number", + "fieldtype": "Data", + "label": "Phone Number" } ], "in_create": 1, "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-10-23 12:23:40.117336", + "modified": "2024-12-27 21:29:10.361894", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index b5432dbf073..de647def707 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -221,6 +221,7 @@ class PaymentRequest(Document): sender=self.email_to, currency=self.currency, payment_gateway=self.payment_gateway, + phone_number=self.phone_number, ) controller.validate_transaction_currency(self.currency) @@ -643,6 +644,7 @@ def make_payment_request(**args): or args.order_type == "Shopping Cart" # compat for webshop app or gateway_account.get("payment_channel", "Email") != "Email" ), + "phone_number": args.get("phone_number") if args.get("phone_number") else None, } ) From ba90a6a4bf27f309ade8cb2a1cb5767cd8537f20 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Sat, 4 Jan 2025 05:45:58 +0530 Subject: [PATCH 2/2] chore: fix json --- erpnext/accounts/doctype/payment_request/payment_request.json | 3 ++- erpnext/accounts/doctype/payment_request/payment_request.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 2bdf2b17a06..01df72aa07e 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -61,6 +61,7 @@ "amended_from", "column_break_pnyv", "payment_url", + "column_break_iiuv", "phone_number" ], "fields": [ @@ -461,7 +462,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-12-27 21:29:10.361894", + "modified": "2025-01-04 05:39:32.448857", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index de647def707..51fb99657ca 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -81,6 +81,7 @@ class PaymentRequest(Document): payment_order: DF.Link | None payment_request_type: DF.Literal["Outward", "Inward"] payment_url: DF.Data | None + phone_number: DF.Data | None print_format: DF.Literal[None] project: DF.Link | None reference_doctype: DF.Link | None