diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d779b0..0f5d1ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +2.6.5, 2023-01-23: +- Bug fix: Fix payment in iframe mode when JavaScript minification is enabled in Magento. +- Update list of supported payment means. +- Update list of supported currencies. + 2.6.4, 2022-11-24: - [embedded] Bug fix: Fix error related to invalid email format when customer checkout as guest. - Minor code fixes. diff --git a/COPYING.md b/COPYING.md index 85532a0..4e488a6 100644 --- a/COPYING.md +++ b/COPYING.md @@ -1,4 +1,4 @@ -Copyright © 2016-2022 Lyra Network. +Copyright © 2016-2023 Lyra Network. PayZen plugin for Magento 2 is licensed under the Open Software License version 3.0 that is bundled with diff --git a/Controller/Plugin/JsExcluder.php b/Controller/Plugin/JsExcluder.php new file mode 100644 index 0000000..f14d75f --- /dev/null +++ b/Controller/Plugin/JsExcluder.php @@ -0,0 +1,25 @@ + 'Cartes Enseignes Partenaires', 'ACCORD_STORE_SB' => 'Cartes Enseignes Partenaires (sandbox)', 'ALINEA' => 'Carte myalinea', 'ALINEA_CDX' => 'Carte Cadeau Alinéa', 'ALINEA_CDX_SB' => 'Carte Cadeau Alinéa (sandbox)', 'ALINEA_SB' => 'Carte myalinea (sandbox)', 'ALIPAY' => 'Alipay', 'ALLOBEBE_CDX' => 'Carte Cadeau Allobébé', - 'ALLOBEBE_CDX_SB' => 'Carte Cadeau Allobébé (sandbox)', 'APETIZ' => 'Apetiz', 'AUCHAN' => 'Carte Auchan', - 'AUCHAN_SB' => 'Carte Auchan (sandbox)', 'AURORE-MULTI' => 'Cpay Aurore', 'BANCONTACT' => 'Bancontact Mistercash', - 'BIZZBEE_CDX' => 'Carte Cadeau Bizzbee', 'BIZZBEE_CDX_SB' => 'Carte Cadeau Bizzbee (sandbox)', 'BOULANGER' => 'Carte b+', + 'ALLOBEBE_CDX_SB' => 'Carte Cadeau Allobébé (sandbox)', 'APETIZ' => 'Apetiz', 'APPLE_PAY' => 'Apple Pay', + 'AUCHAN' => 'Carte Auchan', 'AUCHAN_SB' => 'Carte Auchan (sandbox)', 'AURORE-MULTI' => 'Cpay Aurore', + 'BANCONTACT' => 'Bancontact Mistercash', 'BIZUM' => 'Bizum', 'BIZZBEE_CDX' => 'Carte Cadeau Bizzbee', + 'BIZZBEE_CDX_SB' => 'Carte Cadeau Bizzbee (sandbox)', 'BOULANGER' => 'Carte b+', 'BOULANGER_SB' => 'Carte b+ (sandbox)', 'BRICE_CDX' => 'Carte Cadeau Brice', 'BRICE_CDX_SB' => 'Carte Cadeau Brice (sandbox)', 'BUT' => 'But', 'CA_DO_CARTE' => 'CA DO Carte', 'CABAL' => 'Cabal', 'CARNET' => 'Carnet', 'CASINO' => 'Banque Casino', 'CDGP' => 'Carte Privilège', 'CDISCOUNT' => 'CDiscount', 'CHQ_DEJ' => 'Chèque Déjeuner', 'COF3XCB' => 'Cofinoga 3 fois CB', @@ -226,22 +227,23 @@ public static function getSupportedCardTypes() 'EDENRED_TC' => 'Ticket Compliments', 'EDENRED_TR' => 'Ticket Restaurant', 'ELO' => 'Elo', 'ELV' => 'ELV', 'FRANFINANCE_3X' => 'Paiement en 3 fois', 'FRANFINANCE_4X' => 'Paiement en 4 fois', 'FULLCB3X' => 'Paiement en 3 fois CB', 'FULLCB4X' => 'Paiement en 4 fois CB', 'GEMO_CDX' => 'Carte Cadeau Gémo', 'GEMO_CDX_SB' => 'Carte Cadeau Gémo (sandbox)', - 'GIROPAY' => 'Giropay', 'GOOGLEPAY' => 'Google Pay', 'HIPER' => 'Hiper', 'HIPERCARD' => 'Hipercard', 'IDEAL' => 'iDEAL', + 'GIROPAY' => 'Giropay', 'HIPER' => 'Hiper', 'HIPERCARD' => 'Hipercard', 'IDEAL' => 'iDEAL', 'ILLICADO' => 'Carte Illicado', 'ILLICADO_SB' => 'Carte Illicado (sandbox)', 'IP_WIRE' => 'Virement SEPA', 'IP_WIRE_INST' => 'Virement SEPA Instantané', 'JCB' => 'JCB', 'JOUECLUB_CDX' => 'Carte Cadeau Joué Club', 'JOUECLUB_CDX_SB' => 'Carte Cadeau Joué Club (sandbox)', 'JULES_CDX' => 'Carte Cadeau Jules', - 'JULES_CDX_SB' => 'Carte Cadeau Jules (sandbox)', 'LEROY-MERLIN' => 'Carte Maison Financement', - 'LEROY-MERLIN_SB' => 'Carte Maison Financement (sandbox)', 'MASTERPASS' => 'MasterPass', - 'MC_CORDOBESA' => 'Mastercard Cordobesa', 'MULTIBANCO' => 'Multibanco', 'MYBANK' => 'MyBank', 'NARANJA' => 'Naranja', - 'NORAUTO' => 'Carte Norauto option Financement', 'NORAUTO_SB' => 'Carte Norauto option Financement (sandbox)', - 'ONEY' => 'Paiement en 3 ou 4 fois par CB', 'ONEY_3X_4X' => 'Paiement en 3 ou 4 fois Oney', - 'ONEY_ENSEIGNE' => 'Cartes enseignes Oney', 'ONEY_SANDBOX' => 'Paiement en 3 ou 4 fois par CB (sandbox)', - 'PAYBOX' => 'Paybox', 'PAYDIREKT' => 'Paydirekt', 'PAYPAL' => 'PayPal', + 'JULES_CDX_SB' => 'Carte Cadeau Jules (sandbox)', 'KLARNA' => 'Klarna', 'LECLERC' => 'Carte Reglo', + 'LEROY-MERLIN' => 'Carte Maison Financement', 'LEROY-MERLIN_SB' => 'Carte Maison Financement (sandbox)', + 'MASTERPASS' => 'MasterPass', 'MC_CORDOBESA' => 'Mastercard Cordobesa', 'MULTIBANCO' => 'Multibanco', 'MYBANK' => 'MyBank', + 'NARANJA' => 'Naranja', 'NORAUTO' => 'Carte Norauto option Financement', 'NORAUTO_SB' => 'Carte Norauto option Financement (sandbox)', + 'ONEY' => 'Paiement en 3 ou 4 fois par CB', 'ONEY_10X_12X' => 'Paiement en 10 ou 12 fois Oney', + 'ONEY_3X_4X' => 'Paiement en 3 ou 4 fois Oney', 'ONEY_ENSEIGNE' => 'Cartes enseignes Oney', 'ONEY_PAYLATER' => 'Pay Later Oney', + 'ONEY_SANDBOX' => 'Paiement en 3 ou 4 fois par CB (sandbox)', 'PAYBOX' => 'Paybox', 'PAYDIREKT' => 'Paydirekt', 'PAYPAL' => 'PayPal', 'PAYPAL_SB' => 'PayPal Sandbox', 'PICWIC' => 'Carte Picwic', 'PICWIC_SB' => 'Carte Picwic (sandbox)', 'POSTFINANCE' => 'PostFinance Card', 'POSTFINANCE_EFIN' => 'PostFinance E-Finance', 'PRESTO' => 'Presto', - 'PRZELEWY24' => 'Przelewy24', 'SDD' => 'Prélèvement SEPA', 'SODEXO' => 'Pass Restaurant', 'SOFICARTE' => 'Soficarte', - 'SOFORT_BANKING' => 'Sofort', 'SOROCRED' => 'Sorocred', 'SYGMA' => 'Sygma', 'UNION_PAY' => 'UnionPay', - 'VILLAVERDE' => 'Carte Cadeau VillaVerde', 'VILLAVERDE_SB' => 'Carte Cadeau VillaVerde (sandbox)', 'WECHAT' => 'WeChat Pay' + 'PRZELEWY24' => 'Przelewy24', 'S-MONEY' => 'S-money', 'SCT' => 'Virement SEPA', 'SDD' => 'Prélèvement SEPA', + 'SODEXO' => 'Pass Restaurant', 'SOFICARTE' => 'Soficarte', 'SOFORT_BANKING' => 'Sofort', 'SOROCRED' => 'Sorocred', + 'SYGMA' => 'Sygma', 'TRUFFAUT_CDX' => 'Carte Cadeau Truffaut', 'UNION_PAY' => 'UnionPay', 'VILLAVERDE' => 'Carte Cadeau VillaVerde', + 'VILLAVERDE_SB' => 'Carte Cadeau VillaVerde (sandbox)', 'WECHAT' => 'WeChat Pay' ); } diff --git a/Model/Api/Form/Request.php b/Model/Api/Form/Request.php index 083d67e..7699e20 100644 --- a/Model/Api/Form/Request.php +++ b/Model/Api/Form/Request.php @@ -144,6 +144,9 @@ public function __construct($encoding = 'UTF-8') $this->addField('vads_cust_status', 'Customer status (private or company)', '#^PRIVATE|COMPANY$#u', false, 7); $this->addField('vads_cust_title', 'Customer title', '#^' . $ans . '{0,63}$#u', false, 63); $this->addField('vads_cust_zip', 'Customer zip code', $an63, false, 63); + $this->addField('vads_cust_national_id', 'Customer national id', $ans255); + $this->addField('vads_cust_address_number', 'Customer address number', '#^' . $ans . '{0,64}$#u', false, 64); + $this->addField('vads_cust_district', 'Customer district', $ans127, false, 127); $this->addField('vads_cvv', 'Card verification number', '#^\d{3,4}$#u'); $this->addField('vads_expiry_month', 'Month of card expiration', '#^\d[0-2]{1}$#u'); $this->addField('vads_expiry_year', 'Year of card expiration', '#^20[0-9]{2}$#u'); @@ -693,7 +696,7 @@ public function getRequestFieldsArray($for_log = false, $escape = true) { $fields = $this->getRequestFields(); - $sensitive_data = array('vads_card_number', 'vads_cvv', 'vads_expiry_month', 'vads_expiry_year'); + $sensitive_data = array('vads_card_number', 'vads_cvv', 'vads_expiry_month', 'vads_expiry_year', 'vads_cust_national_id'); $result = array(); foreach ($fields as $field) { diff --git a/composer.json b/composer.json index b6937a4..4c14446 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "php" : "~7|~8" }, "type" : "magento2-module", - "version" : "2.6.4", + "version" : "2.6.5", "license" : "OSL-3.0", "autoload" : { "files" : [ diff --git a/etc/config.xml b/etc/config.xml index 718cfe0..ad9d6a7 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -25,7 +25,7 @@ - 2.6.4 + 2.6.5 V2 Magento_2.x 1 diff --git a/etc/di.xml b/etc/di.xml index 15b9871..92d04bb 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -37,4 +37,8 @@ + + + + \ No newline at end of file diff --git a/view/frontend/templates/payment/redirect.phtml b/view/frontend/templates/payment/redirect.phtml index de37ef7..a1de177 100644 --- a/view/frontend/templates/payment/redirect.phtml +++ b/view/frontend/templates/payment/redirect.phtml @@ -24,14 +24,10 @@ \ No newline at end of file