-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'support/1.x/hotfix/1.11.3' into support/1.x/master
- Loading branch information
Showing
184 changed files
with
843 additions
and
219 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
...unity/Lyranetwork/Payzen/Block/Adminhtml/System/Config/Field/Choozeo/CustgroupOptions.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<?php | ||
/** | ||
* Copyright © Lyra Network. | ||
* This file is part of PayZen plugin for Magento. See COPYING.md for license details. | ||
* | ||
* @author Lyra Network (https://www.lyra.com/) | ||
* @copyright Lyra Network | ||
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) | ||
*/ | ||
|
||
/** | ||
* Custom renderer for the customer group options field. | ||
*/ | ||
class Lyranetwork_Payzen_Block_Adminhtml_System_Config_Field_Choozeo_CustgroupOptions | ||
extends Lyranetwork_Payzen_Block_Adminhtml_System_Config_Field_CustgroupOptions | ||
{ | ||
public function __construct() | ||
{ | ||
parent::__construct(); | ||
|
||
$this->_default = array('amount_min' => '135', 'amount_max' => '2000'); | ||
} | ||
} |
93 changes: 93 additions & 0 deletions
93
...mmunity/Lyranetwork/Payzen/Block/Adminhtml/System/Config/Field/Choozeo/PaymentOptions.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
<?php | ||
/** | ||
* Copyright © Lyra Network. | ||
* This file is part of PayZen plugin for Magento. See COPYING.md for license details. | ||
* | ||
* @author Lyra Network (https://www.lyra.com/) | ||
* @copyright Lyra Network | ||
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) | ||
*/ | ||
|
||
/** | ||
* Custom renderer for the Choozeo payment options field. | ||
*/ | ||
class Lyranetwork_Payzen_Block_Adminhtml_System_Config_Field_Choozeo_PaymentOptions | ||
extends Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract | ||
{ | ||
public function __construct() | ||
{ | ||
$this->addColumn( | ||
'label', | ||
array( | ||
'label' => Mage::helper('payzen')->__('Label'), | ||
'style' => 'width: 260px;', | ||
'renderer' => new Lyranetwork_Payzen_Block_Adminhtml_System_Config_Field_Column_Label | ||
) | ||
); | ||
$this->addColumn( | ||
'amount_min', | ||
array( | ||
'label' => Mage::helper('payzen')->__('Minimum amount'), | ||
'style' => 'width: 210px;' | ||
) | ||
); | ||
$this->addColumn( | ||
'amount_max', | ||
array( | ||
'label' => Mage::helper('payzen')->__('Maximum amount'), | ||
'style' => 'width: 210px;' | ||
) | ||
); | ||
|
||
$this->_addAfter = false; | ||
|
||
parent::__construct(); | ||
|
||
$this->setTemplate('payzen/field/array.phtml'); | ||
} | ||
|
||
/** | ||
* Obtain existing data from form element. | ||
* | ||
* Each row will be instance of Varien_Object | ||
* | ||
* @return array | ||
*/ | ||
public function getArrayRows() | ||
{ | ||
/** | ||
* @var array[string][string] $options | ||
*/ | ||
$options = array( | ||
'EPNF_3X' => 'Choozeo 3X CB', | ||
'EPNF_4X' => 'Choozeo 4X CB' | ||
); | ||
|
||
$savedOptions = $this->getElement()->getValue(); | ||
if (! is_array($savedOptions)) { | ||
$savedOptions = array(); | ||
} | ||
|
||
foreach ($savedOptions as $id => $savedOption) { | ||
if (key_exists($savedOption['code'], $options)) { | ||
$savedOptions[$id]['label'] = $options[$savedOption['code']]; | ||
unset($options[$savedOption['code']]); | ||
} | ||
} | ||
|
||
// Add not saved yet groups. | ||
foreach ($options as $code => $label) { | ||
$option = array( | ||
'code' => $code, | ||
'label' => $label, | ||
'amount_min' => '', | ||
'amount_max' => '' | ||
); | ||
|
||
$savedOptions[uniqid('_' . $code . '_')] = $option; | ||
} | ||
|
||
$this->getElement()->setValue($savedOptions); | ||
return parent::getArrayRows(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
<?php | ||
/** | ||
* Copyright © Lyra Network. | ||
* This file is part of PayZen plugin for Magento. See COPYING.md for license details. | ||
* | ||
* @author Lyra Network (https://www.lyra.com/) | ||
* @copyright Lyra Network | ||
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) | ||
*/ | ||
|
||
class Lyranetwork_Payzen_Block_Choozeo extends Lyranetwork_Payzen_Block_Abstract | ||
{ | ||
protected $_model = 'choozeo'; | ||
|
||
protected function _construct() | ||
{ | ||
parent::_construct(); | ||
$this->setTemplate('payzen/choozeo.phtml'); | ||
} | ||
|
||
public function getAvailableOptions() | ||
{ | ||
$amount = $this->getMethod()->getInfoInstance()->getQuote()->getBaseGrandTotal(); | ||
return $this->_getModel()->getAvailableOptions($amount); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/AuthenticationRequestData.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/AuthenticationResultData.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/AuthorizationResponse.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/BillingDetailsRequest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/BillingDetailsResponse.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/CancelCapturedPayment.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/CancelCapturedPaymentResponse.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/CancelCapturedPaymentResult.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/CancelPayment.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/CancelPaymentResponse.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
2 changes: 1 addition & 1 deletion
2
app/code/community/Lyranetwork/Payzen/Model/Api/Ws/CancelPaymentResult.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?php | ||
/** | ||
* PayZen V2-Payment Module version 1.11.2 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* PayZen V2-Payment Module version 1.11.3 for Magento 1.4-1.9. Support contact : [email protected]. | ||
* | ||
* @category Payment | ||
* @package Payzen | ||
|
Oops, something went wrong.