From 51228b5ee3ea5543486f68f036b21a2ab9165e3d Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Tue, 13 Oct 2020 17:10:16 +0530 Subject: [PATCH] fix: make response handling more descriptive --- .../doctype/payment_request/payment_request.py | 2 +- .../doctype/mpesa_settings/mpesa_settings.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index ebe8cb1330..51c090cea8 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -186,7 +186,7 @@ class PaymentRequest(Document): party_amount = self.grand_total payment_entry = get_payment_entry(self.reference_doctype, self.reference_name, party_amount=party_amount, - bank_account=self.payment_account, bank_amount=bank_amount, mode_of_payment=self.mode_of_payment) + bank_account=self.payment_account, bank_amount=bank_amount) payment_entry.update({ "reference_no": self.name, diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py index 15606acc95..8fe1972d14 100644 --- a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py +++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py @@ -109,13 +109,13 @@ def verify_transaction(**kwargs): item_response = transaction_response["CallbackMetadata"]["Item"] mpesa_receipt = fetch_param_value(item_response, "MpesaReceiptNumber", "Name") frappe.db.set_value("POS Invoice", doc.reference_name, "mpesa_receipt_number", mpesa_receipt) - request.process_response('output', transaction_response) + request.handle_success(transaction_response) except Exception: - request.process_response('error', transaction_response) + request.handle_failure(transaction_response) frappe.log_error(frappe.get_traceback()) else: - request.process_response('error', transaction_response) + request.handle_failure(transaction_response) frappe.publish_realtime('process_phone_payment', doctype="POS Invoice", docname=transaction_data.payment_reference, user=request.owner, message=transaction_response) @@ -162,12 +162,12 @@ def process_balance_info(**kwargs): ref_doc = frappe.get_doc(transaction_data.reference_doctype, transaction_data.reference_docname) ref_doc.db_set("account_balance", balance_info) - request.process_response('output', account_balance_response) + request.handle_success(account_balance_response) except: - request.process_response('error', account_balance_response) + request.handle_failure(account_balance_response) frappe.log_error(title=_("Mpesa Account Balance Processing Error"), message=account_balance_response) else: - request.process_response('error', account_balance_response) + request.handle_failure(account_balance_response) def convert_to_json(balance_info): """