Merge branch 'develop' into staging

payments/payment_gateways/doctype/paypal_settings/paypal_settings.py

@@ -60,9 +60,8 @@ import frappe
 import json
 from frappe import _
 from frappe.utils import get_url, call_hook_method, cint
-from urllib import urlencode
+from six.moves.urllib.parse import urlencode
 from frappe.model.document import Document
-import urllib
 from frappe.integrations.utils import create_request_log, make_post_request, create_payment_gateway
 
 class PayPalSettings(Document):
@@ -237,9 +236,9 @@ def confirm_payment(token):
 			redirect_url = "/integrations/payment-failed"
 
 		if redirect_to:
-			redirect_url += '?' + urllib.urlencode({'redirect_to': redirect_to})
+			redirect_url += '?' + urlencode({'redirect_to': redirect_to})
 		if redirect_message:
-			redirect_url += '&' + urllib.urlencode({'redirect_message': redirect_message})
+			redirect_url += '&' + urlencode({'redirect_message': redirect_message})
 
 		# this is done so that functions called via hooks can update flags.redirect_to
 		if redirect:

payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py

@@ -55,7 +55,8 @@ For razorpay payment status is Authorized
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-import urllib, json
+import json
+from six.moves.urllib.parse import urlencode
 from frappe.model.document import Document
 from frappe.utils import get_url, call_hook_method, cint
 from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway
@@ -82,7 +83,7 @@ class RazorpaySettings(Document):
 			frappe.throw(_("Please select another payment method. Razorpay does not support transactions in currency '{0}'").format(currency))
 
 	def get_payment_url(self, **kwargs):
-		return get_url("./integrations/razorpay_checkout?{0}".format(urllib.urlencode(kwargs)))
+		return get_url("./integrations/razorpay_checkout?{0}".format(urlencode(kwargs)))
 
 	def create_request(self, data):
 		self.data = frappe._dict(data)
@@ -146,9 +147,9 @@ class RazorpaySettings(Document):
 			redirect_url = 'payment-failed'
 
 		if redirect_to:
-			redirect_url += '?' + urllib.urlencode({'redirect_to': redirect_to})
+			redirect_url += '?' + urlencode({'redirect_to': redirect_to})
 		if redirect_message:
-			redirect_url += '&' + urllib.urlencode({'redirect_message': redirect_message})
+			redirect_url += '&' + urlencode({'redirect_message': redirect_message})
 
 		return {
 			"redirect_to": redirect_url,

payments/payment_gateways/doctype/stripe_settings/stripe_settings.py

@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 from frappe import _
-import urllib
+from six.moves.urllib.parse import urlencode
 from frappe.utils import get_url, call_hook_method, cint
 from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway
 
@@ -42,7 +42,7 @@ class StripeSettings(Document):
 			frappe.throw(_("Please select another payment method. Stripe does not support transactions in currency '{0}'").format(currency))
 
 	def get_payment_url(self, **kwargs):
-		return get_url("./integrations/stripe_checkout?{0}".format(urllib.urlencode(kwargs)))
+		return get_url("./integrations/stripe_checkout?{0}".format(urlencode(kwargs)))
 	
 	def create_request(self, data):
 		self.data = frappe._dict(data)
@@ -105,9 +105,9 @@ class StripeSettings(Document):
 			redirect_url = 'payment-failed'
 
 		if redirect_to:
-			redirect_url += '?' + urllib.urlencode({'redirect_to': redirect_to})
+			redirect_url += '?' + urlencode({'redirect_to': redirect_to})
 		if redirect_message:
-			redirect_url += '&' + urllib.urlencode({'redirect_message': redirect_message})
+			redirect_url += '&' + urlencode({'redirect_message': redirect_message})
 
 		return {
 			"redirect_to": redirect_url,

payments/templates/pages/razorpay_checkout.py

@@ -5,6 +5,7 @@ import frappe
 from frappe import _
 from frappe.utils import flt, cint
 import json
+from six import string_types
 
 no_cache = 1
 no_sitemap = 1
@@ -39,7 +40,7 @@ def get_api_key():
 def make_payment(razorpay_payment_id, options, reference_doctype, reference_docname):
 	data = {}
 
-	if isinstance(options, basestring):
+	if isinstance(options, string_types):
 		data = json.loads(options)
 
 	data.update({