From 6fc1c6ab09b27b31b91061cf96e4b39681b92c8c Mon Sep 17 00:00:00 2001 From: Bartosz Sosnowski Date: Tue, 10 Dec 2024 14:49:25 +0100 Subject: [PATCH 1/2] Additional information for pseudo shipping cost for PayPal Express --- views/de/admin_translations.php | 1 + views/en/admin_translations.php | 7 ++++--- views/smarty/admin/oscpaypalconfig.tpl | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/views/de/admin_translations.php b/views/de/admin_translations.php index 5d3fe6485..21d79006f 100644 --- a/views/de/admin_translations.php +++ b/views/de/admin_translations.php @@ -264,6 +264,7 @@ 'HELP_OSC_PAYPAL_STARTTIME_CLEANUP_ORDERS' => 'Wie alt müssen nicht beendete Bestellungen sein, damit sie frühestens automatisch storniert werden (in Minuten)?', 'OSC_PAYPAL_EXPRESS_SHIPPING_TITLE' => 'Pseudoversandkosten für PayPal Express', 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'Die hier eingegebenen Pseudeversandkosten werden verwendet, wenn die Shopoption “Versandkosten auch dann berechnen, wenn der Kunde noch nicht eingeloggt ist” nicht aktiviert ist.', + 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC_EXTENDED' => 'Wenn Sie anstelle der Pseudo-Versandkosten für noch nicht angemeldete Benutzer mit PayPal Express die standardmäßige Versandkostenberechnung verwenden möchten, aktivieren Sie die Option `Standardversandkosten berechnen, wenn Benutzer noch nicht angemeldet sind` in den Mastereinstellungen | Einstellungen-Tab | Abschnitt Sonstige Einstellungen.', 'OSC_PAYPAL_ORDER_MAIN_TRACKCARRIER_COUNTRY' => 'Versanddienstleister (Land)', 'OSC_PAYPAL_ORDER_MAIN_TRACKCARRIER_PROVIDER' => 'Versanddienstleister (Anbieter)', 'OSC_PAYPAL_TRACKCARRIER_GLOBAL' => 'weltweit', diff --git a/views/en/admin_translations.php b/views/en/admin_translations.php index 0322f804e..6e0df89cf 100644 --- a/views/en/admin_translations.php +++ b/views/en/admin_translations.php @@ -262,8 +262,9 @@ cancel manually.', 'OSC_PAYPAL_STARTTIME_CLEANUP_ORDERS' => 'Start time for automatic cancellation', 'HELP_OSC_PAYPAL_STARTTIME_CLEANUP_ORDERS' => 'How old do not finished orders have to be before they are automatically canceled (in minutes)?', - 'OSC_PAYPAL_EXPRESS_SHIPPING_TITLE' => 'Pseudo shipping costs for PayPal Express', - 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'The shipping costs entered here are used if the store option "Calculate default Shipping costs when User is not logged in yet” in not activated.', + 'OSC_PAYPAL_EXPRESS_SHIPPING_TITLE' => 'Pseudo shipping costs for PayPal Express', + 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'The shipping costs entered here are used if the store option "Calculate default Shipping costs when User is not logged in yet” in not activated.', + 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC_EXTENDED' => 'If You want to use standard shipping cost calculation instead of pseudo shipping cost for not yet logged in users with PayPal Express please check `Calculate default Shipping costs when User is not logged in yet` option in Master settings | Settings tab | Other settings section.', 'OSC_PAYPAL_ORDER_MAIN_TRACKCARRIER_COUNTRY' => 'Tracking Carrier (Country)', 'OSC_PAYPAL_ORDER_MAIN_TRACKCARRIER_PROVIDER' => 'Tracking Carrier (Provider)', @@ -275,5 +276,5 @@ Enable purchase processing. With their saved payment details, customers can make repeat purchases with just a few clicks. This can be for you mean higher checkout conversion.', - 'OSC_PAYPAL_INSTALLPROCESS_FAILED' => 'Because the module was not installed correctly via Composer, errors occurred during the (de)activation of the module. Please reinstall the module via composer and repeat the process.', + 'OSC_PAYPAL_INSTALLPROCESS_FAILED' => 'Because the module was not installed correctly via Composer, errors occurred during the (de)activation of the module. Please reinstall the module via composer and repeat the process.', ]; diff --git a/views/smarty/admin/oscpaypalconfig.tpl b/views/smarty/admin/oscpaypalconfig.tpl index 6c65b685e..8c1ed85ee 100644 --- a/views/smarty/admin/oscpaypalconfig.tpl +++ b/views/smarty/admin/oscpaypalconfig.tpl @@ -529,6 +529,9 @@
[{oxmultilang ident="OSC_PAYPAL_EXPRESS_SHIPPING_DESC"}] +
+
+ [{oxmultilang ident="OSC_PAYPAL_EXPRESS_SHIPPING_DESC_EXTENDED"}]
From 1dfc669681fd6e057a4d965a85dc1d2d50885801 Mon Sep 17 00:00:00 2001 From: Mario Lorenz Date: Fri, 13 Dec 2024 16:00:22 +0100 Subject: [PATCH 2/2] optimize translation --- CHANGELOG.md | 1 + views/de/admin_translations.php | 2 +- views/en/admin_translations.php | 3 +-- views/smarty/admin/oscpaypalconfig.tpl | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36913fad8..bc4c25a02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - [0007666](https://bugs.oxid-esales.com/view.php?id=7666): Fix: Price surcharges on the detail page for selection lists are not taken into account - [0007695](https://bugs.oxid-esales.com/view.php?id=7695): Fix: if DeliverySet is set in Frontend, then do not add any PseudoDeliveryCosts for PPExpress - add possibility to ignore cached tokens. It helps e.g. for webhook registration +- [0007695](https://bugs.oxid-esales.com/view.php?id=7695): Explain better Pseudo delivery costs ### NEW - PayPal-Request-Id based on serialized body, no extra PayPal-Request-Id necessary anymore diff --git a/views/de/admin_translations.php b/views/de/admin_translations.php index 21d79006f..3971bcd6a 100644 --- a/views/de/admin_translations.php +++ b/views/de/admin_translations.php @@ -263,7 +263,7 @@ 'OSC_PAYPAL_STARTTIME_CLEANUP_ORDERS' => 'Startzeit für automatisches Stornieren', 'HELP_OSC_PAYPAL_STARTTIME_CLEANUP_ORDERS' => 'Wie alt müssen nicht beendete Bestellungen sein, damit sie frühestens automatisch storniert werden (in Minuten)?', 'OSC_PAYPAL_EXPRESS_SHIPPING_TITLE' => 'Pseudoversandkosten für PayPal Express', - 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'Die hier eingegebenen Pseudeversandkosten werden verwendet, wenn die Shopoption “Versandkosten auch dann berechnen, wenn der Kunde noch nicht eingeloggt ist” nicht aktiviert ist.', + 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'PayPal Express benötigt für die Autorisierung des Warenkorbbetrages Versandkosten. Wenn ein Kunde sich im Shop weder eingeloggt noch seine Versandadresse angegeben hat, kann der Shop standardmäßig noch keine Versandkosten berechen. In den Shopeinstellungen (Stammdaten > Grundeinstellungen > Reiter Einstellungen > Abschnitt weitere Einstellungen) gibt es eine Option "Versandkosten auch dann berechnen, wenn der Kunde noch nicht eingeloggt ist". Damit kann OXID versuchen die Versandkosten für die Standardfälle zu ermitteln. Wenn man diese Option nicht nutzen möchte, besteht hier als letzte Möglichkeit Pseudoversandkosten zu hinterlegen. Die sollten Ihren meißt genutzten Versandkosten am nächsten kommen. Sobald sich der Kunde im Checkout befindet und seine Lieferadresse sowie seine gewünschte Versandart dem Shop bekannt sind, werden die tatsächlichen Versandkosten berechnet. Diese überschreiben alle vorher genutzten "Hilfs-"Versandkosten.', 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC_EXTENDED' => 'Wenn Sie anstelle der Pseudo-Versandkosten für noch nicht angemeldete Benutzer mit PayPal Express die standardmäßige Versandkostenberechnung verwenden möchten, aktivieren Sie die Option `Standardversandkosten berechnen, wenn Benutzer noch nicht angemeldet sind` in den Mastereinstellungen | Einstellungen-Tab | Abschnitt Sonstige Einstellungen.', 'OSC_PAYPAL_ORDER_MAIN_TRACKCARRIER_COUNTRY' => 'Versanddienstleister (Land)', 'OSC_PAYPAL_ORDER_MAIN_TRACKCARRIER_PROVIDER' => 'Versanddienstleister (Anbieter)', diff --git a/views/en/admin_translations.php b/views/en/admin_translations.php index 6e0df89cf..bd0b36405 100644 --- a/views/en/admin_translations.php +++ b/views/en/admin_translations.php @@ -263,8 +263,7 @@ 'OSC_PAYPAL_STARTTIME_CLEANUP_ORDERS' => 'Start time for automatic cancellation', 'HELP_OSC_PAYPAL_STARTTIME_CLEANUP_ORDERS' => 'How old do not finished orders have to be before they are automatically canceled (in minutes)?', 'OSC_PAYPAL_EXPRESS_SHIPPING_TITLE' => 'Pseudo shipping costs for PayPal Express', - 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'The shipping costs entered here are used if the store option "Calculate default Shipping costs when User is not logged in yet” in not activated.', - 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC_EXTENDED' => 'If You want to use standard shipping cost calculation instead of pseudo shipping cost for not yet logged in users with PayPal Express please check `Calculate default Shipping costs when User is not logged in yet` option in Master settings | Settings tab | Other settings section.', + 'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'PayPal Express requires shipping costs to authorize the shopping cart amount. If a customer has neither logged in to the shop nor provided their shipping address, the shop cannot calculate shipping costs by default. In the shop settings (Master Settings > Core Settings > Tab Settings > Section Other Settings ) there is an option "Calculate default Shipping costs when User is not logged in yet". This allows OXID to try to calculate the shipping costs for standard cases. If you do not want to use this option, the last option is to enter pseudo shipping costs. These should be as close to the shipping costs you use most often. As soon as the customer is in the checkout and their delivery address and desired shipping method are known to the shop, the actual shipping costs are calculated. These overwrite all previously used "auxiliary" shipping costs.', 'OSC_PAYPAL_ORDER_MAIN_TRACKCARRIER_COUNTRY' => 'Tracking Carrier (Country)', 'OSC_PAYPAL_ORDER_MAIN_TRACKCARRIER_PROVIDER' => 'Tracking Carrier (Provider)', diff --git a/views/smarty/admin/oscpaypalconfig.tpl b/views/smarty/admin/oscpaypalconfig.tpl index 8c1ed85ee..6c65b685e 100644 --- a/views/smarty/admin/oscpaypalconfig.tpl +++ b/views/smarty/admin/oscpaypalconfig.tpl @@ -529,9 +529,6 @@
[{oxmultilang ident="OSC_PAYPAL_EXPRESS_SHIPPING_DESC"}] -
-
- [{oxmultilang ident="OSC_PAYPAL_EXPRESS_SHIPPING_DESC_EXTENDED"}]