From 6c2ad66522a6649d3aa70e60f853b4ca54c4e87d Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Thu, 24 May 2018 07:23:18 +0000 Subject: [PATCH] Codacy corrections --- .../doctype/payment_plan/payment_plan.js | 4 +--- .../doctype/payment_plan/payment_plan.py | 1 - .../doctype/payment_plan/test_payment_plan.py | 1 - .../doctype/stripe_settings/stripe_settings.js | 2 -- .../doctype/stripe_settings/stripe_settings.py | 10 +++------- .../doctype/stripe_settings/test_stripe_settings.py | 1 - .../templates/pages/integrations/stripe_checkout.css | 2 +- .../templates/pages/integrations/stripe_checkout.py | 2 +- 8 files changed, 6 insertions(+), 17 deletions(-) diff --git a/erpnext/erpnext_integrations/doctype/payment_plan/payment_plan.js b/erpnext/erpnext_integrations/doctype/payment_plan/payment_plan.js index 50a41ecc2d..e8bc875fb0 100644 --- a/erpnext/erpnext_integrations/doctype/payment_plan/payment_plan.js +++ b/erpnext/erpnext_integrations/doctype/payment_plan/payment_plan.js @@ -2,7 +2,5 @@ // For license information, please see license.txt frappe.ui.form.on('Payment Plan', { - refresh: function(frm) { - - } + }); diff --git a/erpnext/erpnext_integrations/doctype/payment_plan/payment_plan.py b/erpnext/erpnext_integrations/doctype/payment_plan/payment_plan.py index d61adec880..ec2954ee08 100644 --- a/erpnext/erpnext_integrations/doctype/payment_plan/payment_plan.py +++ b/erpnext/erpnext_integrations/doctype/payment_plan/payment_plan.py @@ -3,7 +3,6 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe from frappe.model.document import Document class PaymentPlan(Document): diff --git a/erpnext/erpnext_integrations/doctype/payment_plan/test_payment_plan.py b/erpnext/erpnext_integrations/doctype/payment_plan/test_payment_plan.py index 5b97868bdf..b5935e4b5c 100644 --- a/erpnext/erpnext_integrations/doctype/payment_plan/test_payment_plan.py +++ b/erpnext/erpnext_integrations/doctype/payment_plan/test_payment_plan.py @@ -3,7 +3,6 @@ # See license.txt from __future__ import unicode_literals -import frappe import unittest class TestPaymentPlan(unittest.TestCase): diff --git a/erpnext/erpnext_integrations/doctype/stripe_settings/stripe_settings.js b/erpnext/erpnext_integrations/doctype/stripe_settings/stripe_settings.js index e5cddd3bf3..fbc8e7fbfb 100644 --- a/erpnext/erpnext_integrations/doctype/stripe_settings/stripe_settings.js +++ b/erpnext/erpnext_integrations/doctype/stripe_settings/stripe_settings.js @@ -2,7 +2,5 @@ // For license information, please see license.txt frappe.ui.form.on('Stripe Settings', { - refresh: function(frm) { - } }); diff --git a/erpnext/erpnext_integrations/doctype/stripe_settings/stripe_settings.py b/erpnext/erpnext_integrations/doctype/stripe_settings/stripe_settings.py index de48d34abb..cc71a58dd8 100644 --- a/erpnext/erpnext_integrations/doctype/stripe_settings/stripe_settings.py +++ b/erpnext/erpnext_integrations/doctype/stripe_settings/stripe_settings.py @@ -8,7 +8,7 @@ from frappe.model.document import Document from frappe import _ from six.moves.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 +from frappe.integrations.utils import make_get_request, create_request_log, create_payment_gateway import stripe class StripeSettings(Document): @@ -88,10 +88,8 @@ class StripeSettings(Document): else: frappe.log_error(charge.failure_message, 'Stripe Payment not completed') - except: + except Exception: frappe.log_error(frappe.get_traceback()) - # failed - pass return self.finalize_request() @@ -114,11 +112,9 @@ class StripeSettings(Document): self.integration_request.db_set('status', 'Failed', update_modified=False) frappe.log_error('Subscription N°: ' + subscription.id, 'Stripe Payment not completed') - except: + except Exception: self.integration_request.db_set('status', 'Failed', update_modified=False) frappe.log_error(frappe.get_traceback()) - # failed - pass return self.finalize_request() diff --git a/erpnext/erpnext_integrations/doctype/stripe_settings/test_stripe_settings.py b/erpnext/erpnext_integrations/doctype/stripe_settings/test_stripe_settings.py index 3403a6279e..0c5aa83c65 100644 --- a/erpnext/erpnext_integrations/doctype/stripe_settings/test_stripe_settings.py +++ b/erpnext/erpnext_integrations/doctype/stripe_settings/test_stripe_settings.py @@ -3,7 +3,6 @@ # See license.txt from __future__ import unicode_literals -import frappe import unittest class TestStripeSettings(unittest.TestCase): diff --git a/erpnext/templates/pages/integrations/stripe_checkout.css b/erpnext/templates/pages/integrations/stripe_checkout.css index 04efc79530..a42808aa7f 100644 --- a/erpnext/templates/pages/integrations/stripe_checkout.css +++ b/erpnext/templates/pages/integrations/stripe_checkout.css @@ -18,7 +18,7 @@ } .StripeElement--webkit-autofill { - background-color: #fefde5 !important; + background-color: #fefde5; } .stripe #payment-form { diff --git a/erpnext/templates/pages/integrations/stripe_checkout.py b/erpnext/templates/pages/integrations/stripe_checkout.py index e9c1ff3fab..f1f86e90a0 100644 --- a/erpnext/templates/pages/integrations/stripe_checkout.py +++ b/erpnext/templates/pages/integrations/stripe_checkout.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import flt, cint, fmt_money +from frappe.utils import cint, fmt_money import json from erpnext.erpnext_integrations.doctype.stripe_settings.stripe_settings import get_gateway_controller