Compare commits

..

No commits in common. "master" and "2.0.10" have entirely different histories.

View File

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