diff --git a/app/code/community/Lyra/Payzen/Block/Abstract.php b/app/code/community/Lyra/Payzen/Block/Abstract.php index c9952cb5..dcec6787 100644 --- a/app/code/community/Lyra/Payzen/Block/Abstract.php +++ b/app/code/community/Lyra/Payzen/Block/Abstract.php @@ -1,6 +1,6 @@ setValue($ipnUrl); $warnImg = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA) . 'payzen/warn.png'; - $comment = ''; - $comment .= '' + $comment = ''; + $comment .= '' . $element->getComment() . ''; $element->setComment($comment); diff --git a/app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Oney/PaymentOptions.php b/app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Oney/PaymentOptions.php index 6112358a..7d4f4906 100644 --- a/app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Oney/PaymentOptions.php +++ b/app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Oney/PaymentOptions.php @@ -1,6 +1,6 @@ [^<>]+#', '', $element->getComment()); + $element->setComment($comment); + } + + return parent::render($element); + } +} diff --git a/app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Standard/UseOney.php b/app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Standard/UseOney.php index d0ac927f..8be53fa2 100644 --- a/app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Standard/UseOney.php +++ b/app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Standard/UseOney.php @@ -1,6 +1,6 @@ true, 'acquis' => true, 'restrictmulti' => false, + 'shatwo' => true, 'multi' => true, 'gift' => true, @@ -249,7 +250,7 @@ public function log($message, $level = null) $currentMethod = $this->_getCallerMethod(); $log = ''; - $log .= 'PayZen 1.9.0'; + $log .= 'PayZen 1.9.1'; $log .= ' - ' . $currentMethod; $log .= ' : ' . $message; diff --git a/app/code/community/Lyra/Payzen/Helper/Payment.php b/app/code/community/Lyra/Payzen/Helper/Payment.php index 55437a23..e55012ef 100644 --- a/app/code/community/Lyra/Payzen/Helper/Payment.php +++ b/app/code/community/Lyra/Payzen/Helper/Payment.php @@ -1,6 +1,6 @@ 'Carte cadeau Brice - Sandbox', 'CDGP' => 'Carte Privilège', 'COF3XCB' => '3 fois CB Cofinoga', 'COF3XCB_SB' => '3 fois CB Cofinoga - Sandbox', 'COFINOGA' => 'Carte Be Smart', 'CORA_BLANCHE' => 'Carte Cora Blanche', 'CORA_PREM' => 'Carte Cora Premium', 'CORA_VISA' => 'Carte Cora Visa', 'DINERS' => 'Carte Diners Club', - 'E_CV' => 'E-chèque vacance', 'EDENRED_TR' => 'Ticket Restaurant', 'EDENRED_EC' => 'Ticket EcoCheque', + 'E_CV' => 'E-chèque vacance', 'EDENRED_TR' => 'Ticket Restaurant', 'EDENRED_EC' => 'Ticket EcoCheque', 'EDENRED_TC' => 'Ticket Compliments', 'EPS' => 'eps-Überweisung', 'FULLCB3X' => 'Paiement en 3X avec BNPP PF', 'FULLCB4X' => 'Paiement en 4X avec BNPP PF', 'GIROPAY' => 'Giropay', 'KLARNA' => 'Klarna', 'IDEAL' => 'iDEAL', 'ILLICADO' => 'Carte cadeau Illicado', 'ILLICADO_SB' => 'Carte cadeau Illicado - Sandbox', 'JCB' => 'Carte JCB', 'JOUECLUB_CDX' => 'Carte cadeau Jouéclub', diff --git a/app/code/community/Lyra/Payzen/Model/Api/Currency.php b/app/code/community/Lyra/Payzen/Model/Api/Currency.php index 73804235..dc6a4a84 100644 --- a/app/code/community/Lyra/Payzen/Model/Api/Currency.php +++ b/app/code/community/Lyra/Payzen/Model/Api/Currency.php @@ -1,6 +1,6 @@ rawResponse = Lyra_Payzen_Model_Api_Api::uncharm($params); - $this->certificate = $ctx_mode == 'PRODUCTION' ? $key_prod : $key_test; + $this->certificate = trim(($ctx_mode == 'PRODUCTION') ? $key_prod : $key_test); if (in_array($algo, Lyra_Payzen_Model_Api_Api::$SUPPORTED_ALGOS)) { $this->algo = $algo; @@ -443,6 +443,7 @@ public function getOutputForPlatform($case = '', $extra_message = '', $original_ if (! empty($extra_message)) { $message .= ' ' . $extra_message; } + $message = str_replace("\n", ' ', $message); // set original CMS encoding to convert if necessary response to send to platform diff --git a/app/code/community/Lyra/Payzen/Model/Api/Ws/AuthenticationRequestData.php b/app/code/community/Lyra/Payzen/Model/Api/Ws/AuthenticationRequestData.php index 300a39c9..0204b477 100644 --- a/app/code/community/Lyra/Payzen/Model/Api/Ws/AuthenticationRequestData.php +++ b/app/code/community/Lyra/Payzen/Model/Api/Ws/AuthenticationRequestData.php @@ -1,6 +1,6 @@ _payzenRequest->set('amount', $currency->convertAmountToInteger($amount)); - $this->_payzenRequest->set('contrib', 'Magento1.4-1.9_1.9.0/' . Mage::getVersion() . '/' . PHP_VERSION); + $this->_payzenRequest->set('contrib', 'Magento1.4-1.9_1.9.1/' . Mage::getVersion() . '/' . PHP_VERSION); // set config parameters $configFields = array('site_id', 'key_test', 'key_prod', 'ctx_mode', 'capture_delay', 'validation_mode', diff --git a/app/code/community/Lyra/Payzen/Model/Payment/Choozeo.php b/app/code/community/Lyra/Payzen/Model/Payment/Choozeo.php index e553f25c..309c3c8b 100644 --- a/app/code/community/Lyra/Payzen/Model/Payment/Choozeo.php +++ b/app/code/community/Lyra/Payzen/Model/Payment/Choozeo.php @@ -1,6 +1,6 @@ setReference($order->getCustomerId()); if ($order->getBillingAddress()->getPrefix()) { - $billingDetailsRequest->setTitlte($order->getBillingAddress()->getPrefix()); + $billingDetailsRequest->setTitle($order->getBillingAddress()->getPrefix()); } $billingDetailsRequest->setFirstName($order->getBillingAddress()->getFirstname()); diff --git a/app/code/community/Lyra/Payzen/Model/Resource/Setup.php b/app/code/community/Lyra/Payzen/Model/Resource/Setup.php index 72adff89..74c821d8 100644 --- a/app/code/community/Lyra/Payzen/Model/Resource/Setup.php +++ b/app/code/community/Lyra/Payzen/Model/Resource/Setup.php @@ -1,6 +1,6 @@ - 1.9.0 + 1.9.1 @@ -478,7 +478,7 @@ Lyra Network support@payzen.eu - 1.9.0 + 1.9.1 V2 1 PayZen @@ -487,7 +487,7 @@ 1111111111111111 2222222222222222 TEST - SHA-1 + SHA-256 payzen/payment/check https://secure.payzen.eu/vads-payment/ diff --git a/app/code/community/Lyra/Payzen/etc/system.xml b/app/code/community/Lyra/Payzen/etc/system.xml index 494712e6..9cedfb69 100644 --- a/app/code/community/Lyra/Payzen/etc/system.xml +++ b/app/code/community/Lyra/Payzen/etc/system.xml @@ -1,7 +1,7 @@