瀏覽代碼

Merge branch 'frappe:develop' into develop

pull/2/head
Manuel 3 年之前
committed by GitHub
父節點
當前提交
7923e5e990
共有 16 個文件被更改,包括 21 次插入20 次删除
  1. +1
    -1
      payments/payment_gateways/doctype/braintree_settings/braintree_settings.py
  2. +1
    -1
      payments/payment_gateways/doctype/braintree_settings/test_braintree_settings.py
  3. +1
    -1
      payments/payment_gateways/doctype/paypal_settings/paypal_settings.py
  4. +1
    -1
      payments/payment_gateways/doctype/paytm_settings/paytm_settings.py
  5. +1
    -1
      payments/payment_gateways/doctype/paytm_settings/test_paytm_settings.py
  6. +1
    -1
      payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py
  7. +1
    -1
      payments/payment_gateways/doctype/stripe_settings/stripe_settings.py
  8. +1
    -1
      payments/payment_gateways/doctype/stripe_settings/test_stripe_settings.py
  9. +1
    -1
      payments/payments/doctype/payment_gateway/payment_gateway.py
  10. +1
    -1
      payments/payments/doctype/payment_gateway/test_payment_gateway.py
  11. +3
    -2
      payments/templates/pages/braintree_checkout.py
  12. +1
    -1
      payments/templates/pages/payment_cancel.py
  13. +1
    -1
      payments/templates/pages/payment_success.py
  14. +2
    -2
      payments/templates/pages/paytm_checkout.py
  15. +2
    -2
      payments/templates/pages/razorpay_checkout.py
  16. +2
    -2
      payments/templates/pages/stripe_checkout.py

+ 1
- 1
payments/payment_gateways/doctype/braintree_settings/braintree_settings.py 查看文件

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies and contributors
# For license information, please see license.txt
# License: MIT. See LICENSE

import frappe
from frappe.model.document import Document


+ 1
- 1
payments/payment_gateways/doctype/braintree_settings/test_braintree_settings.py 查看文件

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies and Contributors
# See license.txt
# License: MIT. See LICENSE
import unittest

class TestBraintreeSettings(unittest.TestCase):


+ 1
- 1
payments/payment_gateways/doctype/paypal_settings/paypal_settings.py 查看文件

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies and contributors
# For license information, please see license.txt
# License: MIT. See LICENSE

"""
# Integrating PayPal


+ 1
- 1
payments/payment_gateways/doctype/paytm_settings/paytm_settings.py 查看文件

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2020, Frappe Technologies and contributors
# For license information, please see license.txt
# License: MIT. See LICENSE

import json
import requests


+ 1
- 1
payments/payment_gateways/doctype/paytm_settings/test_paytm_settings.py 查看文件

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2020, Frappe Technologies and Contributors
# See license.txt
# License: MIT. See LICENSE
# import frappe
import unittest



+ 1
- 1
payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py 查看文件

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies and contributors
# For license information, please see license.txt
# License: MIT. See LICENSE

"""
# Integrating RazorPay


+ 1
- 1
payments/payment_gateways/doctype/stripe_settings/stripe_settings.py 查看文件

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2017, Frappe Technologies and contributors
# For license information, please see license.txt
# License: MIT. See LICENSE

import frappe
from frappe.model.document import Document


+ 1
- 1
payments/payment_gateways/doctype/stripe_settings/test_stripe_settings.py 查看文件

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2018, Frappe Technologies and Contributors
# See license.txt
# License: MIT. See LICENSE
import unittest

class TestStripeSettings(unittest.TestCase):


+ 1
- 1
payments/payments/doctype/payment_gateway/payment_gateway.py 查看文件

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
# License: MIT. See LICENSE

import frappe
from frappe.model.document import Document


+ 1
- 1
payments/payments/doctype/payment_gateway/test_payment_gateway.py 查看文件

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
# License: MIT. See LICENSE
import frappe
import unittest



+ 3
- 2
payments/templates/pages/braintree_checkout.py 查看文件

@@ -1,5 +1,6 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# License: MIT. See LICENSE

import frappe
from frappe import _
from frappe.utils import flt


+ 1
- 1
payments/templates/pages/payment_cancel.py 查看文件

@@ -1,5 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
# License: MIT. See LICENSE

import frappe



+ 1
- 1
payments/templates/pages/payment_success.py 查看文件

@@ -1,5 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
# License: MIT. See LICENSE

import frappe
no_cache = True


+ 2
- 2
payments/templates/pages/paytm_checkout.py 查看文件

@@ -1,5 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# License: MIT. See LICENSE
import frappe
from frappe import _
import json


+ 2
- 2
payments/templates/pages/razorpay_checkout.py 查看文件

@@ -1,5 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# License: MIT. See LICENSE
import frappe
from frappe import _
from frappe.utils import flt, cint


+ 2
- 2
payments/templates/pages/stripe_checkout.py 查看文件

@@ -1,5 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# License: MIT. See LICENSE
import frappe
from frappe import _
from frappe.utils import cint, fmt_money


Loading…
取消
儲存