Skip to content

Commit

Permalink
Merge branch 'support/1.x.x/release/1.9.1' into support/1.x.x/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@nabil509
nabil509 committed Jul 6, 2018
2 parents d2a0c24 + 1c75b71 commit 0973c3c
Show file tree
Hide file tree
Showing 287 changed files with 345 additions and 295 deletions.
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Abstract.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/Redirect.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/CategoryMapping.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion ...de/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Choozeo/CustgroupOptions.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion ...code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Choozeo/PaymentOptions.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Column/EditableLabel.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Column/Label.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Column/List.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/CtxMode.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/CustgroupOptions.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion ...ode/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Fullcb/CustgroupOptions.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Fullcb/PaymentOptions.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Gift/AddedCards.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Gift/UploadButton.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/InitButton.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/KeyTest.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Label.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Multi/PaymentOptions.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Multiselect.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
6 changes: 3 additions & 3 deletions app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/NotifyUrl.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down Expand Up @@ -36,8 +36,8 @@ public function render(Varien_Data_Form_Element_Abstract $element)
$element->setValue($ipnUrl);

$warnImg = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA) . 'payzen/warn.png';
$comment = '<img src="' . $warnImg . '" style="vertical-align: middle; padding-right: 5px;"/>';
$comment .= '<span style="color: red; display: inline-block; position: absolute; font-weight:bold;">'
$comment = '<img src="' . $warnImg . '" style="vertical-align: top; padding-right: 5px;"/>';
$comment .= '<span style="color: red; display: inline-block; font-weight:bold;">'
. $element->getComment() . '</span>';
$element->setComment($comment);

Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Oney/PaymentOptions.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/SectionTitle.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/ShipOptions.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
41 changes: 41 additions & 0 deletions app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/SignAlgo.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
* This source file is licensed under the Open Software License version 3.0
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* https://opensource.org/licenses/osl-3.0.php
*
* @author Lyra Network (http://www.lyra-network.com/)
* @copyright 2014-2018 Lyra Network and contributors
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @category payment
* @package payzen
*/

/**
* Custom renderer for the signature algorithm field.
*/
class Lyra_Payzen_Block_Adminhtml_System_Config_Field_SignAlgo extends Mage_Adminhtml_Block_System_Config_Form_Field
{
/**
* Render field HTML.
*
* @param Varien_Data_Form_Element_Abstract $element
* @return string
*/
public function render(Varien_Data_Form_Element_Abstract $element)
{
// get configured features
$features = Lyra_Payzen_Helper_Data::$pluginFeatures;
if ($features['shatwo']) {
$comment = preg_replace('#<br /><b>[^<>]+</b>#', '', $element->getComment());
$element->setComment($comment);
}

return parent::render($element);
}
}
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/Standard/UseOney.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion ...ode/community/Lyra/Payzen/Block/Adminhtml/System/Config/Field/ThreedsCustgroupOptions.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Adminhtml/System/Config/Fieldset/Payment.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Choozeo.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Fullcb.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Fullcb/Review.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Gift.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Giropay.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Ideal.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Iframe/Response.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Info.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Multi.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Oneclick/Cart.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Oneclick/Product.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Oneclick/Shipping/Abstract.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Oneclick/Shipping/Address.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Oneclick/Shipping/Method.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Oney.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Oney/Review.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Lyra/Payzen/Block/Paypal.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* PayZen V2-Payment Module version 1.9.0 for Magento 1.4-1.9. Support contact : [email protected].
* PayZen V2-Payment Module version 1.9.1 for Magento 1.4-1.9. Support contact : [email protected].
*
* NOTICE OF LICENSE
*
Expand Down
Loading

0 comments on commit 0973c3c

Please sign in to comment.