From ef14da21bcfaffd5869a6b896f8214cf6e234157 Mon Sep 17 00:00:00 2001 From: phot0n Date: Mon, 25 Jul 2022 10:38:09 +0530 Subject: [PATCH] fix: payment utils import paths Since we're splitting payments app from frappe, updating ERPnext paths as well --- erpnext/accounts/doctype/payment_request/payment_request.py | 3 ++- .../doctype/gocardless_settings/gocardless_settings.py | 4 +++- .../doctype/mpesa_settings/mpesa_settings.py | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index 5264987acf..1f23af3aa8 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -6,7 +6,6 @@ import json import frappe from frappe import _ -from frappe.integrations.utils import get_payment_gateway_controller from frappe.model.document import Document from frappe.utils import flt, get_url, nowdate from frappe.utils.background_jobs import enqueue @@ -20,6 +19,8 @@ from erpnext.accounts.party import get_party_account, get_party_bank_account from erpnext.accounts.utils import get_account_currency from erpnext.erpnext_integrations.stripe_integration import create_stripe_subscription +from payments.utils import get_payment_gateway_controller + class PaymentRequest(Document): def validate(self): diff --git a/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py b/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py index 55517e4828..3288da063f 100644 --- a/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +++ b/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py @@ -7,10 +7,12 @@ from urllib.parse import urlencode import frappe import gocardless_pro from frappe import _ -from frappe.integrations.utils import create_payment_gateway, create_request_log +from frappe.integrations.utils import create_request_log from frappe.model.document import Document from frappe.utils import call_hook_method, cint, flt, get_url +from payments.utils import create_payment_gateway + class GoCardlessSettings(Document): supported_currencies = ["EUR", "DKK", "GBP", "SEK", "AUD", "NZD", "CAD", "USD"] diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py index e389980726..9b147b9d1e 100644 --- a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py +++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py @@ -6,7 +6,7 @@ from json import dumps, loads import frappe from frappe import _ -from frappe.integrations.utils import create_payment_gateway, create_request_log +from frappe.integrations.utils import create_request_log from frappe.model.document import Document from frappe.utils import call_hook_method, fmt_money, get_request_site_address @@ -16,6 +16,8 @@ from erpnext.erpnext_integrations.doctype.mpesa_settings.mpesa_custom_fields imp ) from erpnext.erpnext_integrations.utils import create_mode_of_payment +from payments.utils import create_payment_gateway + class MpesaSettings(Document): supported_currencies = ["KES"]