Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Color-Codes for Banner #221

Merged
merged 2 commits into from
Oct 5, 2023
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ 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.2] - 2023-??-??
## [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
- [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
- [0007547](https://bugs.oxid-esales.com/view.php?id=7547): PayPal error messages are written into seperate log (/log/paypal/paypal_YYYY-MM-DD.log)

## [2.3.1] - 2023-08-17
Expand Down
2 changes: 1 addition & 1 deletion metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
],
Expand Down
4 changes: 3 additions & 1 deletion tests/Unit/Core/ViewConfigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ public function providerGetPayPalColorScheme(): array
['blue'],
['black'],
['white'],
['white-no-border'],
['gray'],
['monochrome'],
['grayscale'],
];
}
// <-- PSPAYPAL-491
Expand Down
10 changes: 6 additions & 4 deletions views/admin/de/admin_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down
4 changes: 3 additions & 1 deletion views/admin/en/admin_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down
10 changes: 8 additions & 2 deletions views/admin/tpl/oscpaypalconfig.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,14 @@
<option value="white" [{if $config->getPayPalCheckoutBannerColorScheme() == 'white'}]selected[{/if}]>
[{oxmultilang ident="OSC_PAYPAL_BANNER_COLORSCHEMEWHITE"}]
</option>
<option value="white-no-border" [{if $config->getPayPalCheckoutBannerColorScheme() == 'white-no-border'}]selected[{/if}]>
[{oxmultilang ident="OSC_PAYPAL_BANNER_COLORSCHEMEWHITENOBORDER"}]
<option value="gray" [{if $config->getPayPalCheckoutBannerColorScheme() == 'gray'}]selected[{/if}]>
[{oxmultilang ident="OSC_PAYPAL_BANNER_COLORSCHEMEGRAY"}]
</option>
<option value="monochrome" [{if $config->getPayPalCheckoutBannerColorScheme() == 'monochrome'}]selected[{/if}]>
[{oxmultilang ident="OSC_PAYPAL_BANNER_COLORSCHEMEMONOCHROME"}]
</option>
<option value="grayscale" [{if $config->getPayPalCheckoutBannerColorScheme() == 'grayscale'}]selected[{/if}]>
[{oxmultilang ident="OSC_PAYPAL_BANNER_COLORSCHEMEGRAYSCALE"}]
</option>
</select>
</div>
Expand Down