Skip to content

Commit 94ffcfd

Browse files
update
1 parent d5900ab commit 94ffcfd

File tree

1 file changed

+39
-88
lines changed

1 file changed

+39
-88
lines changed

Model/Push.php

Lines changed: 39 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
use Buckaroo\Magento2\Model\Config\Source\InvoiceHandlingOptions;
2929
use Buckaroo\Magento2\Model\ConfigProvider\Account;
3030
use Buckaroo\Magento2\Model\ConfigProvider\Method\Factory;
31+
use Buckaroo\Magento2\Model\LockManagerWrapper;
3132
use Buckaroo\Magento2\Model\Method\AbstractMethod;
3233
use Buckaroo\Magento2\Model\Method\Afterpay;
33-
use Buckaroo\Magento2\Model\LockManagerWrapper;
3434
use Buckaroo\Magento2\Model\Method\Afterpay2;
3535
use Buckaroo\Magento2\Model\Method\Afterpay20;
3636
use Buckaroo\Magento2\Model\Method\Creditcards;
@@ -44,7 +44,6 @@
4444
use Buckaroo\Magento2\Model\Refund\Push as RefundPush;
4545
use Buckaroo\Magento2\Model\Validator\Push as ValidatorPush;
4646
use Magento\Framework\App\ResourceConnection;
47-
use Magento\Framework\Exception\LocalizedException;
4847
use Magento\Framework\Filesystem\DirectoryList;
4948
use Magento\Framework\ObjectManagerInterface;
5049
use Magento\Framework\Webapi\Rest\Request;
@@ -54,8 +53,7 @@
5453
use Magento\Sales\Model\Order\Email\Sender\OrderSender;
5554
use Magento\Sales\Model\Order\Payment\Transaction;
5655
use Magento\Framework\Filesystem\Driver\File;
57-
use Magento\Sales\Api\TransactionRepositoryInterface;
58-
use Magento\Sales\Model\ResourceModel\Order\Payment\Transaction\CollectionFactory;
56+
5957

