Skip to content

Commit

Permalink
Release 4.0.25
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Bossert committed Feb 10, 2022
1 parent 911c600 commit 43d7f27
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ tail -f var/log/postfinancecheckout_payment*.log

## Documentation

[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/4.0.24/docs/en/documentation.html)
[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/4.0.25/docs/en/documentation.html)

## License

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@
"postfinancecheckout/sdk": "3.0.1"
},
"type": "shopware-platform-plugin",
"version": "4.0.24"
"version": "4.0.25"
}
2 changes: 1 addition & 1 deletion docs/en/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h2>Documentation</h2> </div>
</a>
</li>
<li>
<a href="https://github.com/pfpayments/shopware-6/releases/tag/4.0.24/">
<a href="https://github.com/pfpayments/shopware-6/releases/tag/4.0.25/">
Source
</a>
</li>
Expand Down
6 changes: 4 additions & 2 deletions src/Core/Api/WebHooks/Controller/WebHookController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
Framework\Routing\Annotation\RouteScope,
System\StateMachine\Aggregation\StateMachineTransition\StateMachineTransitionActions,
System\StateMachine\Exception\IllegalTransitionException};
use Shopware\Core\Checkout\Order\OrderStates;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\{HttpFoundation\JsonResponse,
HttpFoundation\ParameterBag,
Expand Down Expand Up @@ -430,12 +431,13 @@ private function updateTransaction(WebHookRequest $callBackData, Context $contex
->getTransactionService()
->read($callBackData->getSpaceId(), $callBackData->getEntityId());
$orderId = $transaction->getMetaData()[TransactionPayload::POSTFINANCECHECKOUT_METADATA_ORDER_ID];
if(!empty($orderId)) {
$this->executeLocked($orderId, $context, function () use ($orderId, $transaction, $context) {
if(!empty($orderId) && !$transaction->getParent()) {
$this->executeLocked($orderId, $context, function () use ($orderId, $transaction, $context, $callBackData) {
$this->transactionService->upsert($transaction, $context);
$orderTransactionId = $transaction->getMetaData()[TransactionPayload::POSTFINANCECHECKOUT_METADATA_ORDER_TRANSACTION_ID];
$orderTransaction = $this->getOrderTransaction($orderId, $context);
$this->logger->info("OrderId: {$orderId} Current state: {$orderTransaction->getStateMachineState()->getTechnicalName()}");

if (!in_array(
$orderTransaction->getStateMachineState()->getTechnicalName(),
$this->transactionFinalStates
Expand Down

0 comments on commit 43d7f27

Please sign in to comment.