Merge pull request #28 from ndeet/fix247

Fix getConfigWithoutCache() causing infinite re-generation of webhook secret

Model/BTCPay/BTCPayService.php

@@ -379,7 +379,8 @@ class BTCPayService
                         break;
                     case BTCPayServerInvoice::STATUS_SETTLED:
                         // 2) Payments are settled (marked or not)
-                        $settledStatus = \Magento\Sales\Model\Order::STATE_COMPLETE;
+                        $settledStatus = \Magento\Sales\Model\Order::STATE_PROCESSING;
+
 
                         if ($invoice->isOverpaid()) {
                             $order->addCommentToStatusHistory('Payment confirmed: overpaid.', $settledStatus, true);
@@ -598,7 +599,7 @@ class BTCPayService
 
     private function getConfigWithoutCache($path, $scope, $scopeId): ?string
     {
-        $dataCollection = $this->configValueFactory->create()->getCollection();
+        $dataCollection = $this->configCollectionFactory->create();
         $dataCollection->addFieldToFilter('path', ['like' => $path . '%']);
         $dataCollection->addFieldToFilter('scope', ['like' => $scope . '%']);
         $dataCollection->addFieldToFilter('scope_id', ['like' => $scopeId . '%']);

README.md

@@ -1,12 +1,13 @@
 # BTCPay Server integration for Magento 2
 
 ## Requirements
-- Magento 2.4.2 or later installation (tested on Community Edition 2.4.2)
-- Magento < 2.4 should also work, but is untested. 
-- PHP 7.2 or greater. Tested with PHP 7.4.
-- Your BTCPay Server must be setup with HTTPS or HTTP using TOR for security.
+- BTCPay Server supported versions: >=1.3.0 (including >=2.0.0)
+- Magento 2.4.2 or later installation (tested on Community Edition 2.4.6-p6)
+- Magento < 2.4 should also work, but is untested
+- PHP 8.0 or greater. Tested with PHP 8.2
+- Your BTCPay Server must be setup with HTTPS or HTTP using TOR for security
 - You need an API key for your user in BTCPay Server (new since module v2.0)
-- Single-Store Mode is not supported.
+- Single-Store Mode is not supported
 
 ## Features
 - Allows you to pay with BTCPay Server in Magento 2 stores

composer.json

@@ -20,7 +20,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=7.3",
-        "btcpayserver\/btcpayserver-greenfield-php": "^2.2"
+        "btcpayserver\/btcpayserver-greenfield-php": "^2.7"
     },
     "autoload": {
         "files": [