Skip to content

Commit

Permalink
1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
pman-emp committed Jun 25, 2015
1 parent 692b89b commit e25b746
Show file tree
Hide file tree
Showing 13 changed files with 152 additions and 7 deletions.
3 changes: 3 additions & 0 deletions app/code/community/EMerchantPay/Genesis/Block/Form/Checkout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
*/
class EMerchantPay_Genesis_Block_Form_Checkout extends Mage_Payment_Block_Form
{
/**
* Setup
*/
protected function _construct()
{
parent::_construct();
Expand Down
3 changes: 3 additions & 0 deletions app/code/community/EMerchantPay/Genesis/Block/Form/Direct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
*/
class EMerchantPay_Genesis_Block_Form_Direct extends Mage_Payment_Block_Form
{
/**
* Setup
*/
protected function _construct()
{
parent::_construct();
Expand Down
3 changes: 1 addition & 2 deletions app/code/community/EMerchantPay/Genesis/Model/Checkout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

class EMerchantPay_Genesis_Model_Checkout extends Mage_Payment_Model_Method_Abstract
{
protected $_name = 'emerchantpay';
protected $_code = 'emerchantpay_checkout';

protected $_formBlockType = 'emerchantpay/form_checkout';
Expand Down Expand Up @@ -597,7 +596,7 @@ public function getOrderPlaceRedirectUrl()
private function getHelper($helper = '')
{
if (empty($helper)) {
return Mage::helper($this->_name);
return Mage::helper('emerchantpay');
} else {
return Mage::helper($helper);
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/EMerchantPay/Genesis/controllers/CheckoutController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function notifyAction()

$reconcile = $notification->getReconciliationObject();

if (isset($reconcile)) {
if (isset($reconcile->unique_id)) {
$this->checkout->processNotification($reconcile);

$this->getResponse()->setHeader('Content-type', 'application/xml');
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/EMerchantPay/Genesis/controllers/DirectController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function notifyAction()

$reconcile = $notification->getReconciliationObject();

if ($reconcile) {
if (isset($reconcile->unique_id)) {
$this->direct->processNotification($reconcile);

$this->getResponse()->setHeader('Content-type', 'application/xml');
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/EMerchantPay/Genesis/etc/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<config>
<modules>
<EMerchantPay_Genesis>
<version>1.2.0</version>
<version>1.2.1</version>
</EMerchantPay_Genesis>
</modules>

Expand Down
24 changes: 23 additions & 1 deletion app/design/adminhtml/default/default/template/emerchantpay/info/checkout.phtml
View file
Original file line number Diff line number Diff line change
@@ -1 +1,23 @@
More details about the individual transactions can be found under the "Transactions" section
<?php
/*
* Copyright (C) 2015 eMerchantPay Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* @author eMerchantPay
* @copyright 2015 eMerchantPay Ltd.
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2 (GPL-2.0)
*/
?>

<p>
<?php echo $this->__('More details about the individual transactions can be found under the "Transactions" section'); ?>
</p>
24 changes: 23 additions & 1 deletion app/design/adminhtml/default/default/template/emerchantpay/info/direct.phtml
View file
Original file line number Diff line number Diff line change
@@ -1 +1,23 @@
More details about the individual transactions can be found under the "Transactions" section
<?php
/*
* Copyright (C) 2015 eMerchantPay Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* @author eMerchantPay
* @copyright 2015 eMerchantPay Ltd.
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2 (GPL-2.0)
*/
?>

<p>
<?php echo $this->__('More details about the individual transactions can be found under the "Transactions" section'); ?>
</p>
20 changes: 20 additions & 0 deletions app/design/frontend/base/default/template/emerchantpay/form/checkout.phtml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
<?php
/*
* Copyright (C) 2015 eMerchantPay Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* @author eMerchantPay
* @copyright 2015 eMerchantPay Ltd.
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2 (GPL-2.0)
*/
?>
<?php $_code = $this->getMethodCode() ?>

<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
<li>
<p>
Expand Down
19 changes: 19 additions & 0 deletions app/design/frontend/base/default/template/emerchantpay/info/checkout.phtml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
<?php
/*
* Copyright (C) 2015 eMerchantPay Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* @author eMerchantPay
* @copyright 2015 eMerchantPay Ltd.
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2 (GPL-2.0)
*/
?>
<table>
<tr>
<td><?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?></td>
Expand Down
19 changes: 19 additions & 0 deletions app/design/frontend/base/default/template/emerchantpay/info/direct.phtml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
<?php
/*
* Copyright (C) 2015 eMerchantPay Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* @author eMerchantPay
* @copyright 2015 eMerchantPay Ltd.
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2 (GPL-2.0)
*/
?>
<table>
<tr>
<td><?php echo $this->htmlEscape($this->getMethod()->getTitle()) ?></td>
Expand Down
19 changes: 19 additions & 0 deletions app/design/frontend/base/default/template/emerchantpay/redirect/checkout.phtml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
<?php
/*
* Copyright (C) 2015 eMerchantPay Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* @author eMerchantPay
* @copyright 2015 eMerchantPay Ltd.
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2 (GPL-2.0)
*/
?>
<!DOCTYPE>
<html>
<head>
Expand Down
19 changes: 19 additions & 0 deletions app/design/frontend/base/default/template/emerchantpay/redirect/direct.phtml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
<?php
/*
* Copyright (C) 2015 eMerchantPay Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* @author eMerchantPay
* @copyright 2015 eMerchantPay Ltd.
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2 (GPL-2.0)
*/
?>
<!DOCTYPE>
<html>
<head>
Expand Down

0 comments on commit e25b746

Please sign in to comment.