Merge develop to v15

.eslintrc

@@ -0,0 +1,130 @@
+{
+	"env": {
+		"browser": true,
+		"node": true,
+		"es2022": true
+	},
+	"parserOptions": {
+		"sourceType": "module"
+	},
+	"extends": "eslint:recommended",
+	"rules": {
+		"indent": "off",
+		"brace-style": "off",
+		"no-mixed-spaces-and-tabs": "off",
+		"no-useless-escape": "off",
+		"space-unary-ops": ["error", { "words": true }],
+		"linebreak-style": "off",
+		"quotes": ["off"],
+		"semi": "off",
+		"camelcase": "off",
+		"no-unused-vars": "off",
+		"no-console": ["warn"],
+		"no-extra-boolean-cast": ["off"],
+		"no-control-regex": ["off"]
+	},
+	"root": true,
+	"globals": {
+		"frappe": true,
+		"Vue": true,
+		"SetVueGlobals": true,
+		"erpnext": true,
+		"hub": true,
+		"$": true,
+		"jQuery": true,
+		"moment": true,
+		"hljs": true,
+		"Awesomplete": true,
+		"CalHeatMap": true,
+		"Sortable": true,
+		"Showdown": true,
+		"Taggle": true,
+		"Gantt": true,
+		"Slick": true,
+		"PhotoSwipe": true,
+		"PhotoSwipeUI_Default": true,
+		"fluxify": true,
+		"io": true,
+		"c3": true,
+		"__": true,
+		"_p": true,
+		"_f": true,
+		"repl": true,
+		"Class": true,
+		"locals": true,
+		"cint": true,
+		"cstr": true,
+		"cur_frm": true,
+		"cur_dialog": true,
+		"cur_page": true,
+		"cur_list": true,
+		"cur_tree": true,
+		"cur_pos": true,
+		"msg_dialog": true,
+		"is_null": true,
+		"in_list": true,
+		"has_common": true,
+		"posthog": true,
+		"has_words": true,
+		"validate_email": true,
+		"open_web_template_values_editor": true,
+		"get_number_format": true,
+		"format_number": true,
+		"format_currency": true,
+		"round_based_on_smallest_currency_fraction": true,
+		"roundNumber": true,
+		"comment_when": true,
+		"replace_newlines": true,
+		"open_url_post": true,
+		"toTitle": true,
+		"lstrip": true,
+		"strip": true,
+		"strip_html": true,
+		"replace_all": true,
+		"flt": true,
+		"precision": true,
+		"md5": true,
+		"CREATE": true,
+		"AMEND": true,
+		"CANCEL": true,
+		"copy_dict": true,
+		"get_number_format_info": true,
+		"print_table": true,
+		"Layout": true,
+		"web_form_settings": true,
+		"$c": true,
+		"$a": true,
+		"$i": true,
+		"$bg": true,
+		"$y": true,
+		"$c_obj": true,
+		"$c_obj_csv": true,
+		"refresh_many": true,
+		"refresh_field": true,
+		"toggle_field": true,
+		"get_field_obj": true,
+		"get_query_params": true,
+		"unhide_field": true,
+		"hide_field": true,
+		"set_field_options": true,
+		"getCookie": true,
+		"getCookies": true,
+		"get_url_arg": true,
+		"get_server_fields": true,
+		"set_multiple": true,
+		"QUnit": true,
+		"Chart": true,
+		"Cypress": true,
+		"cy": true,
+		"describe": true,
+		"expect": true,
+		"it": true,
+		"context": true,
+		"before": true,
+		"beforeEach": true,
+		"onScan": true,
+		"extend_cscript": true,
+		"localforage": true,
+		"Plaid": true
+	}
+}

.git-blame-ignore-revs

@@ -0,0 +1,15 @@
+# Since version 2.23 (released in August 2019), git-blame has a feature
+# to ignore or bypass certain commits.
+#
+# This file contains a list of commits that are not likely what you
+# are looking for in a blame, such as mass reformatting or renaming.
+# You can set this file as a default ignore file for blame by running
+# the following command.
+#
+# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# pre-commit formatting ruff, eslint, prettier (automated)
+63a4acf6c9fe9657fa6d7ad659465b0d5ef3d73f
+
+# pre-commit formatting ruff, eslint, prettier (manual fixup)
+cecf0bec9de2dcd176fc632e8a5348ab2f491cbe

.github/helper/install.sh

@@ -53,4 +53,4 @@ bench start &>> ~/frappe-bench/bench_start.log &
 CI=Yes bench build --app frappe &
 bench --site test_site reinstall --yes
 
-bench --verbose --site test_site install-app payments
+bench --verbose --site test_site install-app payments

.github/labeler.yml

@@ -0,0 +1,4 @@
+# Any python files modifed but no test files modified
+needs-tests:
+- any: ['payments/**/*.py']
+  all: ['!payments/**/test*.py']

.github/workflows/ci.yml

@@ -137,4 +137,4 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
-          verbose: true
+          verbose: true

.github/workflows/labeller.yml

@@ -0,0 +1,12 @@
+name: "Pull Request Labeler"
+on:
+  pull_request_target:
+    types: [opened, reopened]
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v4
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -6,3 +6,5 @@ tags
 payments/docs/current
 node_modules/
 __pycache__/
+.aider*
+.helix

.pre-commit-config.yaml

@@ -20,24 +20,47 @@ repos:
       - id: check-yaml
       - id: debug-statements
 
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.7.1
     hooks:
