From bfc92804f91ff8ece4eb17bb57b88a1a016f80e5 Mon Sep 17 00:00:00 2001 From: Mario Lorenz Date: Tue, 17 Oct 2023 16:15:24 +0200 Subject: [PATCH 1/2] fix wrong Param-Name --- CHANGELOG.md | 4 ++++ metadata.php | 2 +- src/Controller/Admin/PayPalOrderController.php | 2 +- views/admin/tpl/oscpaypalorder.tpl | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c27123ca5..3b41d6cad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [2.3.3] - 2023-??-?? + +- [0007549](https://bugs.oxid-esales.com/view.php?id=7549): Optional field in shop admin -> refund "Note to buyer" is transmitted to PayPal + ## [2.3.2] - 2023-10-05 - [0007537](https://bugs.oxid-esales.com/view.php?id=7537): Show PayNow-Button on PP-Standard instead of Continue-Button diff --git a/metadata.php b/metadata.php index 621ec39cc..3c55b772d 100644 --- a/metadata.php +++ b/metadata.php @@ -56,7 +56,7 @@ 'en' => 'Use of the online payment service from PayPal. Documentation: PayPal Checkout' ], 'thumbnail' => 'out/img/paypal.png', - 'version' => '2.3.2', + 'version' => '2.3.3-rc.1', 'author' => 'OXID eSales AG', 'url' => 'https://www.oxid-esales.com', 'email' => 'info@oxid-esales.com', diff --git a/src/Controller/Admin/PayPalOrderController.php b/src/Controller/Admin/PayPalOrderController.php index 033567d04..7f4a2d62a 100644 --- a/src/Controller/Admin/PayPalOrderController.php +++ b/src/Controller/Admin/PayPalOrderController.php @@ -200,7 +200,7 @@ public function refund(): void $refundAmount = preg_replace("/[\,\.](\d{3})/", "$1", $refundAmount); $invoiceId = $request->getRequestEscapedParameter('invoiceId'); $refundAll = $request->getRequestEscapedParameter('refundAll'); - $noteToPayer = $request->getRequestParameter('noteToPayer'); + $noteToPayer = $request->getRequestEscapedParameter('noteToPayer'); /** @var Order $order */ $order = $this->getOrder(); diff --git a/views/admin/tpl/oscpaypalorder.tpl b/views/admin/tpl/oscpaypalorder.tpl index af87f5669..172543a90 100644 --- a/views/admin/tpl/oscpaypalorder.tpl +++ b/views/admin/tpl/oscpaypalorder.tpl @@ -212,7 +212,7 @@ - + From d0035fa9651e19bccba14c7f06c6ce6d08c5647a Mon Sep 17 00:00:00 2001 From: Mario Lorenz Date: Tue, 17 Oct 2023 16:22:09 +0200 Subject: [PATCH 2/2] fix wrong Param-Name --- views/admin/tpl/oscpaypalorder.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/admin/tpl/oscpaypalorder.tpl b/views/admin/tpl/oscpaypalorder.tpl index 172543a90..8d1bfca48 100644 --- a/views/admin/tpl/oscpaypalorder.tpl +++ b/views/admin/tpl/oscpaypalorder.tpl @@ -211,7 +211,7 @@ - +