Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### FIX

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

## [3.4.1] - 2025-04-08

Expand Down
3 changes: 3 additions & 0 deletions metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use OxidEsales\Eshop\Application\Controller\OrderController;
use OxidEsales\Eshop\Application\Controller\PaymentController;
use OxidEsales\Eshop\Application\Controller\Admin\OrderMain;
use OxidEsales\Eshop\Application\Controller\Admin\OrderArticle;
use OxidEsales\Eshop\Application\Controller\Admin\OrderOverview;
use OxidEsales\Eshop\Application\Model\Article;
use OxidEsales\Eshop\Application\Model\Basket;
Expand All @@ -27,6 +28,7 @@
use OxidSolutionCatalysts\PayPal\Controller\Admin\ModuleConfiguration as PaypalModuleConfiguration;
use OxidSolutionCatalysts\PayPal\Controller\Admin\PayPalConfigController;
use OxidSolutionCatalysts\PayPal\Controller\Admin\PayPalOrderController;
use OxidSolutionCatalysts\PayPal\Controller\Admin\OrderArticle as PayPalOrderArticleController;
use OxidSolutionCatalysts\PayPal\Controller\Admin\OrderMain as PayPalOrderMainController;
use OxidSolutionCatalysts\PayPal\Controller\Admin\OrderOverview as PayPalOrderOverviewController;
use OxidSolutionCatalysts\PayPal\Controller\OrderController as PayPalFrontEndOrderController;
Expand Down Expand Up @@ -83,6 +85,7 @@
UserComponent::class => PayPalUserComponent::class,
BasketComponent::class => PayPalBasketComponent::class,
OrderMain::class => PayPalOrderMainController::class,
OrderArticle::class => PayPalOrderArticleController::class,
OrderOverview::class => PayPalOrderOverviewController::class,
State::class => PayPalState::class
],
Expand Down
33 changes: 33 additions & 0 deletions src/Controller/Admin/OrderArticle.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

/**
* Copyright © OXID eSales AG. All rights reserved.
* See LICENSE file for license details.
*/

namespace OxidSolutionCatalysts\PayPal\Controller\Admin;

/**
* OrderArticle class
*
* @mixin \OxidEsales\Eshop\Application\Controller\Admin\OrderArticle
*/
class OrderArticle extends OrderArticle_parent
{
public function render()
{
$parent = parent::render();
if ($order = $this->getEditObject()) {
if ( $order->paidWithPayPal() ||
$order->paidWithPayPalPlus()||
$order->paidWithPayPalSoap()
) {
$capture = $order->getOrderPaymentCapture();
if (!is_null($capture)) {
$this->_aViewData["readonly"] = true;
}
}
}
return $parent;
}
}
Loading