diff --git a/README.md b/README.md index 0963744..ecf6347 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,11 @@ If you are using a Content Security Policy (CSP) you must include different Unze ``` composer require unzerdev/oxid7 ``` +##### 2. Execute migration script to add database field OXUNZERPAYORDERNR to table oxorder +``` +/vendor/bin/oe-eshop-db_migrate migrations:migrate +``` + ##### 2. Provide write access to /var/ directory during execution ## Support diff --git a/translations/de/unzerpayment_lang.php b/translations/de/unzerpayment_lang.php index 87e138a..612490a 100644 --- a/translations/de/unzerpayment_lang.php +++ b/translations/de/unzerpayment_lang.php @@ -13,7 +13,7 @@ 'UNZER_PAYMENT_METHODNAME_GOOGLEPAY' => 'Google Pay', 'UNZER_PAYMENT_METHODNAME_IDEAL' => 'iDEAL', 'UNZER_PAYMENT_METHODNAME_KLARNA' => 'Klarna', - 'UNZER_PAYMENT_METHODNAME_OPENBANKING_PIS' => 'Direktüberweisung', + 'UNZER_PAYMENT_METHODNAME_OPENBANKING_PIS' => 'Direktüberweisung', 'UNZER_PAYMENT_METHODNAME_PAYPAL' => 'PayPal', 'UNZER_PAYMENT_METHODNAME_PAYU' => 'PayU', 'UNZER_PAYMENT_METHODNAME_POST_FINANCE_CARD' => 'PostFinance Card', @@ -29,11 +29,12 @@ 'UNZER_PAYMENT_METHODNAME_WERO' => 'Wero', 'UNZER_PAYMENT_METHODNAME_WECHATPAY' => 'WeChat Pay', - 'UNZER_PLEASE_TRANSFER' => 'Bitte überweisen Sie den Betrag in Höhe von %s %s auf das folgende Konto:', + 'UNZER_PLEASE_TRANSFER' => 'Bitte überweisen Sie den Betrag in Höhe von %s %s auf das folgende Konto:', 'UNZER_HOLDER' => 'Kontoinhaber', 'UNZER_IBAN' => 'IBAN', 'UNZER_BIC' => 'BIC', 'UNZER_PLEASE_USE_DESCRIPTOR' => 'Bitte nutzen Sie diese Identifikationsnummer als Verwendungszweck', + 'UNZER_PAYMENT_DETAILS' => 'Zahlungsdaten für Ihre Bestellung', -]; \ No newline at end of file +]; diff --git a/translations/en/unzerpayment_lang.php b/translations/en/unzerpayment_lang.php index 69d31a3..2dc31e2 100644 --- a/translations/en/unzerpayment_lang.php +++ b/translations/en/unzerpayment_lang.php @@ -34,5 +34,6 @@ 'UNZER_IBAN' => 'IBAN', 'UNZER_BIC' => 'BIC', 'UNZER_PLEASE_USE_DESCRIPTOR' => 'Please use only this identification number as the descriptor', + 'UNZER_PAYMENT_DETAILS' => 'Payment details for your order', -]; \ No newline at end of file +]; diff --git a/views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig b/views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig index 39970c6..5fa3cb1 100644 --- a/views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig +++ b/views/twig/extensions/themes/default/page/checkout/inc/payment_other.html.twig @@ -1,18 +1,30 @@
- - + + + + {% if paymentmethod.getDynValues() or paymentmethod.oxpayments__oxlongdesc.value|striptags|trim %} +
+ {% for value in paymentmethod.getDynValues() %} +
+ + +
+ {% endfor %} + + {% block checkout_payment_longdesc %} + {% if paymentmethod.oxpayments__oxlongdesc.value|striptags|trim %} +
+ {{ paymentmethod.oxpayments__oxlongdesc.value|raw }} +
+ {% endif %} + {% endblock %} +
+ {% endif %}
-
- {% block checkout_payment_longdesc %} - {% if paymentmethod.oxpayments__oxlongdesc.value|striptags|trim %} -
- {{ paymentmethod.oxpayments__oxlongdesc.getRawValue() }} -
- {% endif %} - {% endblock %} -
-
\ No newline at end of file + diff --git a/views/twig/extensions/themes/default/page/checkout/thankyou.html.twig b/views/twig/extensions/themes/default/page/checkout/thankyou.html.twig index 904eb2c..aa53dca 100644 --- a/views/twig/extensions/themes/default/page/checkout/thankyou.html.twig +++ b/views/twig/extensions/themes/default/page/checkout/thankyou.html.twig @@ -2,13 +2,14 @@ {% set sModuleId = '@' ~ constant('\\Unzer\\UnzerPayment\\Constants\\Constants::MODULE_ID') %} -{% block checkout_thankyou_info %} +{% block checkout_thankyou_payment_info %} {% if unzerPaymentId is defined %}

Unzer Payment-ID: {{ unzerPaymentId }}
Unzer Short-ID: {{ unzerShortId }}

+
{{ translate({ ident: "UNZER_PAYMENT_DETAILS" }) }}
{% endif %} {% if needsUnzerPaymentInfo is defined %} @@ -17,4 +18,4 @@ {{ parent() }} -{% endblock %} \ No newline at end of file +{% endblock %}