Skip to content

Commit

Permalink
Merge branch 'support/1.x/hotfix/1.12.3' into support/1.x/master
Browse files Browse the repository at this point in the history
  • Loading branch information
Nabil Berhouche committed Apr 27, 2021
2 parents c0fa1ea + 6e392b1 commit efdcf65
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 52 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.12.3, 2021-04-27:
- Update 3DS management option description.
- Improve REST API keys configuration display.

1.12.2, 2021-03-09:
- Fix installment information when saving the payment details in the Magento Back Office.
- Use online payment means logos.
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Lyranetwork/Payzen/etc/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!-- Version. -->
<modules>
<Lyranetwork_Payzen>
<version>1.12.2</version>
<version>1.12.3</version>
</Lyranetwork_Payzen>
</modules>

Expand Down Expand Up @@ -500,7 +500,7 @@
<payzen>
<developed_by>Lyra Network</developed_by>
<support_email>[email protected]</support_email>
<plugin_version>1.12.2</plugin_version>
<plugin_version>1.12.3</plugin_version>
<gateway_version>V2</gateway_version>
<cms_identifier>Magento_1.4-1.9</cms_identifier>
<enable_logs>1</enable_logs>
Expand Down
90 changes: 56 additions & 34 deletions app/code/community/Lyranetwork/Payzen/etc/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,20 +201,31 @@
<!-- ================ REST API KEYS. ============== -->
<rest_api_keys translate="label,comment">
<label><![CDATA[REST API KEYS]]></label>
<comment><![CDATA[Configure this section if you are using order operations from Magento Back Office or if you are using &laquo; Embedded payment fields &raquo; mode. <br />REST API keys are available in your PayZen Back Office (menu: Settings > Shops > REST API keys).]]></comment>
<comment><![CDATA[REST API keys are available in your PayZen Back Office (menu: Settings > Shops > REST API keys).]]></comment>
<frontend_model>payzen/adminhtml_system_config_field_sectionTitle</frontend_model>
<sort_order>30</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>0</show_in_website>
<show_in_store>1</show_in_store>
</rest_api_keys>

<rest_desc translate="comment">
<comment><![CDATA[Configure this section if you are using order operations from Magento Back Office or if you are using embedded payment fields or popin modes.]]></comment>
<frontend_type>label</frontend_type>
<frontend_model>payzen/adminhtml_system_config_field_label</frontend_model>
<config_path>payzen/rest_descr</config_path>
<sort_order>31</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</rest_desc>

<rest_private_key_test translate="label">
<label><![CDATA[Test password]]></label>
<frontend_type>obscure</frontend_type>
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
<config_path>payment/payzen/rest_private_key_test</config_path>
<sort_order>31</sort_order>
<sort_order>32</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
Expand All @@ -225,18 +236,39 @@
<frontend_type>obscure</frontend_type>
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
<config_path>payment/payzen/rest_private_key_prod</config_path>
<sort_order>32</sort_order>
<sort_order>33</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</rest_private_key_prod>

<rest_url translate="label,comment">
<label><![CDATA[REST API server URL]]></label>
<frontend_type>text</frontend_type>
<config_path>payment/payzen/rest_url</config_path>
<sort_order>34</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</rest_url>

<rest_embedded_descr translate="comment">
<comment><![CDATA[Configure this section only if you are using embedded payment fields or popin modes.]]></comment>
<frontend_type>label</frontend_type>
<frontend_model>payzen/adminhtml_system_config_field_label</frontend_model>
<config_path>payzen/rest_embedded_descr</config_path>
<sort_order>35</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</rest_embedded_descr>

<rest_public_key_test translate="label">
<label><![CDATA[Public test key]]></label>
<frontend_type>text</frontend_type>
<frontend_model>payzen/adminhtml_system_config_field_sensitive</frontend_model>
<config_path>payment/payzen/rest_public_key_test</config_path>
<sort_order>33</sort_order>
<sort_order>36</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
Expand All @@ -247,7 +279,7 @@
<frontend_type>text</frontend_type>
<frontend_model>payzen/adminhtml_system_config_field_sensitive</frontend_model>
<config_path>payment/payzen/rest_public_key_prod</config_path>
<sort_order>34</sort_order>
<sort_order>37</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
Expand All @@ -258,7 +290,7 @@
<frontend_type>obscure</frontend_type>
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
<config_path>payment/payzen/rest_return_key_test</config_path>
<sort_order>35</sort_order>
<sort_order>38</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
Expand All @@ -269,50 +301,40 @@
<frontend_type>obscure</frontend_type>
<backend_model>adminhtml/system_config_backend_encrypted</backend_model>
<config_path>payment/payzen/rest_return_key_prod</config_path>
<sort_order>36</sort_order>
<sort_order>39</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</rest_return_key_prod>