6058
class Push implements PushInterface
6159
{
@@ -162,17 +160,12 @@ class Push implements PushInterface
162160

163161
private $fileSystemDriver;
164162

165-
protected $transactionRepository;
166-
protected $transactionCollectionFactory;
167-
168163
/**
169164
* @var LockManagerWrapper
170165
*/
171166
protected LockManagerWrapper $lockManager;
172167

173168
/**
174-
* @param TransactionRepositoryInterface $transactionRepository
175-
* @param CollectionFactory $transactionCollectionFactory
176169
* @param Order $order
177170
* @param TransactionInterface $transaction
178171
* @param Request $request
@@ -195,18 +188,16 @@ class Push implements PushInterface
195188
* @param LockManagerWrapper $lockManager
196189
*/
197190
public function __construct(
198-
TransactionRepositoryInterface $transactionRepository,
199-
CollectionFactory $transactionCollectionFactory,
200-
Order $order,
201-
TransactionInterface $transaction,
202-
Request $request,
203-
ValidatorPush $validator,
204-
OrderSender $orderSender,
205-
InvoiceSender $invoiceSender,
206-
Data $helper,
207-
Account $configAccount,
208-
RefundPush $refundPush,
209-
Log $logging,
191+
Order $order,
192+
TransactionInterface $transaction,
193+
Request $request,
194+
ValidatorPush $validator,
195+
OrderSender $orderSender,
196+
InvoiceSender $invoiceSender,
197+
Data $helper,
198+
Account $configAccount,
199+
RefundPush $refundPush,
200+
Log $logging,
210201
Factory $configProviderMethodFactory,
211202
OrderStatusFactory $orderStatusFactory,
212203
PaymentGroupTransaction $groupTransaction,
@@ -218,8 +209,6 @@ public function __construct(
218209
File $fileSystemDriver,
219210
LockManagerWrapper $lockManager
220211
) {
221-
$this->transactionRepository = $transactionRepository;
222-
$this->transactionCollectionFactory = $transactionCollectionFactory;
223212
$this->order = $order;
224213
$this->transaction = $transaction;
225214
$this->request = $request;
@@ -1064,7 +1053,7 @@ private function sendCm3ConfirmationMail()
10641053
/** @var \Magento\Payment\Model\MethodInterface $paymentMethod */
10651054
$paymentMethod = $this->order->getPayment()->getMethodInstance();
10661055
$configOrderMail = $this->configAccount->getOrderConfirmationEmail($store)
1067-
|| $paymentMethod->getConfigData('order_email', $store);
1056+
|| $paymentMethod->getConfigData('order_email', $store);
10681057

10691058
if (!$this->order->getEmailSent() && $cm3StatusCode == 10 && $configOrderMail) {
10701059
$this->orderSender->send($this->order);
@@ -1604,54 +1593,16 @@ public function processSucceededPush($newStatus, $message)
16041593
return true;
16051594
}
16061595

1607-
/**
1608-
* Updates the 'is_closed' status of all payment transactions for a given order to 0 (open).
1609-
*
1610-
* @param Order $order The order whose transactions need to be updated.
1611-
* @throws LocalizedException If an error occurs during the update.
1612-
*/
16131596
protected function updateTransactionIsClosed($order)
16141597
{
1615-
$this->logging->addDebug(sprintf('Starting updateTransactionIsClosed for order ID %d', $order->getId()));
1616-
1617-
$transactions = $this->transactionCollectionFactory->create()
1618-
->addFieldToFilter('order_id', $order->getId());
1619-
1620-
if ($transactions->getSize() === 0) {
1621-
$this->logging->addDebug(sprintf('No transactions found for order ID %d', $order->getId()));
1622-
return;
1623-
}
1624-
16251598
$connection = $this->resourceConnection->getConnection();
1626-
$connection->beginTransaction();
1627-
1628-
try {
1629-
foreach ($transactions as $transaction) {
1630-
$transaction->setIsClosed(0);
1631-
$this->transactionRepository->save($transaction);
1632-
}
1633-
1634-
$connection->commit();
1599+
$transactionTable = $connection->getTableName('sales_payment_transaction');
16351600

1636-
$this->logging->addDebug(sprintf(
1637-
'Successfully updated is_closed status for %d transactions of order ID %d',
1638-
$transactions->getSize(),
1639-
$order->getId()
1640-
));
1641-
1642-
} catch (\Exception $e) {
1643-
$connection->rollBack();
1644-
1645-
$this->logging->addError(sprintf(
1646-
'Failed to update transactions for order ID %d: %s',
1647-
$order->getId(),
1648-
$e->getMessage()
1649-
));
1650-
1651-
throw new LocalizedException(
1652-
__('Failed to update transaction status: %1', $e->getMessage())
1653-
);
1654-
}
1601+
$connection->update(
1602+
$transactionTable,
1603+
['is_closed' => 0],
1604+
['order_id = ?' => $order->getId()]
1605+
);
16551606
}
16561607

16571608
/**
@@ -1866,7 +1817,7 @@ protected function saveInvoice()
18661817

18671818
/**
18681819
* @return Order\Payment
1869-
* @throws LocalizedException
1820+
* @throws \Magento\Framework\Exception\LocalizedException
18701821
*/
18711822
public function addTransactionData($transactionKey = false, $datas = false)
18721823
{
@@ -2176,13 +2127,13 @@ protected function handleGroupTransactionFailed()
21762127
protected function isFailedGroupTransaction()
21772128
{
21782129
return $this->hasPostData(
2179-
'brq_transaction_type',
2180-
self::BUCK_PUSH_GROUPTRANSACTION_TYPE
2181-
) &&
2182-
$this->hasPostData(
2183-
'brq_statuscode',
2184-
$this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_FAILED')
2185-
);
2130+
'brq_transaction_type',
2131+
self::BUCK_PUSH_GROUPTRANSACTION_TYPE
2132+
) &&
2133+
$this->hasPostData(
2134+
'brq_statuscode',
2135+
$this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_FAILED')
2136+
);
21862137
}
21872138

21882139

@@ -2242,7 +2193,7 @@ protected function getQuoteByReservedOrderId(string $reservedOrderId)
22422193
*
22432194
* @return \Magento\Framework\Model\AbstractExtensibleModel|\Magento\Sales\Api\Data\OrderInterface|object|null
22442195
* @throws \Exception
2245-
* @throws LocalizedException
2196+
* @throws \Magento\Framework\Exception\LocalizedException
22462197
*/
22472198
protected function createOrder(\Magento\Quote\Model\Quote $quote)
22482199
{
@@ -2280,9 +2231,9 @@ protected function cancelOrder(string $reservedOrderId, $historyComment = 'Giftc
22802231
$order->addCommentToStatusHistory(
22812232
__($historyComment)
22822233
)
2283-
->setIsCustomerNotified(false)
2284-
->setEntityName('invoice')
2285-
->save();
2234+
->setIsCustomerNotified(false)
2235+
->setEntityName('invoice')
2236+
->save();
22862237
}
22872238
}
22882239

@@ -2292,7 +2243,7 @@ protected function cancelOrder(string $reservedOrderId, $historyComment = 'Giftc
22922243
* @param string $reservedOrderId
22932244
* @return \Magento\Framework\Model\AbstractExtensibleModel|\Magento\Sales\Api\Data\OrderInterface|object|null
22942245
* @throws \Exception
2295-
* @throws LocalizedException
2246+
* @throws \Magento\Framework\Exception\LocalizedException
22962247
*/
22972248
protected function createOrderFromQuote(string $reservedOrderId)
22982249
{
@@ -2347,12 +2298,12 @@ public function cancelGroupTransactionOrder()
23472298
public function isCanceledGroupTransaction()
23482299
{
23492300
return $this->hasPostData(
2350-
'brq_transaction_type',
2351-
self::BUCK_PUSH_GROUPTRANSACTION_TYPE
2352-
) &&
2353-
$this->hasPostData(
2354-
'brq_statuscode',
2355-
$this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_CANCELLED_BY_USER')
2356-
);
2301+
'brq_transaction_type',
2302+
self::BUCK_PUSH_GROUPTRANSACTION_TYPE
2303+
) &&
2304+
$this->hasPostData(
2305+
'brq_statuscode',
2306+
$this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_CANCELLED_BY_USER')
2307+
);
23572308
}
23582309
}

0 commit comments

Comments
 (0)