Skip to content

Commit 5f48659

Browse files
authored
Merge pull request #460 from OXID-eSales/PSPAYPAL-722_Freeze_products_in_backend_for_paypal_order
PSPAYPAL-722 Freeze products in backend for paypal order
2 parents db56c34 + dc31a40 commit 5f48659

3 files changed

Lines changed: 37 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1414
### FIX
1515

1616
- Fix: Locales for PP-Buttons are editable again
17+
- Fix: captured order could not be changed in the backend
1718

1819
## [3.4.1] - 2025-04-08
1920

metadata.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use OxidEsales\Eshop\Application\Controller\OrderController;
1212
use OxidEsales\Eshop\Application\Controller\PaymentController;
1313
use OxidEsales\Eshop\Application\Controller\Admin\OrderMain;
14+
use OxidEsales\Eshop\Application\Controller\Admin\OrderArticle;
1415
use OxidEsales\Eshop\Application\Controller\Admin\OrderOverview;
1516
use OxidEsales\Eshop\Application\Model\Article;
1617
use OxidEsales\Eshop\Application\Model\Basket;
@@ -27,6 +28,7 @@
2728
use OxidSolutionCatalysts\PayPal\Controller\Admin\ModuleConfiguration as PaypalModuleConfiguration;
2829
use OxidSolutionCatalysts\PayPal\Controller\Admin\PayPalConfigController;
2930
use OxidSolutionCatalysts\PayPal\Controller\Admin\PayPalOrderController;
31+
use OxidSolutionCatalysts\PayPal\Controller\Admin\OrderArticle as PayPalOrderArticleController;
3032
use OxidSolutionCatalysts\PayPal\Controller\Admin\OrderMain as PayPalOrderMainController;
3133
use OxidSolutionCatalysts\PayPal\Controller\Admin\OrderOverview as PayPalOrderOverviewController;
3234
use OxidSolutionCatalysts\PayPal\Controller\OrderController as PayPalFrontEndOrderController;
@@ -83,6 +85,7 @@
8385
UserComponent::class => PayPalUserComponent::class,
8486
BasketComponent::class => PayPalBasketComponent::class,
8587
OrderMain::class => PayPalOrderMainController::class,
88+
OrderArticle::class => PayPalOrderArticleController::class,
8689
OrderOverview::class => PayPalOrderOverviewController::class,
8790
State::class => PayPalState::class
8891
],
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
3+
/**
4+
* Copyright © OXID eSales AG. All rights reserved.
5+
* See LICENSE file for license details.
6+
*/
7+
8+
namespace OxidSolutionCatalysts\PayPal\Controller\Admin;
9+
10+
/**
11+
* OrderArticle class
12+
*
13+
* @mixin \OxidEsales\Eshop\Application\Controller\Admin\OrderArticle
14+
*/
15+
class OrderArticle extends OrderArticle_parent
16+
{
17+
public function render()
18+
{
19+
$parent = parent::render();
20+
if ($order = $this->getEditObject()) {
21+
if ( $order->paidWithPayPal() ||
22+
$order->paidWithPayPalPlus()||
23+
$order->paidWithPayPalSoap()
24+
) {
25+
$capture = $order->getOrderPaymentCapture();
26+
if (!is_null($capture)) {
27+
$this->_aViewData["readonly"] = true;
28+
}
29+
}
30+
}
31+
return $parent;
32+
}
33+
}

0 commit comments

Comments
 (0)