From 4773c1ec62ea1e5e040b8e16ae886b6f6ac17666 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 24 Apr 2021 16:24:08 +0530 Subject: [PATCH 1/4] fix: Update all /assets urls with new urls --- payments/public/js/razorpay.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payments/public/js/razorpay.js b/payments/public/js/razorpay.js index e118642..4714811 100644 --- a/payments/public/js/razorpay.js +++ b/payments/public/js/razorpay.js @@ -3,7 +3,7 @@ Razorpay Payment 1. Include checkout script in your code - + 2. Create the Order controller in your backend def get_razorpay_order(self): @@ -145,4 +145,4 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => { } } } -}); \ No newline at end of file +}); From f78b9904865fd7205d3612479f8b6b9b1a48a705 Mon Sep 17 00:00:00 2001 From: Frappe Bot Date: Tue, 27 Apr 2021 20:48:47 +0530 Subject: [PATCH 2/4] refactor: Delete Qunit test files Since it is no longer used --- .../test_braintree_settings.js | 23 ------------------- .../stripe_settings/test_stripe_settings.js | 23 ------------------- .../payment_gateway/test_payment_gateway.js | 23 ------------------- 3 files changed, 69 deletions(-) delete mode 100644 payments/payment_gateways/doctype/braintree_settings/test_braintree_settings.js delete mode 100644 payments/payment_gateways/doctype/stripe_settings/test_stripe_settings.js delete mode 100644 payments/payments/doctype/payment_gateway/test_payment_gateway.js diff --git a/payments/payment_gateways/doctype/braintree_settings/test_braintree_settings.js b/payments/payment_gateways/doctype/braintree_settings/test_braintree_settings.js deleted file mode 100644 index 28e4202..0000000 --- a/payments/payment_gateways/doctype/braintree_settings/test_braintree_settings.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Braintree Settings", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Braintree Setting - () => frappe.tests.make('Braintree Settings', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/payments/payment_gateways/doctype/stripe_settings/test_stripe_settings.js b/payments/payment_gateways/doctype/stripe_settings/test_stripe_settings.js deleted file mode 100644 index b491ba5..0000000 --- a/payments/payment_gateways/doctype/stripe_settings/test_stripe_settings.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Stripe Settings", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Stripe Settings - () => frappe.tests.make('Stripe Settings', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/payments/payments/doctype/payment_gateway/test_payment_gateway.js b/payments/payments/doctype/payment_gateway/test_payment_gateway.js deleted file mode 100644 index 36168ec..0000000 --- a/payments/payments/doctype/payment_gateway/test_payment_gateway.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Payment Gateway", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Payment Gateway - () => frappe.tests.make('Payment Gateway', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); From bd4d08c788a10417db3f74fdd7fa3e502e9ce529 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 29 Apr 2021 14:47:52 +0530 Subject: [PATCH 3/4] fix: Asset URLs Helpers to get asset path Python: frappe.utils.jinja_globals.bundled_asset JS: frappe.assets.bundled_asset --- payments/public/js/razorpay.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/public/js/razorpay.js b/payments/public/js/razorpay.js index 4714811..eda4ac1 100644 --- a/payments/public/js/razorpay.js +++ b/payments/public/js/razorpay.js @@ -3,7 +3,7 @@ Razorpay Payment 1. Include checkout script in your code - + {{ include_script('checkout.bundle.js) }} 2. Create the Order controller in your backend def get_razorpay_order(self): From 025f47c7f99c63df6f6eff56e08e8ba4f920034a Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 26 May 2021 15:31:29 +0530 Subject: [PATCH 4/4] chore: Drop dead and deprecated code * Remove six for PY2 compatability since our dependencies are not, PY2 is legacy. * Removed usages of utils from future/past libraries since they are deprecated. This includes 'from __future__ ...' and 'from past...' statements. * Removed compatibility imports for PY2, switched from six imports to standard library imports. * Removed utils code blocks that handle operations depending on PY2/3 versions. * Removed 'from __future__ ...' lines from templates/code generators * Used PY3 syntaxes in place of PY2 compatible blocks. eg: metaclass --- .../doctype/braintree_settings/braintree_settings.py | 3 +-- .../doctype/braintree_settings/test_braintree_settings.py | 2 -- .../doctype/paypal_settings/paypal_settings.py | 3 +-- .../doctype/paytm_settings/paytm_settings.py | 5 ++--- .../doctype/paytm_settings/test_paytm_settings.py | 2 -- .../doctype/razorpay_settings/razorpay_settings.py | 3 +-- .../doctype/stripe_settings/stripe_settings.py | 3 +-- .../doctype/stripe_settings/test_stripe_settings.py | 2 -- payments/payments/doctype/payment_gateway/payment_gateway.py | 1 - .../payments/doctype/payment_gateway/test_payment_gateway.py | 2 -- payments/templates/pages/braintree_checkout.py | 1 - payments/templates/pages/payment_cancel.py | 1 - payments/templates/pages/payment_success.py | 2 -- payments/templates/pages/paytm_checkout.py | 1 - payments/templates/pages/razorpay_checkout.py | 4 +--- payments/templates/pages/stripe_checkout.py | 1 - 16 files changed, 7 insertions(+), 29 deletions(-) diff --git a/payments/payment_gateways/doctype/braintree_settings/braintree_settings.py b/payments/payment_gateways/doctype/braintree_settings/braintree_settings.py index 768f58c..9dc9778 100644 --- a/payments/payment_gateways/doctype/braintree_settings/braintree_settings.py +++ b/payments/payment_gateways/doctype/braintree_settings/braintree_settings.py @@ -2,12 +2,11 @@ # Copyright (c) 2018, Frappe Technologies and contributors # For license information, please see license.txt -from __future__ import unicode_literals import frappe from frappe.model.document import Document import braintree from frappe import _ -from six.moves.urllib.parse import urlencode +from urllib.parse import urlencode from frappe.utils import get_url, call_hook_method from frappe.integrations.utils import create_request_log, create_payment_gateway diff --git a/payments/payment_gateways/doctype/braintree_settings/test_braintree_settings.py b/payments/payment_gateways/doctype/braintree_settings/test_braintree_settings.py index 80fa3c5..72a678a 100644 --- a/payments/payment_gateways/doctype/braintree_settings/test_braintree_settings.py +++ b/payments/payment_gateways/doctype/braintree_settings/test_braintree_settings.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (c) 2018, Frappe Technologies and Contributors # See license.txt -from __future__ import unicode_literals - import unittest class TestBraintreeSettings(unittest.TestCase): diff --git a/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py b/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py index efd1b03..da045d2 100644 --- a/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py +++ b/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py @@ -63,12 +63,11 @@ More Details: """ -from __future__ import unicode_literals import frappe import json import pytz from frappe import _ -from six.moves.urllib.parse import urlencode +from urllib.parse import urlencode from frappe.model.document import Document from frappe.integrations.utils import create_request_log, make_post_request, create_payment_gateway from frappe.utils import get_url, call_hook_method, cint, get_datetime diff --git a/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py b/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py index 616c383..9f15d73 100644 --- a/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py +++ b/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py @@ -2,10 +2,9 @@ # Copyright (c) 2020, Frappe Technologies and contributors # For license information, please see license.txt -from __future__ import unicode_literals import json import requests -from six.moves.urllib.parse import urlencode +from urllib.parse import urlencode import frappe from frappe.model.document import Document @@ -59,7 +58,7 @@ def get_paytm_params(payment_details, order_id, paytm_config): # initialize a dictionary paytm_params = dict() - + redirect_uri = get_request_site_address(True) + "/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.verify_transaction" diff --git a/payments/payment_gateways/doctype/paytm_settings/test_paytm_settings.py b/payments/payment_gateways/doctype/paytm_settings/test_paytm_settings.py index 77a16c8..a00ce86 100644 --- a/payments/payment_gateways/doctype/paytm_settings/test_paytm_settings.py +++ b/payments/payment_gateways/doctype/paytm_settings/test_paytm_settings.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (c) 2020, Frappe Technologies and Contributors # See license.txt -from __future__ import unicode_literals - # import frappe import unittest diff --git a/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py b/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py index af7686c..d24e15f 100644 --- a/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py +++ b/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py @@ -60,14 +60,13 @@ For razorpay payment status is Authorized """ -from __future__ import unicode_literals import frappe from frappe import _ import json import hmac import razorpay import hashlib -from six.moves.urllib.parse import urlencode +from urllib.parse import urlencode from frappe.model.document import Document from frappe.utils import get_url, call_hook_method, cint, get_timestamp from frappe.integrations.utils import (make_get_request, make_post_request, create_request_log, diff --git a/payments/payment_gateways/doctype/stripe_settings/stripe_settings.py b/payments/payment_gateways/doctype/stripe_settings/stripe_settings.py index 70ca600..9bb9c60 100644 --- a/payments/payment_gateways/doctype/stripe_settings/stripe_settings.py +++ b/payments/payment_gateways/doctype/stripe_settings/stripe_settings.py @@ -2,11 +2,10 @@ # Copyright (c) 2017, Frappe Technologies and contributors # For license information, please see license.txt -from __future__ import unicode_literals import frappe from frappe.model.document import Document from frappe import _ -from six.moves.urllib.parse import urlencode +from urllib.parse import urlencode from frappe.utils import get_url, call_hook_method, cint, flt from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway diff --git a/payments/payment_gateways/doctype/stripe_settings/test_stripe_settings.py b/payments/payment_gateways/doctype/stripe_settings/test_stripe_settings.py index 39e1281..ba11c3c 100644 --- a/payments/payment_gateways/doctype/stripe_settings/test_stripe_settings.py +++ b/payments/payment_gateways/doctype/stripe_settings/test_stripe_settings.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (c) 2018, Frappe Technologies and Contributors # See license.txt -from __future__ import unicode_literals - import unittest class TestStripeSettings(unittest.TestCase): diff --git a/payments/payments/doctype/payment_gateway/payment_gateway.py b/payments/payments/doctype/payment_gateway/payment_gateway.py index 80799e3..1459635 100644 --- a/payments/payments/doctype/payment_gateway/payment_gateway.py +++ b/payments/payments/doctype/payment_gateway/payment_gateway.py @@ -2,7 +2,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors # For license information, please see license.txt -from __future__ import unicode_literals import frappe from frappe.model.document import Document diff --git a/payments/payments/doctype/payment_gateway/test_payment_gateway.py b/payments/payments/doctype/payment_gateway/test_payment_gateway.py index 2faf1a7..66f899b 100644 --- a/payments/payments/doctype/payment_gateway/test_payment_gateway.py +++ b/payments/payments/doctype/payment_gateway/test_payment_gateway.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # See license.txt -from __future__ import unicode_literals - import frappe import unittest diff --git a/payments/templates/pages/braintree_checkout.py b/payments/templates/pages/braintree_checkout.py index ad262c3..c4aa1a7 100644 --- a/payments/templates/pages/braintree_checkout.py +++ b/payments/templates/pages/braintree_checkout.py @@ -1,6 +1,5 @@ # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt -from __future__ import unicode_literals import frappe from frappe import _ from frappe.utils import flt diff --git a/payments/templates/pages/payment_cancel.py b/payments/templates/pages/payment_cancel.py index db335b8..0387c9e 100644 --- a/payments/templates/pages/payment_cancel.py +++ b/payments/templates/pages/payment_cancel.py @@ -1,7 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # See license.txt -from __future__ import unicode_literals import frappe def get_context(context): diff --git a/payments/templates/pages/payment_success.py b/payments/templates/pages/payment_success.py index bdc14db..1eb9215 100644 --- a/payments/templates/pages/payment_success.py +++ b/payments/templates/pages/payment_success.py @@ -1,8 +1,6 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # See license.txt -from __future__ import unicode_literals - import frappe no_cache = True diff --git a/payments/templates/pages/paytm_checkout.py b/payments/templates/pages/paytm_checkout.py index bc385b5..1bd9457 100644 --- a/payments/templates/pages/paytm_checkout.py +++ b/payments/templates/pages/paytm_checkout.py @@ -1,6 +1,5 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt -from __future__ import unicode_literals import frappe from frappe import _ import json diff --git a/payments/templates/pages/razorpay_checkout.py b/payments/templates/pages/razorpay_checkout.py index 039ea17..1901577 100644 --- a/payments/templates/pages/razorpay_checkout.py +++ b/payments/templates/pages/razorpay_checkout.py @@ -1,11 +1,9 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt -from __future__ import unicode_literals import frappe from frappe import _ from frappe.utils import flt, cint import json -from six import string_types no_cache = 1 @@ -47,7 +45,7 @@ def get_api_key(): def make_payment(razorpay_payment_id, options, reference_doctype, reference_docname, token): data = {} - if isinstance(options, string_types): + if isinstance(options, str): data = json.loads(options) data.update({ diff --git a/payments/templates/pages/stripe_checkout.py b/payments/templates/pages/stripe_checkout.py index 142d5b3..186c3e0 100644 --- a/payments/templates/pages/stripe_checkout.py +++ b/payments/templates/pages/stripe_checkout.py @@ -1,6 +1,5 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt -from __future__ import unicode_literals import frappe from frappe import _ from frappe.utils import cint, fmt_money