-      - id: pyupgrade
-        args: ['--py310-plus']
+      - id: prettier
+        types_or: [javascript, vue, scss]
+        # Ignore any files that might contain jinja / bundles
+        exclude: |
+            (?x)^(
+                payments/public/dist/.*|
+                cypress/.*|
+                .*node_modules.*|
+                payments/templates/includes/.*
+            )$
 
-  - repo: https://github.com/adityahase/black
-    rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119
+  - repo: https://github.com/pre-commit/mirrors-eslint
+    rev: v8.44.0
     hooks:
-      - id: black
-        additional_dependencies: ['click==8.0.4']
+      - id: eslint
+        types_or: [javascript]
+        args: ['--quiet']
+        # Ignore any files that might contain jinja / bundles
+        exclude: |
+            (?x)^(
+                payments/public/dist/.*|
+                cypress/.*|
+                .*node_modules.*|
+                payments/templates/includes/.*
+            )$
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.2.0
     hooks:
-      - id: flake8
-        additional_dependencies: ['flake8-bugbear',]
-        args: ['--config', '.github/helper/flake8.conf']
+      - id: ruff
+        name: "Run ruff import sorter"
+        args: ["--select=I", "--fix"]
+
+      - id: ruff
+        name: "Run ruff linter"
+
+      - id: ruff-format
+        name: "Run ruff formatter"
 
 ci:
     autoupdate_schedule: weekly

README.md

@@ -27,7 +27,9 @@ All general utils are stored in [utils](payments/utils) directory. The utils are
 
 [templates](payments/templates) directory has all the payment gateways' custom checkout pages.
 
-#
+## Ongoing Work
+- New API design: https://github.com/frappe/payments/pull/53
+- Mollie Integration: https://github.com/frappe/payments/pull/68 (awaiting the former, but you may use the branc)
 
 ## License
 MIT ([license.txt](license.txt))

commitlint.config.js

@@ -1,25 +1,25 @@
 module.exports = {
-	parserPreset: 'conventional-changelog-conventionalcommits',
-	rules: {
-		'subject-empty': [2, 'never'],
-		'type-case': [2, 'always', 'lower-case'],
-		'type-empty': [2, 'never'],
-		'type-enum': [
-			2,
-			'always',
-			[
-				'build',
-				'chore',
-				'ci',
-				'docs',
-				'feat',
-				'fix',
-				'perf',
-				'refactor',
-				'revert',
-				'style',
-				'test',
-			],
-		],
-	},
+  parserPreset: "conventional-changelog-conventionalcommits",
+  rules: {
+    "subject-empty": [2, "never"],
+    "type-case": [2, "always", "lower-case"],
+    "type-empty": [2, "never"],
+    "type-enum": [
+      2,
+      "always",
+      [
+        "build",
+        "chore",
+        "ci",
+        "docs",
+        "feat",
+        "fix",
+        "perf",
+        "refactor",
+        "revert",
+        "style",
+        "test",
+      ],
+    ],
+  },
 };

payments/hooks.py

@@ -92,9 +92,9 @@
 
 # DocType Class
 # ---------------
-# Override standard doctype classes
+# Extend standard doctype classes
 
-override_doctype_class = {"Web Form": "payments.overrides.payment_webform.PaymentWebForm"}
+extend_doctype_class = {"Web Form": "payments.overrides.payment_webform.PaymentWebForm"}
 
 # Document Events
 # ---------------

payments/payment_gateways/doctype/braintree_settings/braintree_settings.js

@@ -1,6 +1,4 @@
 // Copyright (c) 2018, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Braintree Settings', {
-
-});
+frappe.ui.form.on("Braintree Settings", {});

payments/payment_gateways/doctype/braintree_settings/braintree_settings.py

@@ -267,10 +267,7 @@ def create_charge_on_braintree(self):
 			status = "Error"
 			redirect_url = "payment-failed"
 
-		get_parameters = [
-			("doctype", self.data.reference_doctype),
-			("docname", self.data.reference_docname),
-		]
+		get_parameters = [("doctype", self.data.reference_doctype), ("docname", self.data.reference_docname)]
 		if redirect_to:
 			get_parameters.append(("redirect_to", redirect_to))
 		if redirect_message:
@@ -282,9 +279,8 @@ def create_charge_on_braintree(self):
 
 def get_gateway_controller(doc):
 	payment_request = frappe.get_doc("Payment Request", doc)
-	return frappe.db.get_value(
-		"Payment Gateway", payment_request.payment_gateway, "gateway_controller"
-	)
+	return frappe.db.get_value("Payment Gateway", payment_request.payment_gateway, "gateway_controller")
+
 
 
 def get_client_token(doc):

payments/payment_gateways/doctype/gocardless_mandate/gocardless_mandate.js

@@ -1,5 +1,4 @@
 // Copyright (c) 2018, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('GoCardless Mandate', {
-});
+frappe.ui.form.on("GoCardless Mandate", {});

payments/payment_gateways/doctype/gocardless_settings/__init__.py

@@ -34,7 +34,7 @@ def set_status(event):
 
 def set_mandate_status(event):
 	mandates = []
-	if isinstance(event["links"], (list,)):
+	if isinstance(event["links"], list):
 		for link in event["links"]:
 			mandates.append(link["mandate"])
 	else:

payments/payment_gateways/doctype/gocardless_settings/gocardless_settings.js

@@ -5,4 +5,4 @@
 // 	refresh(frm) {
 
 // 	},
-// });
+// });