From 61b6d268de10868264a2d74f2b53917ca7737c35 Mon Sep 17 00:00:00 2001 From: Mario Lorenz Date: Fri, 22 Sep 2023 15:25:36 +0200 Subject: [PATCH] New Color-Codes for Banner --- CHANGELOG.md | 1 + metadata.php | 4 ++-- tests/Unit/Core/ViewConfigTest.php | 4 +++- views/admin/de/admin_lang.php | 10 ++++++---- views/admin/en/admin_lang.php | 4 +++- views/admin/tpl/oscpaypalconfig.tpl | 10 ++++++++-- 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14b93b783..1d714dcc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - [0007537](https://bugs.oxid-esales.com/view.php?id=7537): Show PayNow-Button on PP-Standard instead of Continue-Button - [0007531](https://bugs.oxid-esales.com/view.php?id=7531): Correct Handling of Vouchers from Voucher-Series - [0007536](https://bugs.oxid-esales.com/view.php?id=7536): PayPal Checkout - Values are stored correctly in the YAML +- [0007543](https://bugs.oxid-esales.com/view.php?id=7543): New Color-Codes for Banner: gray, monochrome, greyscale ## [2.3.1] - 2023-08-17 diff --git a/metadata.php b/metadata.php index 05ba95e7f..92fb513cf 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-rc.1', + 'version' => '2.3.2-rc.2', 'author' => 'OXID eSales AG', 'url' => 'https://www.oxid-esales.com', 'email' => 'info@oxid-esales.com', @@ -410,7 +410,7 @@ [ 'name' => 'oscPayPalBannersColorScheme', 'type' => 'select', - 'constraints' => 'blue|black|white|white-no-border', + 'constraints' => 'blue|black|white|gray|monochrome|grayscale', 'value' => 'blue', 'group' => null ], diff --git a/tests/Unit/Core/ViewConfigTest.php b/tests/Unit/Core/ViewConfigTest.php index a482d3284..69085378e 100644 --- a/tests/Unit/Core/ViewConfigTest.php +++ b/tests/Unit/Core/ViewConfigTest.php @@ -171,7 +171,9 @@ public function providerGetPayPalColorScheme(): array ['blue'], ['black'], ['white'], - ['white-no-border'], + ['gray'], + ['monochrome'], + ['grayscale'], ]; } // <-- PSPAYPAL-491 diff --git a/views/admin/de/admin_lang.php b/views/admin/de/admin_lang.php index 375973380..27852af08 100644 --- a/views/admin/de/admin_lang.php +++ b/views/admin/de/admin_lang.php @@ -173,10 +173,12 @@ 'OSC_PAYPAL_BANNER_PAYMENTPAGESELECTOR' => 'CSS-Selektor der Seite "Versand & Zahlungsart" (Bestellschritt 3) hinter dem das Banner angezeigt wird.', 'HELP_OSC_PAYPAL_BANNER_PAYMENTPAGESELECTOR' => 'Standardwerte für die Themes "Flow" und "Wave": \'.checkoutSteps ~ .spacer\' bzw. \'.checkout-steps\'. Nach diesen CSS-Selektoren wird das Banner angezeigt.', 'OSC_PAYPAL_BANNER_COLORSCHEME' => 'Farbe des Ratenzahlung-Banners auswählen', - 'OSC_PAYPAL_BANNER_COLORSCHEMEBLUE' => 'blau', - 'OSC_PAYPAL_BANNER_COLORSCHEMEBLACK' => 'schwarz', - 'OSC_PAYPAL_BANNER_COLORSCHEMEWHITE' => 'weiß', - 'OSC_PAYPAL_BANNER_COLORSCHEMEWHITENOBORDER' => 'weiß, ohne Rand', + 'OSC_PAYPAL_BANNER_COLORSCHEMEBLUE' => 'Blau', + 'OSC_PAYPAL_BANNER_COLORSCHEMEBLACK' => 'Schwarz', + 'OSC_PAYPAL_BANNER_COLORSCHEMEWHITE' => 'Weiß', + 'OSC_PAYPAL_BANNER_COLORSCHEMEGRAY' => 'Grau', + 'OSC_PAYPAL_BANNER_COLORSCHEMEMONOCHROME' => 'Einfarbig', + 'OSC_PAYPAL_BANNER_COLORSCHEMEGRAYSCALE' => 'Graustufen', 'OSC_PAYPAL_STANDARD_CAPTURE_TIME' => 'PayPal Standard - Geldeinzug', 'OSC_PAYPAL_STANDARD_CAPTURE_TIME_LABEL' => 'Nur für PayPal Standard ist ein abweichender Geldeinzug zum Bestellzeitpunkt möglich. Alle anderen Zahlarten (inkl. PayPal Express) werden sofort eingezogen.', 'OSC_PAYPAL_STANDARD_CAPTURE_TIME_HELP' => 'Bitte beachten! Die Autorisierung einer Bestellung gilt drei Tage. Sie wird maximal bis 29 Tage nach Bestellung automatisch aufgefrischt. Anschließend ist ein Geldeinzug nicht mehr möglich.', diff --git a/views/admin/en/admin_lang.php b/views/admin/en/admin_lang.php index 927d650c0..6f8955eda 100644 --- a/views/admin/en/admin_lang.php +++ b/views/admin/en/admin_lang.php @@ -175,7 +175,9 @@ 'OSC_PAYPAL_BANNER_COLORSCHEMEBLUE' => 'blue', 'OSC_PAYPAL_BANNER_COLORSCHEMEBLACK' => 'black', 'OSC_PAYPAL_BANNER_COLORSCHEMEWHITE' => 'white', - 'OSC_PAYPAL_BANNER_COLORSCHEMEWHITENOBORDER' => 'white, no border', + 'OSC_PAYPAL_BANNER_COLORSCHEMEGRAY' => 'gray', + 'OSC_PAYPAL_BANNER_COLORSCHEMEMONOCHROME' => 'monochrome', + 'OSC_PAYPAL_BANNER_COLORSCHEMEGRAYSCALE' => 'grayscale', 'OSC_PAYPAL_STANDARD_CAPTURE_TIME' => 'PayPal Standard - Capture money', 'OSC_PAYPAL_STANDARD_CAPTURE_TIME_LABEL' => 'A deviating collection of money at the time of the order is only possible for PayPal Standard. All other payment methods (incl. PayPal Express) will be capture immediately.', 'OSC_PAYPAL_STANDARD_CAPTURE_TIME_HELP' => 'Please note! The authorization of an order is valid for three days. It will be refreshed automatically for a maximum of 29 days after ordering. After that, it is no longer possible to capture the money.', diff --git a/views/admin/tpl/oscpaypalconfig.tpl b/views/admin/tpl/oscpaypalconfig.tpl index 5f1fb07c9..30fe32b3e 100644 --- a/views/admin/tpl/oscpaypalconfig.tpl +++ b/views/admin/tpl/oscpaypalconfig.tpl @@ -455,8 +455,14 @@ - + +