Merge pull request #215 from aerele/payments-develop

chore: align payments with develop

Author: Vigneshsekar

.github/helper/flake8.conf

@@ -13,7 +13,7 @@ on:
     - cron: "0 0 * * *"
 
 concurrency:
-  group: develop-${{ github.event.number }}
+  group: payments-ci-${{ github.event_name }}-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -43,12 +43,12 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: '3.14'
 
       - name: Check for valid Python & Merge Conflicts
         run: |
@@ -59,9 +59,9 @@ jobs:
           fi
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 24
           check-latest: true
 
       - name: Add to Hosts
@@ -90,7 +90,7 @@ jobs:
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v4
         id: yarn-cache
@@ -127,7 +127,7 @@ jobs:
     if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Clone
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Download artifacts
         uses: actions/download-artifact@v4

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: commitcheck-frappe-${{ github.event.number }}
+  group: payments-linter-${{ github.event_name }}-${{ github.event.number || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -20,12 +20,12 @@ jobs:
     if: github.event_name == 'pull_request'
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 200
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: 16
+          node-version: 24
           check-latest: true
 
       - name: Check commit titles
@@ -39,16 +39,24 @@ jobs:
     if: github.event_name == 'pull_request'
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
-      - uses: pre-commit/action@v3.0.0
+          python-version: '3.14'
+
+      - name: Install and Run Pre-commit
+        uses: pre-commit/action@v3.0.0
 
       - name: Download Semgrep rules
         run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
 
+      - name: Download semgrep
+        run: pip install semgrep
+
       - name: Run Semgrep rules
-        run: |
-          pip install semgrep==1.90.0
-          semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness
+        run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness
+
+      - name: Semgrep for Test Correctness
+        run: semgrep ci --include=**/test_*.py --config ./semgrep/test-correctness.yml

.github/workflows/linter.yml

@@ -120,8 +120,6 @@
 # Testing
 # -------
 
-before_tests = "erpnext.setup.utils.before_tests"  # To setup company and accounts
-
 # Overriding Methods
 # ------------------------------
 #

payments/hooks.py

@@ -53,15 +53,7 @@ def request_for_payment(self, **kwargs):
 
 		for _i, amount in enumerate(request_amounts):
 			args.request_amount = amount
-			if frappe.flags.in_test:
-				from payments.payment_gateways.doctype.mpesa_settings.test_mpesa_settings import (
-					get_payment_request_response_payload,
-				)
-
-				response = frappe._dict(get_payment_request_response_payload(amount))
-			else:
-				response = frappe._dict(generate_stk_push(**args))
-
+			response = frappe._dict(generate_stk_push(**args))
 			self.handle_api_response("CheckoutRequestID", args, response)
 
 	def split_request_amount_according_to_transaction_limit(self, args):
@@ -90,15 +82,7 @@ def get_account_balance_info(self):
 			reference_doctype="Mpesa Settings", reference_docname=self.name, doc_details=vars(self)
 		)
 
-		if frappe.flags.in_test:
-			from payments.payment_gateways.doctype.mpesa_settings.test_mpesa_settings import (
-				get_test_account_balance_response,
-			)
-
-			response = frappe._dict(get_test_account_balance_response())
-		else:
-			response = frappe._dict(get_account_balance(payload))
-
+		response = frappe._dict(get_account_balance(payload))
 		self.handle_api_response("ConversationID", payload, response)
 
 	def handle_api_response(self, global_id, request_dict, response):