<rest_url translate="label,comment">
<label><![CDATA[REST API server URL]]></label>
<frontend_type>text</frontend_type>
<config_path>payment/payzen/rest_url</config_path>
<sort_order>37</sort_order>
<rest_notify_url translate="label,comment">
<label><![CDATA[REST API Notification URL]]></label>
<comment><![CDATA[URL to copy into your PayZen Back Office > Settings > Notification rules.<br />In multistore mode, notification URL is the same for all the stores.]]></comment>
<frontend_type>label</frontend_type>
<frontend_model>payzen/adminhtml_system_config_field_notifyUrl</frontend_model>
<config_path>payment/payzen/rest_notify_url</config_path>
<sort_order>40</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</rest_url>
</rest_notify_url>

<static_url translate="label,comment">
<label><![CDATA[JavaScript client URL]]></label>
<frontend_type>text</frontend_type>
<config_path>payment/payzen/static_url</config_path>
<sort_order>38</sort_order>
<sort_order>41</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</static_url>

<rest_notify_url translate="label,comment">
<label><![CDATA[REST API Notification URL]]></label>
<comment><![CDATA[URL to copy into your PayZen Back Office > Settings > Notification rules.<br />In multistore mode, notification URL is the same for all the stores.]]></comment>
<frontend_type>label</frontend_type>
<frontend_model>payzen/adminhtml_system_config_field_notifyUrl</frontend_model>
<config_path>payment/payzen/rest_notify_url</config_path>
<sort_order>39</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</rest_notify_url>

<!-- ================================== Payment page. ================================== -->
<payment_page translate="label">
<label><![CDATA[PAYMENT PAGE]]></label>
<frontend_type>label</frontend_type>
<frontend_model>payzen/adminhtml_system_config_field_sectionTitle</frontend_model>
<sort_order>40</sort_order>
<sort_order>42</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
Expand All @@ -324,7 +346,7 @@
<frontend_type>select</frontend_type>
<source_model>payzen/source_languages</source_model>
<config_path>payment/payzen/language</config_path>
<sort_order>41</sort_order>
<sort_order>43</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
Expand All @@ -339,7 +361,7 @@
<source_model>payzen/source_languages</source_model>
<backend_model>payzen/field_availableLanguages</backend_model>
<config_path>payment/payzen/available_languages</config_path>
<sort_order>42</sort_order>
<sort_order>44</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
Expand All @@ -350,7 +372,7 @@
<comment><![CDATA[The number of days before the bank capture (adjustable in your PayZen Back Office).]]></comment>
<frontend_type>text</frontend_type>
<config_path>payment/payzen/capture_delay</config_path>
<sort_order>43</sort_order>
<sort_order>45</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
Expand All @@ -362,7 +384,7 @@
<frontend_type>select</frontend_type>
<source_model>payzen/source_validationModes</source_model>
<config_path>payment/payzen/validation_mode</config_path>
<sort_order>44</sort_order>
<sort_order>46</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
Expand Down Expand Up @@ -416,7 +438,7 @@

<!-- ================================== 3DS enabling. ================================== -->
<selective_3ds translate="label">
<label><![CDATA[SELECTIVE 3DS]]></label>
<label><![CDATA[CUSTOM 3DS]]></label>
<frontend_type>label</frontend_type>
<frontend_model>payzen/adminhtml_system_config_field_sectionTitle</frontend_model>
<sort_order>60</sort_order>
Expand All @@ -426,8 +448,8 @@
</selective_3ds>

