From e5834ba5b30f83ef1f0f2643cfc15e03c55738ae Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Wed, 22 Apr 2020 16:12:49 +0530 Subject: [PATCH] chore: remove initial validation check --- .../doctype/paytm_settings/checksum.py | 1 - .../doctype/paytm_settings/paytm_settings.py | 13 +------------ payments/templates/pages/paytm_checkout.py | 6 +----- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/payments/payment_gateways/doctype/paytm_settings/checksum.py b/payments/payment_gateways/doctype/paytm_settings/checksum.py index 95fb7dc..b2e67bb 100644 --- a/payments/payment_gateways/doctype/paytm_settings/checksum.py +++ b/payments/payment_gateways/doctype/paytm_settings/checksum.py @@ -87,7 +87,6 @@ def __get_param_string__(params): params_string = [] for key in sorted(params.keys()): if("REFUND" in params[key] or "|" in params[key]): - respons_dict = {} exit() value = params[key] params_string.append('' if value == 'null' else str(value)) diff --git a/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py b/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py index 394cd9c..ed71202 100644 --- a/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py +++ b/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py @@ -11,7 +11,7 @@ import frappe from frappe.model.document import Document from frappe import _ from frappe.utils import get_url, call_hook_method, cint, flt, cstr -from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway +from frappe.integrations.utils import create_request_log, create_payment_gateway from frappe.utils import get_request_site_address from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum, verify_checksum from frappe.utils.password import get_decrypted_password @@ -22,17 +22,6 @@ class PaytmSettings(Document): def validate(self): create_payment_gateway('Paytm') call_hook_method('payment_gateway_enabled', gateway='Paytm') - if not self.flags.ignore_mandatory: - self.validate_paytm_credentails() - - def validate_paytm_credentails(self): - if self.merchant_id and self.merchant_key: - pass - # header = {"Authorization": "Bearer {0}".format(self.get_password(fieldname="secret_key", raise_exception=False))} - # try: - # make_get_request(url="https://api.stripe.com/v1/charges", headers=header) - # except Exception: - # frappe.throw(_("Seems Publishable Key or Secret Key is wrong !!!")) def validate_transaction_currency(self, currency): if currency not in self.supported_currencies: diff --git a/payments/templates/pages/paytm_checkout.py b/payments/templates/pages/paytm_checkout.py index 5a55d02..3018a9d 100644 --- a/payments/templates/pages/paytm_checkout.py +++ b/payments/templates/pages/paytm_checkout.py @@ -3,12 +3,8 @@ from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import flt, cint import json -from six import string_types -from frappe.utils import get_request_site_address from frappe.integrations.doctype.paytm_settings.paytm_settings import get_paytm_params, get_paytm_config -import requests no_cache = 1 @@ -23,7 +19,7 @@ def get_context(context): context.url = paytm_config.url - except Exception as e: + except Exception: frappe.log_error() frappe.redirect_to_message(_('Invalid Token'), _('Seems token you are using is invalid!'),