Version Notes
-- 20151014 - Updated for multiple shipping address not allowed.
-- 20150826 - Update for bug for gift cards
-- 20150815 - correction for points
-- 20150812 - update for 64 bit cpu rounding issue
-- 20150806 - corrected issue with ancilary fees and points system. - version 0.4.6
-- Undated
Implements Interac payments feature.
Download this release
Release Info
Developer | Shane Harper |
Extension | 666999 |
Version | 0.5.1 |
Comparing to | |
See all releases |
Code changes from version 0.4.5 to 0.5.1
- app/code/community/Demac/Optimal/Block/Customer/Cards.php +0 -6
- app/code/community/Demac/Optimal/Model/Hosted/Exception.php +0 -6
- app/code/community/Demac/Optimal/Test/Model/Observer.php +0 -9
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Errorcode.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Errorcode/Edit.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Errorcode/Edit/Form.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Errorcode/Grid.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk/Edit.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk/Edit/Form.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk/Edit/Tab/Form.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk/Edit/Tabs.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk/Grid.php +1 -1
- app/code/community/Op/Netbanx/Block/Customer/Cards.php +6 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Customer/Cards/Form.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Customer/Cards/Grid.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Form/Creditcard.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Info/Creditcard.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Navigation.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Threat.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Helper/Data.php +6 -6
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Client/Abstract.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Config/Mode.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Config/Status.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Config/Transaction.php +3 -3
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Creditcard.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Creditcard/Client.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Errorcode.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Hosted/Client.php +5 -5
- app/code/community/Op/Netbanx/Model/Hosted/Exception.php +6 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Merchant/Customer.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Method/Hosted.php +21 -9
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Creditcard.php +4 -4
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Creditcard/Collection.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Errorcode.php +2 -2
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Errorcode/Collection.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Merchant/Customer.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Merchant/Customer/Collection.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Profile.php +3 -3
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Profile/Collection.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Risk.php +2 -2
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Risk/Collection.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Observer.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Profile.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Profile/Client.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Resource/Mysql4/Setup.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Risk.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Sales/Order.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Source/Cctype.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Web/Client.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Test/Model/Hosted/Client.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/Test/Model/Method/Hosted.php +1 -1
- app/code/community/Op/Netbanx/Test/Model/Observer.php +9 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/controllers/Adminhtml/ErrorcodesController.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/controllers/Adminhtml/ThreatController.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/controllers/Frontend/OptimalController.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/controllers/HandlerController.php +1 -1
- app/code/community/{Demac/Optimal → Op/Netbanx}/data/optimal_setup/csv/common-codes-0.3.3.csv +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/data/optimal_setup/csv/webservices-codes-0.3.3.csv +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/data/optimal_setup/data-upgrade-0.3.4-0.3.5.php +0 -0
- app/code/community/Op/Netbanx/etc/CHANGELOG.txt +37 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/etc/adminhtml.xml +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/etc/config.xml +17 -17
- app/code/community/{Demac/Optimal → Op/Netbanx}/etc/system.xml +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.1.1.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.0.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.1.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.2.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.3.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.4.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.5.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.6.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.7.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.9.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.3.5.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.1.1.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.0.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.1.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.2.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.3.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.4.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.5.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.6.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.7.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.9.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.3.5.php +24 -8
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-upgrade-0.1.1-0.2.7.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-upgrade-0.4.1-0.4.2.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-upgrade-0.4.3-0.4.4.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.1.1-0.2.7.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.2.9-0.3.0.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.3.1-0.3.2.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.3.4-0.3.5.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.3.7-0.3.8.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.4.1-0.4.2.php +0 -0
- app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.4.3-0.4.4.php +0 -0
- app/etc/modules/{Demac_Optimal.xml → Op_Netbanx.xml} +2 -2
- package.xml +19 -8
app/code/community/Demac/Optimal/Block/Customer/Cards.php
DELETED
@@ -1,6 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
|
3 |
-
class Demac_Optimal_Block_Customer_Cards extends Mage_Core_Block_Template
|
4 |
-
{
|
5 |
-
|
6 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Demac/Optimal/Model/Hosted/Exception.php
DELETED
@@ -1,6 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
|
3 |
-
class Demac_Optimal_Model_Hosted_Exception extends Mage_Core_Exception
|
4 |
-
{
|
5 |
-
//
|
6 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Demac/Optimal/Test/Model/Observer.php
DELETED
@@ -1,9 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
|
3 |
-
class Demac_Optimal_Test_Model_Observer extends EcomDev_PHPUnit_Test_Case
|
4 |
-
{
|
5 |
-
public function prepareOrderData()
|
6 |
-
{
|
7 |
-
|
8 |
-
}
|
9 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Errorcode.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
protected function _construct()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Block_Adminhtml_Errorcode extends Mage_Adminhtml_Block_Widget_Grid_Container
|
4 |
{
|
5 |
protected function _construct()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Errorcode/Edit.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Block_Adminhtml_Errorcode_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Errorcode/Edit/Form.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
protected function _prepareForm()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Block_Adminhtml_Errorcode_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
|
4 |
{
|
5 |
protected function _prepareForm()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Errorcode/Grid.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
protected function _prepareCollection()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Block_Adminhtml_Errorcode_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
4 |
{
|
5 |
protected function _prepareCollection()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk.php
RENAMED
@@ -6,7 +6,7 @@
|
|
6 |
* Date: 9/11/13
|
7 |
* Time: 3:30 PM
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
public function __construct()
|
12 |
{
|
6 |
* Date: 9/11/13
|
7 |
* Time: 3:30 PM
|
8 |
*/
|
9 |
+
class Op_Netbanx_Block_Adminhtml_Risk extends Mage_Adminhtml_Block_Widget_Grid_Container
|
10 |
{
|
11 |
public function __construct()
|
12 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk/Edit.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
public function __construct()
|
13 |
{
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Block_Adminhtml_Risk_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
|
11 |
{
|
12 |
public function __construct()
|
13 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk/Edit/Form.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
protected function _prepareForm()
|
13 |
{
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Block_Adminhtml_Risk_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
|
11 |
{
|
12 |
protected function _prepareForm()
|
13 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk/Edit/Tab/Form.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
protected function _prepareForm()
|
13 |
{
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Block_Adminhtml_Risk_Edit_Tab_Form extends Mage_Adminhtml_Block_Widget_Form
|
11 |
{
|
12 |
protected function _prepareForm()
|
13 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk/Edit/Tabs.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
public function __construct()
|
13 |
{
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Block_Adminhtml_Risk_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
|
11 |
{
|
12 |
public function __construct()
|
13 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Adminhtml/Risk/Grid.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
public function __construct()
|
13 |
{
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Block_Adminhtml_Risk_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
11 |
{
|
12 |
public function __construct()
|
13 |
{
|
app/code/community/Op/Netbanx/Block/Customer/Cards.php
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
class Op_Netbanx_Block_Customer_Cards extends Mage_Core_Block_Template
|
4 |
+
{
|
5 |
+
|
6 |
+
}
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Customer/Cards/Form.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
/**
|
6 |
* Retrieve credit card expire months
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Block_Customer_Cards_Form extends Mage_Core_Block_Template
|
4 |
{
|
5 |
/**
|
6 |
* Retrieve credit card expire months
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Customer/Cards/Grid.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public $profiles = null;
|
6 |
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Block_Customer_Cards_Grid extends Mage_Core_Block_Template
|
4 |
{
|
5 |
public $profiles = null;
|
6 |
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Form/Creditcard.php
RENAMED
@@ -25,7 +25,7 @@
|
|
25 |
*/
|
26 |
|
27 |
|
28 |
-
class
|
29 |
{
|
30 |
public $profiles = null;
|
31 |
protected function _construct()
|
25 |
*/
|
26 |
|
27 |
|
28 |
+
class Op_Netbanx_Block_Form_Creditcard extends Mage_Payment_Block_Form_Cc
|
29 |
{
|
30 |
public $profiles = null;
|
31 |
protected function _construct()
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Info/Creditcard.php
RENAMED
@@ -1,5 +1,5 @@
|
|
1 |
<?php
|
2 |
-
class
|
3 |
{
|
4 |
protected function _construct()
|
5 |
{
|
1 |
<?php
|
2 |
+
class Op_Netbanx_Block_Info_Creditcard extends Mage_Payment_Block_Info_Cc
|
3 |
{
|
4 |
protected function _construct()
|
5 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Navigation.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function getLinks()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Block_Navigation extends Mage_Customer_Block_Account_Navigation
|
4 |
{
|
5 |
public function getLinks()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Block/Threat.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 7:29 AM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
|
13 |
protected function _construct()
|
7 |
* Time: 7:29 AM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Block_Threat extends Mage_Core_Block_Template
|
11 |
{
|
12 |
|
13 |
protected function _construct()
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Helper/Data.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 2:05 PM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
/**
|
13 |
* @param $amount
|
@@ -208,16 +208,16 @@ class Demac_Optimal_Helper_Data extends Mage_Core_Helper_Abstract
|
|
208 |
}
|
209 |
|
210 |
switch($transactionMode){
|
211 |
-
case
|
212 |
$extendedOptionsArray[] = array(
|
213 |
'key' => (string) 'authType',
|
214 |
-
'value' => (string)
|
215 |
);
|
216 |
break;
|
217 |
-
case
|
218 |
$extendedOptionsArray[] = array(
|
219 |
'key' => (string) 'authType',
|
220 |
-
'value' => (string)
|
221 |
);
|
222 |
break;
|
223 |
default:
|
@@ -366,7 +366,7 @@ class Demac_Optimal_Helper_Data extends Mage_Core_Helper_Abstract
|
|
366 |
$callbackArray[] = array(
|
367 |
'format' => (string) 'json',
|
368 |
'rel' => (string) 'on_success',
|
369 |
-
'retries' => (int)
|
370 |
'returnKeys' => array(
|
371 |
'id',
|
372 |
'transaction.confirmationNumber',
|
7 |
* Time: 2:05 PM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Helper_Data extends Mage_Core_Helper_Abstract
|
11 |
{
|
12 |
/**
|
13 |
* @param $amount
|
208 |
}
|
209 |
|
210 |
switch($transactionMode){
|
211 |
+
case Op_Netbanx_Model_Method_Hosted::ACTION_AUTHORIZE:
|
212 |
$extendedOptionsArray[] = array(
|
213 |
'key' => (string) 'authType',
|
214 |
+
'value' => (string) Op_Netbanx_Model_Config_Transaction::AUTH_VALUE
|
215 |
);
|
216 |
break;
|
217 |
+
case Op_Netbanx_Model_Method_Hosted::ACTION_AUTHORIZE_CAPTURE:
|
218 |
$extendedOptionsArray[] = array(
|
219 |
'key' => (string) 'authType',
|
220 |
+
'value' => (string) Op_Netbanx_Model_Config_Transaction::CAPT_VALUE
|
221 |
);
|
222 |
break;
|
223 |
default:
|
366 |
$callbackArray[] = array(
|
367 |
'format' => (string) 'json',
|
368 |
'rel' => (string) 'on_success',
|
369 |
+
'retries' => (int) Op_Netbanx_Model_Hosted_Client::CONNECTION_RETRIES,
|
370 |
'returnKeys' => array(
|
371 |
'id',
|
372 |
'transaction.confirmationNumber',
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Client/Abstract.php
RENAMED
@@ -6,7 +6,7 @@
|
|
6 |
* Time: 6:24 PM
|
7 |
*/
|
8 |
|
9 |
-
class
|
10 |
{
|
11 |
protected $_storeId = null;
|
12 |
protected $_apiUrl = null;
|
6 |
* Time: 6:24 PM
|
7 |
*/
|
8 |
|
9 |
+
class Op_Netbanx_Model_Client_Abstract extends Mage_Core_Model_Abstract
|
10 |
{
|
11 |
protected $_storeId = null;
|
12 |
protected $_apiUrl = null;
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Config/Mode.php
RENAMED
@@ -16,7 +16,7 @@
|
|
16 |
* @license http://www.demacmedia.com/LICENSE-Magento.txt
|
17 |
*/
|
18 |
|
19 |
-
class
|
20 |
{
|
21 |
const DEV_VALUE = 'development';
|
22 |
const PROD_VALUE = 'production';
|
16 |
* @license http://www.demacmedia.com/LICENSE-Magento.txt
|
17 |
*/
|
18 |
|
19 |
+
class Op_Netbanx_Model_Config_Mode extends Mage_Core_Model_Config_Data
|
20 |
{
|
21 |
const DEV_VALUE = 'development';
|
22 |
const PROD_VALUE = 'production';
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Config/Status.php
RENAMED
@@ -6,7 +6,7 @@
|
|
6 |
* Date: 9/10/13
|
7 |
* Time: 2:03 PM
|
8 |
*/
|
9 |
-
class
|
10 |
{
|
11 |
|
12 |
|
6 |
* Date: 9/10/13
|
7 |
* Time: 2:03 PM
|
8 |
*/
|
9 |
+
class Op_Netbanx_Model_Status extends Mage_Core_Model_Config_Data
|
10 |
{
|
11 |
|
12 |
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Config/Transaction.php
RENAMED
@@ -16,7 +16,7 @@
|
|
16 |
* @license http://www.demacmedia.com/LICENSE-Magento.txt
|
17 |
*/
|
18 |
|
19 |
-
class
|
20 |
{
|
21 |
const AUTH_VALUE = 'auth';
|
22 |
const CAPT_VALUE = 'purchase';
|
@@ -25,11 +25,11 @@ class Demac_Optimal_Model_Config_Transaction extends Mage_Core_Model_Config_Data
|
|
25 |
{
|
26 |
return array(
|
27 |
array(
|
28 |
-
'value' =>
|
29 |
'label' => Mage::helper('optimal')->__('Authorize Only')
|
30 |
),
|
31 |
array(
|
32 |
-
'value' =>
|
33 |
'label' => Mage::helper('optimal')->__('Authorize and Capture')
|
34 |
),
|
35 |
);
|
16 |
* @license http://www.demacmedia.com/LICENSE-Magento.txt
|
17 |
*/
|
18 |
|
19 |
+
class Op_Netbanx_Model_Config_Transaction extends Mage_Core_Model_Config_Data
|
20 |
{
|
21 |
const AUTH_VALUE = 'auth';
|
22 |
const CAPT_VALUE = 'purchase';
|
25 |
{
|
26 |
return array(
|
27 |
array(
|
28 |
+
'value' => Op_Netbanx_Model_Method_Hosted::ACTION_AUTHORIZE,
|
29 |
'label' => Mage::helper('optimal')->__('Authorize Only')
|
30 |
),
|
31 |
array(
|
32 |
+
'value' => Op_Netbanx_Model_Method_Hosted::ACTION_AUTHORIZE_CAPTURE,
|
33 |
'label' => Mage::helper('optimal')->__('Authorize and Capture')
|
34 |
),
|
35 |
);
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Creditcard.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Model_Creditcard extends Mage_Core_Model_Abstract
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Creditcard/Client.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 12:53 PM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
protected $_merchantRefNum = null;
|
13 |
protected $_currencyCode = null;
|
7 |
* Time: 12:53 PM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Creditcard_Client extends Op_Netbanx_Model_Client_Abstract
|
11 |
{
|
12 |
protected $_merchantRefNum = null;
|
13 |
protected $_currencyCode = null;
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Errorcode.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Model_Errorcode extends Mage_Core_Model_Abstract
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Hosted/Client.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 12:53 PM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
protected $_merchantRefNum = null;
|
13 |
protected $_currencyCode = null;
|
@@ -207,7 +207,7 @@ class Demac_Optimal_Model_Hosted_Client extends Demac_Optimal_Model_Client_Abstr
|
|
207 |
if (isset($response->error) && !isset($response->error->code)) {
|
208 |
Mage::log($response, null, 'demac_optimal.log');
|
209 |
$helper->cleanMerchantCustomerId($session->getId());
|
210 |
-
throw new
|
211 |
}
|
212 |
|
213 |
if (isset($response->error)) {
|
@@ -221,7 +221,7 @@ class Demac_Optimal_Model_Hosted_Client extends Demac_Optimal_Model_Client_Abstr
|
|
221 |
|
222 |
$helper->cleanMerchantCustomerId($session->getId());
|
223 |
|
224 |
-
throw new
|
225 |
}
|
226 |
|
227 |
if (isset($response->transaction->errorCode)) {
|
@@ -229,7 +229,7 @@ class Demac_Optimal_Model_Hosted_Client extends Demac_Optimal_Model_Client_Abstr
|
|
229 |
|
230 |
if ($message === null && !isset($response->transaction->errorCode)) {
|
231 |
Mage::log($response, null, 'demac_optimal.log');
|
232 |
-
throw new
|
233 |
}
|
234 |
|
235 |
if ($message === null) {
|
@@ -246,7 +246,7 @@ class Demac_Optimal_Model_Hosted_Client extends Demac_Optimal_Model_Client_Abstr
|
|
246 |
|
247 |
Mage::helper('optimal')->cleanMerchantCustomerId($session->getId());
|
248 |
|
249 |
-
throw new
|
250 |
}
|
251 |
|
252 |
return $response;
|
7 |
* Time: 12:53 PM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Hosted_Client extends Op_Netbanx_Model_Client_Abstract
|
11 |
{
|
12 |
protected $_merchantRefNum = null;
|
13 |
protected $_currencyCode = null;
|
207 |
if (isset($response->error) && !isset($response->error->code)) {
|
208 |
Mage::log($response, null, 'demac_optimal.log');
|
209 |
$helper->cleanMerchantCustomerId($session->getId());
|
210 |
+
throw new Op_Netbanx_Model_Hosted_Exception($defaultMessage);
|
211 |
}
|
212 |
|
213 |
if (isset($response->error)) {
|
221 |
|
222 |
$helper->cleanMerchantCustomerId($session->getId());
|
223 |
|
224 |
+
throw new Op_Netbanx_Model_Hosted_Exception($message);
|
225 |
}
|
226 |
|
227 |
if (isset($response->transaction->errorCode)) {
|
229 |
|
230 |
if ($message === null && !isset($response->transaction->errorCode)) {
|
231 |
Mage::log($response, null, 'demac_optimal.log');
|
232 |
+
throw new Op_Netbanx_Model_Hosted_Exception($defaultMessage);
|
233 |
}
|
234 |
|
235 |
if ($message === null) {
|
246 |
|
247 |
Mage::helper('optimal')->cleanMerchantCustomerId($session->getId());
|
248 |
|
249 |
+
throw new Op_Netbanx_Model_Hosted_Exception($message);
|
250 |
}
|
251 |
|
252 |
return $response;
|
app/code/community/Op/Netbanx/Model/Hosted/Exception.php
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
class Op_Netbanx_Model_Hosted_Exception extends Mage_Core_Exception
|
4 |
+
{
|
5 |
+
//
|
6 |
+
}
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Merchant/Customer.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Model_Merchant_Customer extends Mage_Core_Model_Abstract
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Method/Hosted.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 1:29 PM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
const METHOD_CODE = 'optimal_hosted';
|
13 |
|
@@ -22,6 +22,7 @@ class Demac_Optimal_Model_Method_Hosted extends Mage_Payment_Model_Method_Cc
|
|
22 |
protected $_canRefundInvoicePartial = true;
|
23 |
protected $_canUseInternal = true;
|
24 |
protected $_canUseCheckout = true;
|
|
|
25 |
|
26 |
protected $_formBlockType = 'optimal/form_creditcard';
|
27 |
protected $_infoBlockType = 'optimal/info_creditcard';
|
@@ -238,6 +239,18 @@ class Demac_Optimal_Model_Method_Hosted extends Mage_Payment_Model_Method_Cc
|
|
238 |
$orderData['base_discount_amount'] = $order->getBaseDiscountAmount();
|
239 |
$orderData['base_customer_balance_amount'] = $order->getBaseCustomerBalanceAmount();
|
240 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
241 |
$paymentData = $payment->getData();
|
242 |
|
243 |
$skip3d = Mage::getStoreConfig('payment/optimal_hosted/skip3D', Mage::app()->getStore()->getStoreId());
|
@@ -302,7 +315,7 @@ class Demac_Optimal_Model_Method_Hosted extends Mage_Payment_Model_Method_Cc
|
|
302 |
}
|
303 |
}
|
304 |
} else {
|
305 |
-
Mage::throwException(
|
306 |
}
|
307 |
|
308 |
// Redirect the Customer if 3D-Secure verification is turned on
|
@@ -334,7 +347,7 @@ class Demac_Optimal_Model_Method_Hosted extends Mage_Payment_Model_Method_Cc
|
|
334 |
} catch (Exception $e) {
|
335 |
Mage::log($e->getMessage(), null, 'demac_optimal.log');
|
336 |
Mage::logException($e);
|
337 |
-
$checkoutSess->addError(
|
338 |
$this->_handlePaymentFailure();
|
339 |
$this->orderRedirectUrl(Mage::getBaseUrl() . 'checkout/cart');
|
340 |
}
|
@@ -368,7 +381,7 @@ class Demac_Optimal_Model_Method_Hosted extends Mage_Payment_Model_Method_Cc
|
|
368 |
// Now we need to check the payment status if the transaction is available
|
369 |
if($transaction->status == 'declined' || $transaction->status == 'cancelled')
|
370 |
{
|
371 |
-
Mage::throwException(
|
372 |
}
|
373 |
|
374 |
// Check the order status for the profile information and try to save it
|
@@ -411,7 +424,7 @@ class Demac_Optimal_Model_Method_Hosted extends Mage_Payment_Model_Method_Cc
|
|
411 |
|
412 |
$profile->save();
|
413 |
}else {
|
414 |
-
Mage::throwException(
|
415 |
}
|
416 |
}
|
417 |
|
@@ -476,7 +489,7 @@ class Demac_Optimal_Model_Method_Hosted extends Mage_Payment_Model_Method_Cc
|
|
476 |
|
477 |
try{
|
478 |
return $client->retrieveOrder($id);
|
479 |
-
} catch (
|
480 |
Mage::throwException($e->getMessage());
|
481 |
} catch(Exception $e) {
|
482 |
$counter++;
|
@@ -514,7 +527,7 @@ class Demac_Optimal_Model_Method_Hosted extends Mage_Payment_Model_Method_Cc
|
|
514 |
try {
|
515 |
|
516 |
$transactionMode = Mage::getStoreConfig('payment/optimal_hosted/payment_action');
|
517 |
-
if($transactionMode ==
|
518 |
{
|
519 |
$result = $this->authorize($payment, $amount);
|
520 |
return $result;
|
@@ -752,5 +765,4 @@ class Demac_Optimal_Model_Method_Hosted extends Mage_Payment_Model_Method_Cc
|
|
752 |
}
|
753 |
}
|
754 |
}
|
755 |
-
|
756 |
-
}
|
7 |
* Time: 1:29 PM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Method_Hosted extends Mage_Payment_Model_Method_Cc
|
11 |
{
|
12 |
const METHOD_CODE = 'optimal_hosted';
|
13 |
|
22 |
protected $_canRefundInvoicePartial = true;
|
23 |
protected $_canUseInternal = true;
|
24 |
protected $_canUseCheckout = true;
|
25 |
+
protected $_canUseForMultishipping = false;
|
26 |
|
27 |
protected $_formBlockType = 'optimal/form_creditcard';
|
28 |
protected $_infoBlockType = 'optimal/info_creditcard';
|
239 |
$orderData['base_discount_amount'] = $order->getBaseDiscountAmount();
|
240 |
$orderData['base_customer_balance_amount'] = $order->getBaseCustomerBalanceAmount();
|
241 |
|
242 |
+
|
243 |
+
|
244 |
+
|
245 |
+
|
246 |
+
// 20150806 - CollinsHarper update for issue with 3rd party fees / rewards points.
|
247 |
+
// if the totals do not match. we add the different to the discount.
|
248 |
+
|
249 |
+
$pointsData = Mage::getSingleton('checkout/session')->getData('reward_sales_rules');
|
250 |
+
if($pointsData && isset($pointsData['base_discount'])) {
|
251 |
+
$orderData['gift_cards_amount'] += $pointsData['base_discount'];
|
252 |
+
}
|
253 |
+
|
254 |
$paymentData = $payment->getData();
|
255 |
|
256 |
$skip3d = Mage::getStoreConfig('payment/optimal_hosted/skip3D', Mage::app()->getStore()->getStoreId());
|
315 |
}
|
316 |
}
|
317 |
} else {
|
318 |
+
Mage::throwException(Mage::helper('optimal')->__("There was a problem creating the order"));
|
319 |
}
|
320 |
|
321 |
// Redirect the Customer if 3D-Secure verification is turned on
|
347 |
} catch (Exception $e) {
|
348 |
Mage::log($e->getMessage(), null, 'demac_optimal.log');
|
349 |
Mage::logException($e);
|
350 |
+
$checkoutSess->addError(Mage::helper('optimal')->__('An error was encountered while redirecting to the payment gateway, please try again later.'));
|
351 |
$this->_handlePaymentFailure();
|
352 |
$this->orderRedirectUrl(Mage::getBaseUrl() . 'checkout/cart');
|
353 |
}
|
381 |
// Now we need to check the payment status if the transaction is available
|
382 |
if($transaction->status == 'declined' || $transaction->status == 'cancelled')
|
383 |
{
|
384 |
+
Mage::throwException(Mage::helper('optimal')->__("There was an error processing your payment"));
|
385 |
}
|
386 |
|
387 |
// Check the order status for the profile information and try to save it
|
424 |
|
425 |
$profile->save();
|
426 |
}else {
|
427 |
+
Mage::throwException(Mage::helper('optimal')->__("There was a problem saving your payment information."));
|
428 |
}
|
429 |
}
|
430 |
|
489 |
|
490 |
try{
|
491 |
return $client->retrieveOrder($id);
|
492 |
+
} catch (Op_Netbanx_Model_Hosted_Exception $e) { // in case when Error is generated from Optimal
|
493 |
Mage::throwException($e->getMessage());
|
494 |
} catch(Exception $e) {
|
495 |
$counter++;
|
527 |
try {
|
528 |
|
529 |
$transactionMode = Mage::getStoreConfig('payment/optimal_hosted/payment_action');
|
530 |
+
if($transactionMode == Op_Netbanx_Model_Method_Hosted::ACTION_AUTHORIZE_CAPTURE)
|
531 |
{
|
532 |
$result = $this->authorize($payment, $amount);
|
533 |
return $result;
|
765 |
}
|
766 |
}
|
767 |
}
|
768 |
+
}
|
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Creditcard.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 11:03 AM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
protected $_isPkAutoIncrement = true;
|
13 |
|
@@ -19,7 +19,7 @@ class Demac_Optimal_Model_Mysql4_Creditcard extends Mage_Core_Model_Mysql4_Abstr
|
|
19 |
$this->_init('optimal/creditcard', 'entity_id');
|
20 |
}
|
21 |
|
22 |
-
public function loadByProfileId(
|
23 |
{
|
24 |
$adapter = $this->_getReadAdapter();
|
25 |
$where = $adapter->quoteInto("profile_id = ?", $profileId);
|
@@ -37,7 +37,7 @@ class Demac_Optimal_Model_Mysql4_Creditcard extends Mage_Core_Model_Mysql4_Abstr
|
|
37 |
}
|
38 |
|
39 |
|
40 |
-
public function loadByProfileAndToken(
|
41 |
{
|
42 |
$adapter = $this->_getReadAdapter();
|
43 |
$whereProfile = $adapter->quoteInto("profile_id = ?", $profileId);
|
@@ -56,7 +56,7 @@ class Demac_Optimal_Model_Mysql4_Creditcard extends Mage_Core_Model_Mysql4_Abstr
|
|
56 |
|
57 |
}
|
58 |
|
59 |
-
public function loadByMerchantCustomerId(
|
60 |
{
|
61 |
$adapter = $this->_getReadAdapter();
|
62 |
$where = $adapter->quoteInto("merchant_customer_id = ?", $merchantCustomerId);
|
7 |
* Time: 11:03 AM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Mysql4_Creditcard extends Mage_Core_Model_Mysql4_Abstract
|
11 |
{
|
12 |
protected $_isPkAutoIncrement = true;
|
13 |
|
19 |
$this->_init('optimal/creditcard', 'entity_id');
|
20 |
}
|
21 |
|
22 |
+
public function loadByProfileId(Op_Netbanx_Model_Creditcard $object, $profileId)
|
23 |
{
|
24 |
$adapter = $this->_getReadAdapter();
|
25 |
$where = $adapter->quoteInto("profile_id = ?", $profileId);
|
37 |
}
|
38 |
|
39 |
|
40 |
+
public function loadByProfileAndToken(Op_Netbanx_Model_Creditcard $object, $profileId, $paymentToken)
|
41 |
{
|
42 |
$adapter = $this->_getReadAdapter();
|
43 |
$whereProfile = $adapter->quoteInto("profile_id = ?", $profileId);
|
56 |
|
57 |
}
|
58 |
|
59 |
+
public function loadByMerchantCustomerId(Op_Netbanx_Model_Creditcard $object, $merchantCustomerId)
|
60 |
{
|
61 |
$adapter = $this->_getReadAdapter();
|
62 |
$where = $adapter->quoteInto("merchant_customer_id = ?", $merchantCustomerId);
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Creditcard/Collection.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
public function _construct()
|
13 |
{
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Mysql4_Creditcard_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
|
11 |
{
|
12 |
public function _construct()
|
13 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Errorcode.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 11:36 AM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
protected $_isPkAutoIncrement = false;
|
13 |
|
@@ -19,7 +19,7 @@ class Demac_Optimal_Model_Mysql4_Errorcode extends Mage_Core_Model_Mysql4_Abstra
|
|
19 |
$this->_init('optimal/errorcode', 'code');
|
20 |
}
|
21 |
|
22 |
-
public function loadByCode(
|
23 |
{
|
24 |
$adapter = $this->_getReadAdapter();
|
25 |
$where = $adapter->quoteInto("code = ?", $code);
|
7 |
* Time: 11:36 AM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Mysql4_Errorcode extends Mage_Core_Model_Mysql4_Abstract
|
11 |
{
|
12 |
protected $_isPkAutoIncrement = false;
|
13 |
|
19 |
$this->_init('optimal/errorcode', 'code');
|
20 |
}
|
21 |
|
22 |
+
public function loadByCode(Op_Netbanx_Model_Errorcode $object, $code)
|
23 |
{
|
24 |
$adapter = $this->_getReadAdapter();
|
25 |
$where = $adapter->quoteInto("code = ?", $code);
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Errorcode/Collection.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function _construct()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Model_Mysql4_Errorcode_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
|
4 |
{
|
5 |
public function _construct()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Merchant/Customer.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
protected $_isPkAutoIncrement = true;
|
6 |
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Model_Mysql4_Merchant_Customer extends Mage_Core_Model_Mysql4_Abstract
|
4 |
{
|
5 |
protected $_isPkAutoIncrement = true;
|
6 |
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Merchant/Customer/Collection.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function _construct()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Model_Mysql4_Merchant_Customer_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
|
4 |
{
|
5 |
public function _construct()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Profile.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 11:13 AM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
protected $_isPkAutoIncrement = true;
|
13 |
|
@@ -19,7 +19,7 @@ class Demac_Optimal_Model_Mysql4_Profile extends Mage_Core_Model_Mysql4_Abstract
|
|
19 |
$this->_init('optimal/profile', 'entity_id');
|
20 |
}
|
21 |
|
22 |
-
public function loadByCustomerId(
|
23 |
{
|
24 |
$adapter = $this->_getReadAdapter();
|
25 |
$where = $adapter->quoteInto("customer_id = ?", $customerId);
|
@@ -36,7 +36,7 @@ class Demac_Optimal_Model_Mysql4_Profile extends Mage_Core_Model_Mysql4_Abstract
|
|
36 |
|
37 |
}
|
38 |
|
39 |
-
public function loadByProfileAndToken(
|
40 |
{
|
41 |
$adapter = $this->_getReadAdapter();
|
42 |
$whereProfile = $adapter->quoteInto("profile_id = ?", $profileId);
|
7 |
* Time: 11:13 AM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Mysql4_Profile extends Mage_Core_Model_Mysql4_Abstract
|
11 |
{
|
12 |
protected $_isPkAutoIncrement = true;
|
13 |
|
19 |
$this->_init('optimal/profile', 'entity_id');
|
20 |
}
|
21 |
|
22 |
+
public function loadByCustomerId(Op_Netbanx_Model_Profile $object, $customerId)
|
23 |
{
|
24 |
$adapter = $this->_getReadAdapter();
|
25 |
$where = $adapter->quoteInto("customer_id = ?", $customerId);
|
36 |
|
37 |
}
|
38 |
|
39 |
+
public function loadByProfileAndToken(Op_Netbanx_Model_Profile $object, $profileId, $paymentToken)
|
40 |
{
|
41 |
$adapter = $this->_getReadAdapter();
|
42 |
$whereProfile = $adapter->quoteInto("profile_id = ?", $profileId);
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Profile/Collection.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
public function _construct()
|
13 |
{
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Mysql4_Profile_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
|
11 |
{
|
12 |
public function _construct()
|
13 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Risk.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
protected $_isPkAutoIncrement = true;
|
13 |
|
@@ -19,7 +19,7 @@ class Demac_Optimal_Model_Mysql4_Risk extends Mage_Core_Model_Mysql4_Abstract
|
|
19 |
$this->_init('optimal/risk', 'entity_id');
|
20 |
}
|
21 |
|
22 |
-
public function loadByCode(
|
23 |
{
|
24 |
$adapter = $this->_getReadAdapter();
|
25 |
$where = $adapter->quoteInto("risk_code = ?", $errorCode);
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Mysql4_Risk extends Mage_Core_Model_Mysql4_Abstract
|
11 |
{
|
12 |
protected $_isPkAutoIncrement = true;
|
13 |
|
19 |
$this->_init('optimal/risk', 'entity_id');
|
20 |
}
|
21 |
|
22 |
+
public function loadByCode(Op_Netbanx_Model_Risk $object, $errorCode)
|
23 |
{
|
24 |
$adapter = $this->_getReadAdapter();
|
25 |
$where = $adapter->quoteInto("risk_code = ?", $errorCode);
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Mysql4/Risk/Collection.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
public function _construct()
|
13 |
{
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Mysql4_Risk_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
|
11 |
{
|
12 |
public function _construct()
|
13 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Observer.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 1:49 PM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
/**
|
13 |
* Process the transaction response from
|
7 |
* Time: 1:49 PM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Observer
|
11 |
{
|
12 |
/**
|
13 |
* Process the transaction response from
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Profile.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Model_Profile extends Mage_Core_Model_Abstract
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Profile/Client.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 12:53 PM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
protected $_merchantRefNum = null;
|
13 |
protected $_currencyCode = null;
|
7 |
* Time: 12:53 PM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Profile_Client extends Op_Netbanx_Model_Client_Abstract
|
11 |
{
|
12 |
protected $_merchantRefNum = null;
|
13 |
protected $_currencyCode = null;
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Resource/Mysql4/Setup.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
|
13 |
}
|
7 |
* To change this template use File | Settings | File Templates.
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Resource_Mysql4_Setup extends Mage_Core_Model_Resource_Setup
|
11 |
{
|
12 |
|
13 |
}
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Risk.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Model_Risk extends Mage_Core_Model_Abstract
|
4 |
{
|
5 |
public function __construct()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Sales/Order.php
RENAMED
@@ -4,7 +4,7 @@
|
|
4 |
* @company Demac Media Inc.
|
5 |
* @copyright 2010-2014 Demac Media Inc.
|
6 |
*/
|
7 |
-
class
|
8 |
{
|
9 |
|
10 |
/**
|
4 |
* @company Demac Media Inc.
|
5 |
* @copyright 2010-2014 Demac Media Inc.
|
6 |
*/
|
7 |
+
class Op_Netbanx_Model_Sales_Order extends Mage_Sales_Model_Order
|
8 |
{
|
9 |
|
10 |
/**
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Source/Cctype.php
RENAMED
@@ -31,7 +31,7 @@
|
|
31 |
* @package Mage_Paygate
|
32 |
* @author Magento Core Team <core@magentocommerce.com>
|
33 |
*/
|
34 |
-
class
|
35 |
{
|
36 |
public function getAllowedTypes()
|
37 |
{
|
31 |
* @package Mage_Paygate
|
32 |
* @author Magento Core Team <core@magentocommerce.com>
|
33 |
*/
|
34 |
+
class Op_Netbanx_Model_Source_Cctype extends Mage_Payment_Model_Source_Cctype
|
35 |
{
|
36 |
public function getAllowedTypes()
|
37 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Model/Web/Client.php
RENAMED
@@ -7,7 +7,7 @@
|
|
7 |
* Time: 1:13 PM
|
8 |
*/
|
9 |
|
10 |
-
class
|
11 |
{
|
12 |
|
13 |
}
|
7 |
* Time: 1:13 PM
|
8 |
*/
|
9 |
|
10 |
+
class Op_Netbanx_Model_Web_Client extends Op_Netbanx_Model_Client_Abstract
|
11 |
{
|
12 |
|
13 |
}
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Test/Model/Hosted/Client.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
|
6 |
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Test_Model_Hosted_Client extends EcomDev_PHPUnit_Test_Case
|
4 |
{
|
5 |
|
6 |
|
app/code/community/{Demac/Optimal → Op/Netbanx}/Test/Model/Method/Hosted.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
|
6 |
/**
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Test_Model_Method_Hosted extends EcomDev_PHPUnit_Test_Case
|
4 |
{
|
5 |
|
6 |
/**
|
app/code/community/Op/Netbanx/Test/Model/Observer.php
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
class Op_Netbanx_Test_Model_Observer extends EcomDev_PHPUnit_Test_Case
|
4 |
+
{
|
5 |
+
public function prepareOrderData()
|
6 |
+
{
|
7 |
+
|
8 |
+
}
|
9 |
+
}
|
app/code/community/{Demac/Optimal → Op/Netbanx}/controllers/Adminhtml/ErrorcodesController.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function _initAction()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Adminhtml_ErrorcodesController extends Mage_Adminhtml_Controller_Action
|
4 |
{
|
5 |
public function _initAction()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/controllers/Adminhtml/ThreatController.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
public function _initAction()
|
6 |
{
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_Adminhtml_ThreatController extends Mage_Adminhtml_Controller_Action
|
4 |
{
|
5 |
public function _initAction()
|
6 |
{
|
app/code/community/{Demac/Optimal → Op/Netbanx}/controllers/Frontend/OptimalController.php
RENAMED
@@ -31,7 +31,7 @@
|
|
31 |
* @package Mage_Customer
|
32 |
* @author Magento Core Team <core@magentocommerce.com>
|
33 |
*/
|
34 |
-
class
|
35 |
{
|
36 |
/**
|
37 |
* Retrieve customer session model object
|
31 |
* @package Mage_Customer
|
32 |
* @author Magento Core Team <core@magentocommerce.com>
|
33 |
*/
|
34 |
+
class Op_Netbanx_Frontend_OptimalController extends Mage_Core_Controller_Front_Action
|
35 |
{
|
36 |
/**
|
37 |
* Retrieve customer session model object
|
app/code/community/{Demac/Optimal → Op/Netbanx}/controllers/HandlerController.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
|
3 |
-
class
|
4 |
{
|
5 |
/**
|
6 |
* Callback Action
|
1 |
<?php
|
2 |
|
3 |
+
class Op_Netbanx_HandlerController extends Mage_Core_Controller_Front_Action
|
4 |
{
|
5 |
/**
|
6 |
* Callback Action
|
app/code/community/{Demac/Optimal → Op/Netbanx}/data/optimal_setup/csv/common-codes-0.3.3.csv
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/data/optimal_setup/csv/webservices-codes-0.3.3.csv
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/data/optimal_setup/data-upgrade-0.3.4-0.3.5.php
RENAMED
File without changes
|
app/code/community/Op/Netbanx/etc/CHANGELOG.txt
ADDED
@@ -0,0 +1,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
20151014 - Version 0.5.1
|
2 |
+
Chris Harper <charper@collinsharper.com>
|
3 |
+
|
4 |
+
Changed the module to not be allowed with multiple shipping addresses.
|
5 |
+
/app/code/community/Op/Netbanx/Model/Method/Hosted.php
|
6 |
+
|
7 |
+
|
8 |
+
20150927 - Version 0.5.0
|
9 |
+
Steve Harper <stharper@collinsharper.com>
|
10 |
+
|
11 |
+
Removed Optimal Change log from root, CHANGELOG.txt is in following path
|
12 |
+
/app/code/community/Op/Netbanx/etc/CHANGELOG.txt
|
13 |
+
|
14 |
+
|
15 |
+
20150826 - version 0.5.0
|
16 |
+
Chris Harper <charper@collinsharper.com>
|
17 |
+
|
18 |
+
Update module to not use $this-> for translations, because translations
|
19 |
+
require a helper.
|
20 |
+
|
21 |
+
|
22 |
+
20150815 - version 0.4.8
|
23 |
+
Shane Harper <sharper@collinsharper.com>
|
24 |
+
|
25 |
+
correction for points
|
26 |
+
|
27 |
+
|
28 |
+
20150812 - version 0.4.7
|
29 |
+
|
30 |
+
update for rounding issue caused by cpu / php
|
31 |
+
corrected issue with install scripts multiple addition of field to
|
32 |
+
sales_flat_quote_payment
|
33 |
+
|
34 |
+
|
35 |
+
20150806 - version 0.4.6
|
36 |
+
|
37 |
+
corrected issue with ancilary fees and points system. - version 0.4.6
|
app/code/community/{Demac/Optimal → Op/Netbanx}/etc/adminhtml.xml
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/etc/config.xml
RENAMED
@@ -1,9 +1,9 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<config>
|
3 |
<modules>
|
4 |
-
<
|
5 |
-
<version>0.
|
6 |
-
</
|
7 |
</modules>
|
8 |
|
9 |
<adminhtml>
|
@@ -28,7 +28,7 @@
|
|
28 |
<optimal>
|
29 |
<use>standard</use>
|
30 |
<args>
|
31 |
-
<module>
|
32 |
<frontName>optimal</frontName>
|
33 |
</args>
|
34 |
</optimal>
|
@@ -38,7 +38,7 @@
|
|
38 |
<modules>
|
39 |
<translations>
|
40 |
<files>
|
41 |
-
<default>
|
42 |
</files>
|
43 |
</translations>
|
44 |
</modules>
|
@@ -49,7 +49,7 @@
|
|
49 |
<observers>
|
50 |
<optimal_hosted_order_after>
|
51 |
<type>singleton</type>
|
52 |
-
<class>
|
53 |
<method>salesOrderPlaceAfter</method>
|
54 |
</optimal_hosted_order_after>
|
55 |
</observers>
|
@@ -59,7 +59,7 @@
|
|
59 |
<customer>
|
60 |
<args>
|
61 |
<modules>
|
62 |
-
<optimal before="Mage_Customer">
|
63 |
</modules>
|
64 |
</args>
|
65 |
</customer>
|
@@ -78,11 +78,11 @@
|
|
78 |
</fieldsets>
|
79 |
<models>
|
80 |
<optimal>
|
81 |
-
<class>
|
82 |
<resourceModel>optimal_mysql4</resourceModel>
|
83 |
</optimal>
|
84 |
<optimal_mysql4>
|
85 |
-
<class>
|
86 |
<entities>
|
87 |
<risk>
|
88 |
<table>demac_optimal_risk</table>
|
@@ -103,30 +103,30 @@
|
|
103 |
</optimal_mysql4>
|
104 |
<sales>
|
105 |
<rewrite>
|
106 |
-
<order>
|
107 |
</rewrite>
|
108 |
</sales>
|
109 |
</models>
|
110 |
<blocks>
|
111 |
<optimal>
|
112 |
-
<class>
|
113 |
</optimal>
|
114 |
<customer>
|
115 |
<rewrite>
|
116 |
-
<account_navigation>
|
117 |
</rewrite>
|
118 |
</customer>
|
119 |
</blocks>
|
120 |
<helpers>
|
121 |
<optimal>
|
122 |
-
<class>
|
123 |
</optimal>
|
124 |
</helpers>
|
125 |
<resources>
|
126 |
<optimal_setup>
|
127 |
<setup>
|
128 |
-
<module>
|
129 |
-
<class>
|
130 |
</setup>
|
131 |
<connection>
|
132 |
<use>core_setup</use>
|
@@ -148,7 +148,7 @@
|
|
148 |
<observers>
|
149 |
<optimal_hosted_order_unhold_after>
|
150 |
<type>singleton</type>
|
151 |
-
<class>
|
152 |
<method>orderUnoldAfter</method>
|
153 |
</optimal_hosted_order_unhold_after>
|
154 |
</observers>
|
@@ -161,7 +161,7 @@
|
|
161 |
<adminhtml>
|
162 |
<args>
|
163 |
<modules>
|
164 |
-
<optimal before="Mage_Adminhtml">
|
165 |
</modules>
|
166 |
</args>
|
167 |
</adminhtml>
|
1 |
<?xml version="1.0"?>
|
2 |
<config>
|
3 |
<modules>
|
4 |
+
<Op_Netbanx>
|
5 |
+
<version>0.5.1</version>
|
6 |
+
</Op_Netbanx>
|
7 |
</modules>
|
8 |
|
9 |
<adminhtml>
|
28 |
<optimal>
|
29 |
<use>standard</use>
|
30 |
<args>
|
31 |
+
<module>Op_Netbanx</module>
|
32 |
<frontName>optimal</frontName>
|
33 |
</args>
|
34 |
</optimal>
|
38 |
<modules>
|
39 |
<translations>
|
40 |
<files>
|
41 |
+
<default>Op_Netbanx.csv</default>
|
42 |
</files>
|
43 |
</translations>
|
44 |
</modules>
|
49 |
<observers>
|
50 |
<optimal_hosted_order_after>
|
51 |
<type>singleton</type>
|
52 |
+
<class>Op_Netbanx_Model_Observer</class>
|
53 |
<method>salesOrderPlaceAfter</method>
|
54 |
</optimal_hosted_order_after>
|
55 |
</observers>
|
59 |
<customer>
|
60 |
<args>
|
61 |
<modules>
|
62 |
+
<optimal before="Mage_Customer">Op_Netbanx_Frontend</optimal>
|
63 |
</modules>
|
64 |
</args>
|
65 |
</customer>
|
78 |
</fieldsets>
|
79 |
<models>
|
80 |
<optimal>
|
81 |
+
<class>Op_Netbanx_Model</class>
|
82 |
<resourceModel>optimal_mysql4</resourceModel>
|
83 |
</optimal>
|
84 |
<optimal_mysql4>
|
85 |
+
<class>Op_Netbanx_Model_Mysql4</class>
|
86 |
<entities>
|
87 |
<risk>
|
88 |
<table>demac_optimal_risk</table>
|
103 |
</optimal_mysql4>
|
104 |
<sales>
|
105 |
<rewrite>
|
106 |
+
<order>Op_Netbanx_Model_Sales_Order</order>
|
107 |
</rewrite>
|
108 |
</sales>
|
109 |
</models>
|
110 |
<blocks>
|
111 |
<optimal>
|
112 |
+
<class>Op_Netbanx_Block</class>
|
113 |
</optimal>
|
114 |
<customer>
|
115 |
<rewrite>
|
116 |
+
<account_navigation>Op_Netbanx_Block_Navigation</account_navigation>
|
117 |
</rewrite>
|
118 |
</customer>
|
119 |
</blocks>
|
120 |
<helpers>
|
121 |
<optimal>
|
122 |
+
<class>Op_Netbanx_Helper</class>
|
123 |
</optimal>
|
124 |
</helpers>
|
125 |
<resources>
|
126 |
<optimal_setup>
|
127 |
<setup>
|
128 |
+
<module>Op_Netbanx</module>
|
129 |
+
<class>Op_Netbanx_Model_Resource_Mysql4_Setup</class>
|
130 |
</setup>
|
131 |
<connection>
|
132 |
<use>core_setup</use>
|
148 |
<observers>
|
149 |
<optimal_hosted_order_unhold_after>
|
150 |
<type>singleton</type>
|
151 |
+
<class>Op_Netbanx_Model_Observer</class>
|
152 |
<method>orderUnoldAfter</method>
|
153 |
</optimal_hosted_order_unhold_after>
|
154 |
</observers>
|
161 |
<adminhtml>
|
162 |
<args>
|
163 |
<modules>
|
164 |
+
<optimal before="Mage_Adminhtml">Op_Netbanx_Adminhtml</optimal>
|
165 |
</modules>
|
166 |
</args>
|
167 |
</adminhtml>
|
app/code/community/{Demac/Optimal → Op/Netbanx}/etc/system.xml
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.1.1.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.0.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.1.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.2.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.3.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.4.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.5.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.6.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.7.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.2.9.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/install-0.3.5.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.1.1.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.0.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.1.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.2.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.3.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.4.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.5.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.6.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.7.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.2.9.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-install-0.3.5.php
RENAMED
@@ -59,17 +59,33 @@ CREATE TABLE IF NOT EXISTS `{$this->getTable('optimal/creditcard')}` (
|
|
59 |
");
|
60 |
|
61 |
|
62 |
-
|
63 |
-
'
|
|
|
|
|
64 |
|
65 |
-
|
66 |
-
'optimal_create_profile', 'BOOLEAN NOT NULL AFTER `method`');
|
67 |
|
68 |
-
|
69 |
-
|
|
|
|
|
70 |
|
71 |
-
|
72 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
73 |
|
74 |
$table = $installer->getConnection()
|
75 |
->newTable($installer->getTable('optimal/merchant_customer'))
|
59 |
");
|
60 |
|
61 |
|
62 |
+
try {
|
63 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'),
|
64 |
+
'optimal_create_profile', 'BOOLEAN NOT NULL AFTER `method`');
|
65 |
+
} catch (Exception $e) {
|
66 |
|
67 |
+
}
|
|
|
68 |
|
69 |
+
try {
|
70 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_payment'),
|
71 |
+
'optimal_create_profile', 'BOOLEAN NOT NULL AFTER `method`');
|
72 |
+
} catch (Exception $e) {
|
73 |
|
74 |
+
}
|
75 |
+
|
76 |
+
try {
|
77 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_quote_payment'),
|
78 |
+
'optimal_profile_id', 'VARCHAR(255) NOT NULL DEFAULT "" AFTER `method`');
|
79 |
+
} catch (Exception $e) {
|
80 |
+
|
81 |
+
}
|
82 |
+
|
83 |
+
try {
|
84 |
+
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_payment'),
|
85 |
+
'optimal_profile_id', 'VARCHAR(255) NOT NULL DEFAULT "" AFTER `method`');
|
86 |
+
} catch (Exception $e) {
|
87 |
+
|
88 |
+
}
|
89 |
|
90 |
$table = $installer->getConnection()
|
91 |
->newTable($installer->getTable('optimal/merchant_customer'))
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-upgrade-0.1.1-0.2.7.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-upgrade-0.4.1-0.4.2.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/mysql4-upgrade-0.4.3-0.4.4.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.1.1-0.2.7.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.2.9-0.3.0.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.3.1-0.3.2.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.3.4-0.3.5.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.3.7-0.3.8.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.4.1-0.4.2.php
RENAMED
File without changes
|
app/code/community/{Demac/Optimal → Op/Netbanx}/sql/optimal_setup/upgrade-0.4.3-0.4.4.php
RENAMED
File without changes
|
app/etc/modules/{Demac_Optimal.xml → Op_Netbanx.xml}
RENAMED
@@ -1,11 +1,11 @@
|
|
1 |
<config>
|
2 |
<modules>
|
3 |
-
<
|
4 |
<active>true</active>
|
5 |
<codePool>community</codePool>
|
6 |
<depends>
|
7 |
<Mage_Payment />
|
8 |
</depends>
|
9 |
-
</
|
10 |
</modules>
|
11 |
</config>
|
1 |
<config>
|
2 |
<modules>
|
3 |
+
<Op_Netbanx>
|
4 |
<active>true</active>
|
5 |
<codePool>community</codePool>
|
6 |
<depends>
|
7 |
<Mage_Payment />
|
8 |
</depends>
|
9 |
+
</Op_Netbanx>
|
10 |
</modules>
|
11 |
</config>
|
package.xml
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>666999</name>
|
4 |
-
<version>0.
|
5 |
<stability>stable</stability>
|
6 |
-
<license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Securely access and process online payments with the NETBANX payment gateway.</summary>
|
@@ -14,11 +14,22 @@ The Optimal Payments extension uses a Silent Post integration to the merchant&#x
|
|
14 |
This integration significantly reduces PCI compliance requirements and liability as all of the credit card information is processed in Optimal Payments Level 1 PCI compliant environment and servers leaving no sensitive customer payment information stored locally on merchant servers.
|
15 |
<br /> <br />
|
16 |
Through the Optimal integration merchants also have the option to enable Threatmetrix fraud detection and management services. ThreatMetrix works by collecting relevant data about the customer and the order, and validating this information during the checkout. Fully integrated into the NETBANX payment gateway, enabling the ThreatMetrix option will allow merchants to automatically hold and flag suspicious orders, drastically reducing any fraud occurrences. Depending on the Score returned by ThreatMetrix an order can be held and flagged or altogether denied during the checkout.</description>
|
17 |
-
<notes
|
18 |
-
|
19 |
-
|
20 |
-
|
21 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
22 |
<compatible/>
|
23 |
-
<dependencies><required><php><min>5.
|
24 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>666999</name>
|
4 |
+
<version>0.5.1</version>
|
5 |
<stability>stable</stability>
|
6 |
+
<license>Apache 2.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Securely access and process online payments with the NETBANX payment gateway.</summary>
|
14 |
This integration significantly reduces PCI compliance requirements and liability as all of the credit card information is processed in Optimal Payments Level 1 PCI compliant environment and servers leaving no sensitive customer payment information stored locally on merchant servers.
|
15 |
<br /> <br />
|
16 |
Through the Optimal integration merchants also have the option to enable Threatmetrix fraud detection and management services. ThreatMetrix works by collecting relevant data about the customer and the order, and validating this information during the checkout. Fully integrated into the NETBANX payment gateway, enabling the ThreatMetrix option will allow merchants to automatically hold and flag suspicious orders, drastically reducing any fraud occurrences. Depending on the Score returned by ThreatMetrix an order can be held and flagged or altogether denied during the checkout.</description>
|
17 |
+
<notes>-- 20151014 - Updated for multiple shipping address not allowed. 
|
18 |
+

|
19 |
+
-- 20150826 - Update for bug for gift cards
|
20 |
+

|
21 |
+
-- 20150815 - correction for points
|
22 |
+

|
23 |
+
-- 20150812 - update for 64 bit cpu rounding issue
|
24 |
+

|
25 |
+
-- 20150806 - corrected issue with ancilary fees and points system. - version 0.4.6
|
26 |
+

|
27 |
+
-- Undated
|
28 |
+
Implements Interac payments feature.</notes>
|
29 |
+
<authors><author><name>Shane Harper</name><user>shane</user><email>sharper@collinsharper.com</email></author></authors>
|
30 |
+
<date>2015-11-27</date>
|
31 |
+
<time>19:40:03</time>
|
32 |
+
<contents><target name="magecommunity"><dir name="Op"><dir name="Netbanx"><dir name="Block"><dir name="Adminhtml"><dir name="Errorcode"><dir name="Edit"><file name="Form.php" hash="8c07a510c27f17c45d8a1a41875c7978"/></dir><file name="Edit.php" hash="be33b878a89b89ccb858d806620c3634"/><file name="Grid.php" hash="ca6b8c4d6a11b247209db88d961afff5"/></dir><file name="Errorcode.php" hash="61561a781e8af3b6d4f28374c0edd4e8"/><dir name="Risk"><dir name="Edit"><file name="Form.php" hash="910ae85b20a3293b0483a80f4f55fa13"/><dir name="Tab"><file name="Form.php" hash="30ce159c4574601e814b615b79186e5e"/></dir><file name="Tabs.php" hash="2280cee2fac93a77127589331d884cfb"/></dir><file name="Edit.php" hash="b61dd9d2f55cb3febe2f035dd659e28f"/><file name="Grid.php" hash="a19d12abe03378de59b5e2185b1d1c10"/></dir><file name="Risk.php" hash="0b51702f93dd8615b0da89256497b433"/></dir><dir name="Customer"><dir name="Cards"><file name="Form.php" hash="8678b98869e5c93541a68b46ea198dec"/><file name="Grid.php" hash="2c4014b8d6615f6e88901eada6b4878f"/></dir><file name="Cards.php" hash="252a4a45712741c0a9e0dcda94dc69d2"/></dir><dir name="Form"><file name="Creditcard.php" hash="bdb7281e38ac2dc9bd4d492cefe08750"/></dir><dir name="Info"><file name="Creditcard.php" hash="89a039eac38138e3b8d1289cc48c03bd"/></dir><file name="Navigation.php" hash="ca727a16864e72e86127d1ccf54fe0f7"/><file name="Threat.php" hash="fd3392d6bc9ccc8021c6ae0813d8602b"/></dir><dir name="Helper"><file name="Data.php" hash="6c2c0bf9ca735eb93c123c7c7f385f7d"/></dir><dir name="Model"><dir name="Client"><file name="Abstract.php" hash="b706632d95d5868ee8c41f3b3f405318"/></dir><dir name="Config"><file name="Mode.php" hash="fb86226e6bb85c40de52b3ec461fce32"/><file name="Status.php" hash="32b8288461e55f40f0550b91653c664d"/><file name="Transaction.php" hash="298c32e0507236a6abc6ef40e154d258"/></dir><dir name="Creditcard"><file name="Client.php" hash="c3c6d310587a3b45d8a40e3c5dceeb83"/></dir><file name="Creditcard.php" hash="4328c892c621263b023590153d39cc01"/><file name="Errorcode.php" hash="a2b53ce2a0a0997b9327c09cdacb5ea0"/><dir name="Hosted"><file name="Client.php" hash="9017f031459ec22cec9e56ebce47ae86"/><file name="Exception.php" hash="24343035f9cfdbe70d31991b121c9d6e"/></dir><dir name="Merchant"><file name="Customer.php" hash="b4f06b758149a1f05a1593f0eb96d86f"/></dir><dir name="Method"><file name="Hosted.php" hash="10ea9607fd9ef9d813115192458a3ceb"/></dir><dir name="Mysql4"><dir name="Creditcard"><file name="Collection.php" hash="e95dd1cbac319e85b920085f62128c81"/></dir><file name="Creditcard.php" hash="ccd40c22b3b985306b26b6f992c4f14c"/><dir name="Errorcode"><file name="Collection.php" hash="07406418b492a258c18dd8c80410c9df"/></dir><file name="Errorcode.php" hash="d24a67ea9dc8f99a9bf72d5e37041cb2"/><dir name="Merchant"><dir name="Customer"><file name="Collection.php" hash="d368dd117f43f21699db57a07dbcc48d"/></dir><file name="Customer.php" hash="b69a6c2a73e896ba30e4bf164269ae6a"/></dir><dir name="Profile"><file name="Collection.php" hash="658fe9f162de24dd941567236cc5a505"/></dir><file name="Profile.php" hash="4b3d5aa41fa1994e308f221c9a105e44"/><dir name="Risk"><file name="Collection.php" hash="5ffdb141ab0439a301d2ab16de8e9624"/></dir><file name="Risk.php" hash="e1e23dc033a0544f98b5a47188255407"/></dir><file name="Observer.php" hash="b9a4289546d3180a70fac23e334c1b46"/><dir name="Profile"><file name="Client.php" hash="749a478d063c6fccf508987bb97c925d"/></dir><file name="Profile.php" hash="a136d3eac78333c11046148824b1fcc9"/><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="c79581cd750b87c371441630324b4543"/></dir></dir><file name="Risk.php" hash="e3b7c69633b79a0a6f5f62b004fbd2e1"/><dir name="Sales"><file name="Order.php" hash="5d048ef6d13958264915c68cb1816b9e"/></dir><dir name="Source"><file name="Cctype.php" hash="1f3c18bf6648548a04f0d7d245cf3c61"/></dir><dir name="Web"><file name="Client.php" hash="d5a5c1c929c6de0ffb6eb9dbb4ea9592"/></dir></dir><dir name="Test"><dir name="Model"><dir name="Hosted"><file name="Client.php" hash="36f33d620dd0914e4dd9c023db9e543e"/></dir><dir name="Method"><file name="Hosted.php" hash="2c6bb3e66d854462b105b891aaac1568"/></dir><file name="Observer.php" hash="a1484978e02274787f0d9439882c63cb"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="ErrorcodesController.php" hash="691e0bc94e97ace9f912349deb7c12b1"/><file name="ThreatController.php" hash="abe574a9b7ea189108d4e69c7ceca9ce"/></dir><dir name="Frontend"><file name="OptimalController.php" hash="39e442f593dd490bee337cd4ca757b91"/></dir><file name="HandlerController.php" hash="12cec56a82ef3ce91480dbf015d8ba5f"/></dir><dir name="data"><dir name="optimal_setup"><dir name="csv"><file name="common-codes-0.3.3.csv" hash="e3c9195dbe01cfb5cf341378271b1240"/><file name="webservices-codes-0.3.3.csv" hash="8fc5562ff9bb3e5c3235fa6c7c21c0d5"/></dir><file name="data-upgrade-0.3.4-0.3.5.php" hash="4afe267d997446c46c0a1fcba771d1e1"/></dir></dir><dir name="etc"><file name="CHANGELOG.txt" hash="80986faa3730be775eaf432ecc3e6f3c"/><file name="adminhtml.xml" hash="30a4af4a510783219bbee940d185fb19"/><file name="config.xml" hash="224012631dc8a43625cd94adc6cd27fe"/><file name="system.xml" hash="7a1bd378b32f879e3711cd2cdcfa2e8f"/></dir><dir name="sql"><dir name="optimal_setup"><file name="install-0.1.1.php" hash="422b6afb2d2320f5d9c59cd5bff0dc3d"/><file name="install-0.2.0.php" hash="6a97d7f7b4513bce80c9bf151bd21fdc"/><file name="install-0.2.1.php" hash="2ec1146f6739ff03f90ea07217e9e968"/><file name="install-0.2.2.php" hash="3fdd9863b235b275593893af34abcefb"/><file name="install-0.2.3.php" hash="e07b474749b6ee431e90343a9c79f46b"/><file name="install-0.2.4.php" hash="e07b474749b6ee431e90343a9c79f46b"/><file name="install-0.2.5.php" hash="84228a0ce89a63179095a9790167715d"/><file name="install-0.2.6.php" hash="2986f567d1e7b4dd3e5ebdd8abd612c4"/><file name="install-0.2.7.php" hash="2986f567d1e7b4dd3e5ebdd8abd612c4"/><file name="install-0.2.9.php" hash="2986f567d1e7b4dd3e5ebdd8abd612c4"/><file name="install-0.3.5.php" hash="4abfc294ba5df2e55772e4474af173da"/><file name="mysql4-install-0.1.1.php" hash="422b6afb2d2320f5d9c59cd5bff0dc3d"/><file name="mysql4-install-0.2.0.php" hash="6a97d7f7b4513bce80c9bf151bd21fdc"/><file name="mysql4-install-0.2.1.php" hash="2ec1146f6739ff03f90ea07217e9e968"/><file name="mysql4-install-0.2.2.php" hash="3fdd9863b235b275593893af34abcefb"/><file name="mysql4-install-0.2.3.php" hash="e07b474749b6ee431e90343a9c79f46b"/><file name="mysql4-install-0.2.4.php" hash="e07b474749b6ee431e90343a9c79f46b"/><file name="mysql4-install-0.2.5.php" hash="84228a0ce89a63179095a9790167715d"/><file name="mysql4-install-0.2.6.php" hash="2986f567d1e7b4dd3e5ebdd8abd612c4"/><file name="mysql4-install-0.2.7.php" hash="2986f567d1e7b4dd3e5ebdd8abd612c4"/><file name="mysql4-install-0.2.9.php" hash="30039fc096f8db2a82a3268b467ef856"/><file name="mysql4-install-0.3.5.php" hash="fbd3e9db470b8c59353e0fd1677fdb15"/><file name="mysql4-upgrade-0.1.1-0.2.7.php" hash="2986f567d1e7b4dd3e5ebdd8abd612c4"/><file name="mysql4-upgrade-0.4.1-0.4.2.php" hash="8387580ae133615a3de551eaa86a0e2c"/><file name="mysql4-upgrade-0.4.3-0.4.4.php" hash="5cb4f76fccf0f97f9b4c5e5ebd530f70"/><file name="upgrade-0.1.1-0.2.7.php" hash="2986f567d1e7b4dd3e5ebdd8abd612c4"/><file name="upgrade-0.2.9-0.3.0.php" hash="989e6c4043fccfa6cdcba0a09938dd07"/><file name="upgrade-0.3.1-0.3.2.php" hash="aea721b40772c92db786b96fbb9c8bda"/><file name="upgrade-0.3.4-0.3.5.php" hash="5283e3567c7d35e22b4c87bbc89a0eb3"/><file name="upgrade-0.3.7-0.3.8.php" hash="5283e3567c7d35e22b4c87bbc89a0eb3"/><file name="upgrade-0.4.1-0.4.2.php" hash="8387580ae133615a3de551eaa86a0e2c"/><file name="upgrade-0.4.3-0.4.4.php" hash="5cb4f76fccf0f97f9b4c5e5ebd530f70"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="optimal"><dir name="form"><file name="creditcard.phtml" hash="550c80a4e0dc4224946de029f4c3ecf6"/></dir><dir name="info"><file name="creditcard.phtml" hash="b40291e8e97dbcb6b7cf2f4b8ffb93f5"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="optimal.xml" hash="03c64fd49785bfca34ee3249cc9bc97d"/></dir><dir name="template"><dir name="optimal"><dir name="customer"><dir name="cards"><file name="form.phtml" hash="be217c0a2959b8ef1284d5e45813bd03"/><file name="grid.phtml" hash="33a02b86b53044c4ff5a6c839d86ab01"/></dir><file name="cards.phtml" hash="ed3f6e56b134674e7d8ddcb6a1deac59"/></dir><dir name="form"><file name="creditcard.phtml" hash="a4503c38c0235aa3450a2a3dab765204"/></dir><dir name="info"><file name="creditcard.phtml" hash="c11c746e88ac2b299af4a1f425300bc7"/></dir><file name="threatmeter.phtml" hash="3dd0ea7621038895aa1dd1e322ba7d99"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Op_Netbanx.xml" hash="cd0d39c4aaef3ca498ab64d26e30d1a4"/></dir></target></contents>
|
33 |
<compatible/>
|
34 |
+
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
35 |
</package>
|