<custgroup_threeds_min_amount translate="label,comment">
<label><![CDATA[Disable 3DS by customer group]]></label>
<comment><![CDATA[Amount below which 3DS will be disabled for each customer group. Needs subscription to selective 3DS option. For more information, refer to the module documentation.]]></comment>
<label><![CDATA[Manage 3DS by customer group]]></label>
<comment><![CDATA[Amount by customer group below which customer could be exempt from strong authentication. Needs subscription to « Selective 3DS1 » or « Frictionless 3DS2 » options. For more information, refer to the module documentation.]]></comment>
<frontend_model>payzen/adminhtml_system_config_field_threedsCustgroupOptions</frontend_model>
<backend_model>payzen/field_custgroupOptions</backend_model>
<config_path>payment/payzen/custgroup_threeds_min_amount</config_path>
Expand Down
10 changes: 6 additions & 4 deletions app/locale/de_DE/Lyranetwork_Payzen.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
"Instant Payment Notification URL","Benachrichtigung-URL"
"URL to copy into your PayZen Back Office > Settings > Notification rules.<br />In multistore mode, notification URL is the same for all the stores.","URL, die Sie in Ihre PayZen Back Office kopieren sollen > Einstellung > Regeln der Benachrichtigungen.<br />Unter Multistore Modus, die URL Bestätigung ist die gleiche für alle Geschäfte."
"REST API KEYS","REST API SCHLÛSSEL"
"Configure this section if you are using order operations from Magento Back Office or if you are using &laquo; Embedded payment fields &raquo; mode. <br />REST API keys are available in your PayZen Back Office (menu: Settings > Shops > REST API keys).","Configure this section if you are using order operations from Magento Back Office or if you are using &laquo; Embedded payment fields &raquo; mode. <br />REST API keys are available in your PayZen Back Office (menu: Settings > Shops > REST API keys)."
"REST API keys are available in your PayZen Back Office (menu: Settings > Shops > REST API keys).","REST API keys are available in your PayZen Back Office (menu: Settings > Shops > REST API keys)."
"Configure this section if you are using order operations from Magento Back Office or if you are using embedded payment fields or popin modes.","Configure this section if you are using order operations from Magento Back Office or if you are using embedded payment fields or popin modes."
"Configure this section only if you are using embedded payment fields or popin modes.","Configure this section only if you are using embedded payment fields or popin modes."
"Test password","Testpasswort"
"Production password","Passwort Produktion"
"Public test key","Öffentlicher Schlüssel (Test)"
Expand Down Expand Up @@ -106,9 +108,9 @@
"Shop name to display on the payment page. Leave blank to use gateway configuration.","Shopbezeichnung zur Anzeige auf der Zahlungsseite. Feld leer lassen, um Schnittstellenkonfiguration zu verwenden."
"Shop URL","Shop-URL"
"Shop URL to display on the payment page. Leave blank to use gateway configuration.","Shop-URL zur Anzeige auf der Zahlungsseite. Feld leer lassen, um Schnittstellenkonfiguration zu verwenden."
"SELECTIVE 3DS","SELEKTIVES 3DS"
"Disable 3DS by customer group","3DS nach Kundengruppe deaktivieren"
"Amount below which 3DS will be disabled for each customer group. Needs subscription to selective 3DS option. For more information, refer to the module documentation.","Betrag, unter dem 3DS für jede Kundengruppe deaktiviert wird. Muss für die Option Selektives 3DS freigeschaltet sein. Weitere Informationen finden Sie in der Moduldokumentation."
"CUSTOM 3DS","CUSTOM 3DS"
"Manage 3DS by customer group","Manage 3DS by customer group"
"Amount by customer group below which customer could be exempt from strong authentication. Needs subscription to « Selective 3DS1 » or « Frictionless 3DS2 » options. For more information, refer to the module documentation.", "Amount by customer group below which customer could be exempt from strong authentication. Needs subscription to « Selective 3DS1 » or « Frictionless 3DS2 » options. For more information, refer to the module documentation."
"RETURN TO SHOP","RÜCKKEHR ZUM LADEN"
"Automatic redirection","Automatische Weiterleitung"
"If enabled, the buyer is automatically redirected to your site at the end of the payment.","Ist diese Einstellung aktiviert, wird der Kunde am Ende des Bezahlvorgangs automatisch auf Ihre Seite weitergeleitet."
Expand Down
Loading

0 comments on commit efdcf65

Please sign in to comment.