Revert "Additional information for pseudo shipping cost for PayPal Ex…

…press O7 Twig" This reverts commit 5cb6a14.
OXID-eSales · Dec 10, 2024 · f656716 · f656716
1 parent 5cb6a14
commit f656716
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/views/de/admin_translations.php b/views/de/admin_translations.php
@@ -264,7 +264,6 @@
     '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
@@ -262,9 +262,8 @@
                                                         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_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_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_ORDER_MAIN_TRACKCARRIER_COUNTRY'    => 'Tracking Carrier (Country)',
     'OSC_PAYPAL_ORDER_MAIN_TRACKCARRIER_PROVIDER'   => 'Tracking Carrier (Provider)',
@@ -276,8 +275,8 @@
                                                         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.',
 
-    'OSC_PAYPAL_CUSTOM_ID_CONTENTS_TITLE'           => 'PayPal custom id field contents',
-    'OSC_PAYPAL_CUSTOM_ID_CONTENTS_DESC'            => 'PayPal custom id field will be JSON encoded string with order number, shop version and the PayPal module version.',
+    'OSC_PAYPAL_CUSTOM_ID_CONTENTS_TITLE'            => 'PayPal custom id field contents',
+    'OSC_PAYPAL_CUSTOM_ID_CONTENTS_DESC'             => 'PayPal custom id field will be JSON encoded string with order number, shop version and the PayPal module version.',
 ];
diff --git a/views/twig/admin/oscpaypalconfig.html.twig b/views/twig/admin/oscpaypalconfig.html.twig
@@ -504,9 +504,6 @@
                                 <div class="controls">
                                     <input type="text" id="shippingExpress" class="form-control" name="conf[oscPayPalDefaultShippingPriceExpress]" value="{{ config.getDefaultShippingPriceForExpress()|number_format(2, '.', ' ') }}" />
                                     <span class="help-block">{{ translate({ ident: "OSC_PAYPAL_EXPRESS_SHIPPING_DESC" }) }}</span>
-                                    <br>
-                                    <br>
-                                    <span class="help-block">{{ translate({ ident: "OSC_PAYPAL_EXPRESS_SHIPPING_DESC_EXTENDED" }) }}</span>
                                 </div>
                             </div>
                         </div>