Version Notes
- added failure handling because of waiting and success status matching
- bugfix: prevent checkout without creditcard registration
Download this release
Release Info
Developer | Heidelberger Payment GmbH |
Extension | Heidelpay |
Version | 14.10.09 |
Comparing to | |
See all releases |
Code changes from version 14.09.12 to 14.10.09
- app/code/local/Mage/Heidelpay/Model/Method/Hpcc.php +105 -88
- app/code/local/Mage/Heidelpay/Model/Method/Hpdc.php +32 -16
- app/code/local/Mage/Heidelpay/Model/Method/Hpxc.php +31 -15
- app/code/local/Mage/Heidelpay/Model/Method/Payment.php +1 -1
- app/code/local/Mage/Heidelpay/controllers/PaymentController.php +5 -2
- app/code/local/Mage/Heidelpay/etc/config.xml +1 -1
- app/design/frontend/base/default/template/heidelpay/form/ccard.phtml +6 -0
- app/design/frontend/base/default/template/heidelpay/form/debitcard.phtml +6 -0
- app/design/frontend/base/default/template/heidelpay/form/xcard.phtml +6 -0
- app/locale/de_DE/Mage_Heidelpay.csv +3 -1
- app/locale/en_US/Mage_Heidelpay.csv +3 -1
- package.xml +7 -6
app/code/local/Mage/Heidelpay/Model/Method/Hpcc.php
CHANGED
@@ -2,104 +2,121 @@
|
|
2 |
class Mage_Heidelpay_Model_Method_Hpcc extends Mage_Heidelpay_Model_Method_Payment
|
3 |
{
|
4 |
/**
|
5 |
-
|
6 |
-
|
7 |
-
|
8 |
-
|
9 |
protected $_code = 'hpcc';
|
10 |
protected $_formBlockType = 'payment/form';
|
11 |
protected $_infoBlockType = 'heidelpay/info_payment';
|
12 |
-
|
13 |
-
|
14 |
-
|
15 |
-
|
16 |
-
|
17 |
-
|
18 |
-
|
19 |
-
|
20 |
-
|
21 |
-
|
22 |
-
|
23 |
-
|
24 |
-
|
25 |
-
|
26 |
-
|
27 |
-
|
28 |
-
|
29 |
-
|
30 |
-
|
31 |
-
|
32 |
-
|
33 |
-
|
34 |
-
|
35 |
-
|
36 |
-
|
37 |
-
|
38 |
-
|
39 |
-
|
40 |
-
|
41 |
-
|
42 |
-
|
43 |
-
|
44 |
-
|
45 |
-
|
46 |
-
|
47 |
-
|
48 |
-
|
49 |
-
|
50 |
-
|
51 |
-
|
52 |
-
|
53 |
-
|
54 |
-
|
55 |
-
|
56 |
-
|
57 |
-
|
58 |
-
|
59 |
-
|
60 |
-
|
61 |
-
|
62 |
-
|
63 |
-
|
64 |
-
|
65 |
-
|
|
|
66 |
|
67 |
/**
|
68 |
-
|
69 |
-
|
70 |
-
|
71 |
-
|
72 |
-
|
73 |
-
|
74 |
-
|
75 |
-
|
76 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
77 |
|
78 |
-
|
79 |
-
|
80 |
-
|
81 |
-
$post = Mage::app()->getRequest()->getParams();
|
82 |
-
if ($post['payment']['method'] == $this->_code) {
|
83 |
-
if (isset($post['heidelpay_use_ccard']) && $post['heidelpay_use_ccard'] == 1){
|
84 |
-
$this->getCheckout()->setHeidelpayUseCcard(1);
|
85 |
-
$customer = $this->getQuote()->getCustomer();
|
86 |
-
$this->getSession()->setHpUniqueId($customer->getHeidelpay_ccard_unique_id());
|
87 |
-
} else {
|
88 |
-
$this->getCheckout()->setHeidelpayUseCcard(0);
|
89 |
-
}
|
90 |
-
}
|
91 |
-
return $this;
|
92 |
-
}
|
93 |
-
|
94 |
/**
|
95 |
* Retrieve payment method title
|
96 |
*
|
97 |
* @return string
|
98 |
*/
|
99 |
public function getTitle()
|
100 |
-
|
101 |
return $this->_getHelper('heidelpay')->__($this->getConfigData('title'));
|
102 |
-
|
103 |
|
104 |
/**
|
105 |
* Retrieve payment method title for Admin
|
@@ -107,8 +124,8 @@ class Mage_Heidelpay_Model_Method_Hpcc extends Mage_Heidelpay_Model_Method_Payme
|
|
107 |
* @return string
|
108 |
*/
|
109 |
public function getAdminTitle()
|
110 |
-
|
111 |
-
|
112 |
-
|
113 |
|
114 |
}
|
2 |
class Mage_Heidelpay_Model_Method_Hpcc extends Mage_Heidelpay_Model_Method_Payment
|
3 |
{
|
4 |
/**
|
5 |
+
* unique internal payment method identifier
|
6 |
+
*
|
7 |
+
* @var string [a-z0-9_]
|
8 |
+
**/
|
9 |
protected $_code = 'hpcc';
|
10 |
protected $_formBlockType = 'payment/form';
|
11 |
protected $_infoBlockType = 'heidelpay/info_payment';
|
12 |
+
|
13 |
+
public function getLightbox($descArea = false)
|
14 |
+
{
|
15 |
+
$this->getSession()->setHpUniqueId('');
|
16 |
+
$this->getCheckout()->setHeidelpayUseCcard(0);
|
17 |
+
if ($this->getConfigData('modulemode') == 'AFTER') return '';
|
18 |
+
if ($descArea){
|
19 |
+
$info = '';
|
20 |
+
$customer = $this->getQuote()->getCustomer();
|
21 |
+
$brand = $customer->getHeidelpay_ccard_brand();
|
22 |
+
$ccard = $customer->getHeidelpay_ccard();
|
23 |
+
$valid = $customer->getHeidelpay_ccard_valid_until();
|
24 |
+
if (empty($brand) || empty($ccard) || empty($valid)){
|
25 |
+
$info.= '';
|
26 |
+
$this->actualPaymethod = 'CC';
|
27 |
+
$src = $this->handleRegister();
|
28 |
+
$info.= '<iframe src="'.$src.'" allowtransparency="true" frameborder="0" width="500" height="210"></iframe>';
|
29 |
+
} else {
|
30 |
+
$this->actualPaymethod = 'CC';
|
31 |
+
$src = $this->handleRegister();
|
32 |
+
$info.= '<div id="heidelpay_reuse_'.$this->_code.'">'
|
33 |
+
. preg_replace('/{NAME}/', $customer->getLastname(), $this->_getHelper('heidelpay')->__('Dear {NAME}, you used the following creditcard on your last visit. Do you want to re-use it?'))
|
34 |
+
. '<br><br>'.$this->_getHelper('heidelpay')->__('Cardtype:').' '
|
35 |
+
. $brand
|
36 |
+
. '<br>'.$this->_getHelper('heidelpay')->__('No.').' '
|
37 |
+
. $ccard
|
38 |
+
. '<br>'.$this->_getHelper('heidelpay')->__('Valid until:').' '
|
39 |
+
. $valid
|
40 |
+
. '</div>'
|
41 |
+
. '<div id="heidelpay_new_'.$this->_code.'" style="display: none">'
|
42 |
+
. '<iframe src="'.$src.'" allowtransparency="true" frameborder="0" width="500" height="210"></iframe>'
|
43 |
+
. '</div>'
|
44 |
+
. '<br><br><input type="checkbox" name="heidelpay_use_ccard" id="heidelpay_use_ccard" value="1" checked
|
45 |
+
onClick="
|
46 |
+
var reuseObj = document.getElementById(\'heidelpay_reuse_'.$this->_code.'\');
|
47 |
+
var newObj = document.getElementById(\'heidelpay_new_'.$this->_code.'\');
|
48 |
+
if (this.checked){
|
49 |
+
reuseObj.style.display = \'block\';
|
50 |
+
newObj.style.display = \'none\';
|
51 |
+
} else {
|
52 |
+
reuseObj.style.display = \'none\';
|
53 |
+
newObj.style.display = \'block\';
|
54 |
+
}
|
55 |
+
"> '.$this->_getHelper('heidelpay')->__('Yes, I want to re-use my creditcard.').' ';
|
56 |
+
}
|
57 |
+
return $info;
|
58 |
+
}
|
59 |
+
}
|
60 |
+
|
61 |
+
public function getHeidelpayIFrameUrl()
|
62 |
+
{
|
63 |
+
$this->actualPaymethod = 'CC';
|
64 |
+
$src = $this->handleDebit();
|
65 |
+
return $src;
|
66 |
+
}
|
67 |
|
68 |
/**
|
69 |
+
* Retrieve block type for method form generation
|
70 |
+
*
|
71 |
+
* @return string
|
72 |
+
*/
|
73 |
+
public function getFormBlockType()
|
74 |
+
{
|
75 |
+
$this->_formBlockType = 'heidelpay/form_ccard';
|
76 |
+
return $this->_formBlockType;
|
77 |
+
}
|
78 |
+
|
79 |
+
public function validate(){
|
80 |
+
parent::validate();
|
81 |
+
|
82 |
+
if (Mage::app()->getRequest()->getActionName() != 'savePayment') return $this;
|
83 |
+
if ($this->getConfigData('modulemode') == 'AFTER') return $this;
|
84 |
+
|
85 |
+
$post = Mage::app()->getRequest()->getParams();
|
86 |
+
$hpUniqeID = $this->getSession()->getHpUniqueId();
|
87 |
+
$UseCcard = $this->getCheckout()->getHeidelpayUseCcard();
|
88 |
+
|
89 |
+
if ($post['payment']['method'] == $this->_code) {
|
90 |
+
if($UseCcard == 1) {
|
91 |
+
if (!array_key_exists('heidelpay_use_ccard',$post)){
|
92 |
+
Mage::throwException($this->_getHelper('heidelpay')->__('Please use the next-button next to our credit card information to proceed.'));
|
93 |
+
}
|
94 |
+
}
|
95 |
+
|
96 |
+
if ($post['payment']['method'] == $this->_code) {
|
97 |
+
if (isset($post['heidelpay_use_ccard']) && $post['heidelpay_use_ccard'] == 1){
|
98 |
+
$customer = $this->getQuote()->getCustomer();
|
99 |
+
$this->getSession()->setHpUniqueId($customer->getHeidelpay_ccard_unique_id());
|
100 |
+
} elseif(empty($hpUniqeID)) {
|
101 |
+
Mage::throwException($this->_getHelper('heidelpay')->__('Please use the next-button next to our credit card information to proceed.'));
|
102 |
+
}
|
103 |
+
}
|
104 |
+
|
105 |
+
$this->getCheckout()->setHeidelpayUseCcard(1);
|
106 |
+
}
|
107 |
|
108 |
+
return $this;
|
109 |
+
}
|
110 |
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
111 |
/**
|
112 |
* Retrieve payment method title
|
113 |
*
|
114 |
* @return string
|
115 |
*/
|
116 |
public function getTitle()
|
117 |
+
{
|
118 |
return $this->_getHelper('heidelpay')->__($this->getConfigData('title'));
|
119 |
+
}
|
120 |
|
121 |
/**
|
122 |
* Retrieve payment method title for Admin
|
124 |
* @return string
|
125 |
*/
|
126 |
public function getAdminTitle()
|
127 |
+
{
|
128 |
+
return $this->_getHelper('heidelpay')->__($this->getConfigData('title'));
|
129 |
+
}
|
130 |
|
131 |
}
|
app/code/local/Mage/Heidelpay/Model/Method/Hpdc.php
CHANGED
@@ -75,22 +75,38 @@ class Mage_Heidelpay_Model_Method_Hpdc extends Mage_Heidelpay_Model_Method_Payme
|
|
75 |
return $this->_formBlockType;
|
76 |
}
|
77 |
|
78 |
-
|
79 |
-
|
80 |
-
|
81 |
-
|
82 |
-
|
83 |
-
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
|
88 |
-
|
89 |
-
|
90 |
-
|
91 |
-
|
92 |
-
|
93 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
94 |
/**
|
95 |
* Retrieve payment method title
|
96 |
*
|
75 |
return $this->_formBlockType;
|
76 |
}
|
77 |
|
78 |
+
public function validate(){
|
79 |
+
parent::validate();
|
80 |
+
|
81 |
+
if (Mage::app()->getRequest()->getActionName() != 'savePayment'){ return $this;}
|
82 |
+
if ($this->getConfigData('modulemode') == 'AFTER') return $this;
|
83 |
+
|
84 |
+
$post = Mage::app()->getRequest()->getParams();
|
85 |
+
$hpUniqeID = $this->getSession()->getHpUniqueId();
|
86 |
+
$UseCcard = $this->getCheckout()->getHeidelpayUseDcard();
|
87 |
+
|
88 |
+
if ($post['payment']['method'] == $this->_code) {
|
89 |
+
if($UseCcard == 1) {
|
90 |
+
if (!array_key_exists('heidelpay_use_dcard',$post)){
|
91 |
+
Mage::throwException($this->_getHelper('heidelpay')->__('Please use the next-button next to our debit card information to proceed.'));
|
92 |
+
}
|
93 |
+
}
|
94 |
+
|
95 |
+
if ($post['payment']['method'] == $this->_code) {
|
96 |
+
if (isset($post['heidelpay_use_dcard']) && $post['heidelpay_use_dcard'] == 1){
|
97 |
+
$customer = $this->getQuote()->getCustomer();
|
98 |
+
$this->getSession()->setHpUniqueId($customer->getHeidelpay_dcard_unique_id());
|
99 |
+
} elseif(empty($hpUniqeID)) {
|
100 |
+
Mage::throwException($this->_getHelper('heidelpay')->__('Please use the next-button next to our debit card information to proceed.'));
|
101 |
+
}
|
102 |
+
}
|
103 |
+
|
104 |
+
$this->getCheckout()->setHeidelpayUseDcard(1);
|
105 |
+
}
|
106 |
+
|
107 |
+
return $this;
|
108 |
+
}
|
109 |
+
|
110 |
/**
|
111 |
* Retrieve payment method title
|
112 |
*
|
app/code/local/Mage/Heidelpay/Model/Method/Hpxc.php
CHANGED
@@ -76,21 +76,37 @@ class Mage_Heidelpay_Model_Method_Hpxc extends Mage_Heidelpay_Model_Method_Payme
|
|
76 |
return $this->_formBlockType;
|
77 |
}
|
78 |
|
79 |
-
|
80 |
-
|
81 |
-
|
82 |
-
|
83 |
-
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
|
88 |
-
|
89 |
-
|
90 |
-
|
91 |
-
|
92 |
-
|
93 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
94 |
|
95 |
/**
|
96 |
* Retrieve payment method title
|
76 |
return $this->_formBlockType;
|
77 |
}
|
78 |
|
79 |
+
public function validate(){
|
80 |
+
parent::validate();
|
81 |
+
|
82 |
+
if (Mage::app()->getRequest()->getActionName() != 'savePayment') return $this;
|
83 |
+
if ($this->getConfigData('modulemode') == 'AFTER') return $this;
|
84 |
+
|
85 |
+
$post = Mage::app()->getRequest()->getParams();
|
86 |
+
$hpUniqeID = $this->getSession()->getHpUniqueId();
|
87 |
+
$UseCcard = $this->getCheckout()->getHeidelpayUseXcard();
|
88 |
+
|
89 |
+
if ($post['payment']['method'] == $this->_code) {
|
90 |
+
if($UseCcard == 1) {
|
91 |
+
if (!array_key_exists('heidelpay_use_xcard',$post)){
|
92 |
+
Mage::throwException($this->_getHelper('heidelpay')->__('Please use the next-button next to our credit card information to proceed.'));
|
93 |
+
}
|
94 |
+
}
|
95 |
+
|
96 |
+
if ($post['payment']['method'] == $this->_code) {
|
97 |
+
if (isset($post['heidelpay_use_xcard']) && $post['heidelpay_use_xcard'] == 1){
|
98 |
+
$customer = $this->getQuote()->getCustomer();
|
99 |
+
$this->getSession()->setHpUniqueId($customer->getHeidelpay_xcard_unique_id());
|
100 |
+
} elseif(empty($hpUniqeID)) {
|
101 |
+
Mage::throwException($this->_getHelper('heidelpay')->__('Please use the next-button next to our credit card information to proceed.'));
|
102 |
+
}
|
103 |
+
}
|
104 |
+
|
105 |
+
$this->getCheckout()->setHeidelpayUseXcard(1);
|
106 |
+
}
|
107 |
+
|
108 |
+
return $this;
|
109 |
+
}
|
110 |
|
111 |
/**
|
112 |
* Retrieve payment method title
|
app/code/local/Mage/Heidelpay/Model/Method/Payment.php
CHANGED
@@ -10,7 +10,7 @@ class Mage_Heidelpay_Model_Method_Payment extends Mage_Payment_Model_Method_Abst
|
|
10 |
protected $_code = 'payment';
|
11 |
protected $_order;
|
12 |
protected $_moduleMode = 'DIRECT';
|
13 |
-
protected $version = '14.09
|
14 |
|
15 |
/**
|
16 |
* Availability options
|
10 |
protected $_code = 'payment';
|
11 |
protected $_order;
|
12 |
protected $_moduleMode = 'DIRECT';
|
13 |
+
protected $version = '14.10.09';
|
14 |
|
15 |
/**
|
16 |
* Availability options
|
app/code/local/Mage/Heidelpay/controllers/PaymentController.php
CHANGED
@@ -128,7 +128,7 @@ class Mage_Heidelpay_PaymentController extends Mage_Core_Controller_Front_Action
|
|
128 |
$order->loadByIncrementId($session->getLastRealOrderId());
|
129 |
$payment = $order->getPayment()->getMethodInstance();
|
130 |
// Load last status
|
131 |
-
if ($order->getStatus() == $payment->getPaymentState()) {
|
132 |
$this->_redirect('heidelpay/payment/success', array('_forced_secure' => true, '_store_to_url' => true, '_nosid' => true));
|
133 |
return;
|
134 |
}
|
@@ -726,6 +726,9 @@ class Mage_Heidelpay_PaymentController extends Mage_Core_Controller_Front_Action
|
|
726 |
{
|
727 |
$request = Mage::app()->getRequest()->getParams();
|
728 |
$this->getSession()->setHpUniqueId($request['uniqueId']);
|
|
|
|
|
|
|
729 |
echo '<script>top.payment.save()</script>';
|
730 |
return;
|
731 |
}/*}}}*/
|
@@ -737,7 +740,7 @@ class Mage_Heidelpay_PaymentController extends Mage_Core_Controller_Front_Action
|
|
737 |
$order->loadByIncrementId($session->getLastRealOrderId());
|
738 |
$payment = $order->getPayment()->getMethodInstance();
|
739 |
// Load last status
|
740 |
-
if ($order->getStatus() == $payment->getPaymentState()) {
|
741 |
$this->_redirect('heidelpay/payment/success', array('_forced_secure' => true, '_store_to_url' => true, '_nosid' => true));
|
742 |
return;
|
743 |
}
|
128 |
$order->loadByIncrementId($session->getLastRealOrderId());
|
129 |
$payment = $order->getPayment()->getMethodInstance();
|
130 |
// Load last status
|
131 |
+
if (($order->getStatus() == $payment->getPaymentState()) and ($payment->getPaymentState() != $payment->getWaitState())) {
|
132 |
$this->_redirect('heidelpay/payment/success', array('_forced_secure' => true, '_store_to_url' => true, '_nosid' => true));
|
133 |
return;
|
134 |
}
|
726 |
{
|
727 |
$request = Mage::app()->getRequest()->getParams();
|
728 |
$this->getSession()->setHpUniqueId($request['uniqueId']);
|
729 |
+
$this->getCheckout()->setHeidelpayUseCcard(0);
|
730 |
+
$this->getCheckout()->setHeidelpayUseXcard(0);
|
731 |
+
$this->getCheckout()->setHeidelpayUseDcard(0);
|
732 |
echo '<script>top.payment.save()</script>';
|
733 |
return;
|
734 |
}/*}}}*/
|
740 |
$order->loadByIncrementId($session->getLastRealOrderId());
|
741 |
$payment = $order->getPayment()->getMethodInstance();
|
742 |
// Load last status
|
743 |
+
if (($order->getStatus() == $payment->getPaymentState()) and ($payment->getPaymentState() != $payment->getWaitState())) {
|
744 |
$this->_redirect('heidelpay/payment/success', array('_forced_secure' => true, '_store_to_url' => true, '_nosid' => true));
|
745 |
return;
|
746 |
}
|
app/code/local/Mage/Heidelpay/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Mage_Heidelpay>
|
5 |
-
<version>14.09
|
6 |
</Mage_Heidelpay>
|
7 |
</modules>
|
8 |
<!--{{{Global-->
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Mage_Heidelpay>
|
5 |
+
<version>14.10.09</version>
|
6 |
</Mage_Heidelpay>
|
7 |
</modules>
|
8 |
<!--{{{Global-->
|
app/design/frontend/base/default/template/heidelpay/form/ccard.phtml
CHANGED
@@ -20,14 +20,18 @@
|
|
20 |
if($('payment_form_hpcc').visible()){
|
21 |
if($$('#payment_form_hpcc #heidelpay_use_ccard').length == 0){
|
22 |
if($('p_method_hpcc').checked){
|
|
|
23 |
$$('#payment-buttons-container button').first().hide();
|
|
|
24 |
}
|
25 |
if($$('#payment_form_hpcc iframe').length == 0){ $$('#payment-buttons-container button').first().show(); }
|
26 |
}else{
|
27 |
if(($F('p_method_hpcc') == 'hpcc') && !($F('heidelpay_use_ccard') == 1)){
|
28 |
$$('#payment-buttons-container button').first().show();
|
29 |
if($$('#payment_form_hpcc iframe').length > 0){
|
|
|
30 |
$$('#payment-buttons-container button').first().hide();
|
|
|
31 |
}
|
32 |
}
|
33 |
if(($F('p_method_hpcc') == 'hpcc') && ($F('heidelpay_use_ccard') == 1)){
|
@@ -42,7 +46,9 @@
|
|
42 |
if($F('heidelpay_use_ccard') == 1){
|
43 |
$$('#payment-buttons-container button').first().show();
|
44 |
}else{
|
|
|
45 |
$$('#payment-buttons-container button').first().hide();
|
|
|
46 |
}
|
47 |
});
|
48 |
}
|
20 |
if($('payment_form_hpcc').visible()){
|
21 |
if($$('#payment_form_hpcc #heidelpay_use_ccard').length == 0){
|
22 |
if($('p_method_hpcc').checked){
|
23 |
+
<!--[if !IE]-->
|
24 |
$$('#payment-buttons-container button').first().hide();
|
25 |
+
<!--[endif]-->
|
26 |
}
|
27 |
if($$('#payment_form_hpcc iframe').length == 0){ $$('#payment-buttons-container button').first().show(); }
|
28 |
}else{
|
29 |
if(($F('p_method_hpcc') == 'hpcc') && !($F('heidelpay_use_ccard') == 1)){
|
30 |
$$('#payment-buttons-container button').first().show();
|
31 |
if($$('#payment_form_hpcc iframe').length > 0){
|
32 |
+
<!--[if !IE]-->
|
33 |
$$('#payment-buttons-container button').first().hide();
|
34 |
+
<!--[endif]-->
|
35 |
}
|
36 |
}
|
37 |
if(($F('p_method_hpcc') == 'hpcc') && ($F('heidelpay_use_ccard') == 1)){
|
46 |
if($F('heidelpay_use_ccard') == 1){
|
47 |
$$('#payment-buttons-container button').first().show();
|
48 |
}else{
|
49 |
+
<!--[if !IE]-->
|
50 |
$$('#payment-buttons-container button').first().hide();
|
51 |
+
<!--[endif]-->
|
52 |
}
|
53 |
});
|
54 |
}
|
app/design/frontend/base/default/template/heidelpay/form/debitcard.phtml
CHANGED
@@ -20,14 +20,18 @@
|
|
20 |
if($('payment_form_hpdc').visible()){
|
21 |
if($$('#payment_form_hpdc #heidelpay_use_dcard').length == 0){
|
22 |
if($('p_method_hpdc').checked){
|
|
|
23 |
$$('#payment-buttons-container button').first().hide();
|
|
|
24 |
}
|
25 |
if($$('#payment_form_hpdc iframe').length == 0){ $$('#payment-buttons-container button').first().show(); }
|
26 |
}else{
|
27 |
if(($F('p_method_hpdc') == 'hpdc') && !($F('heidelpay_use_dcard') == 1)){
|
28 |
$$('#payment-buttons-container button').first().show();
|
29 |
if($$('#payment_form_hpdc iframe').length > 0){
|
|
|
30 |
$$('#payment-buttons-container button').first().hide();
|
|
|
31 |
}
|
32 |
}
|
33 |
if(($F('p_method_hpdc') == 'hpdc') && ($F('heidelpay_use_dcard') == 1)){
|
@@ -42,7 +46,9 @@
|
|
42 |
if($F('heidelpay_use_dcard') == 1){
|
43 |
$$('#payment-buttons-container button').first().show();
|
44 |
}else{
|
|
|
45 |
$$('#payment-buttons-container button').first().hide();
|
|
|
46 |
}
|
47 |
});
|
48 |
}
|
20 |
if($('payment_form_hpdc').visible()){
|
21 |
if($$('#payment_form_hpdc #heidelpay_use_dcard').length == 0){
|
22 |
if($('p_method_hpdc').checked){
|
23 |
+
<!--[if !IE]-->
|
24 |
$$('#payment-buttons-container button').first().hide();
|
25 |
+
<!--[endif]-->
|
26 |
}
|
27 |
if($$('#payment_form_hpdc iframe').length == 0){ $$('#payment-buttons-container button').first().show(); }
|
28 |
}else{
|
29 |
if(($F('p_method_hpdc') == 'hpdc') && !($F('heidelpay_use_dcard') == 1)){
|
30 |
$$('#payment-buttons-container button').first().show();
|
31 |
if($$('#payment_form_hpdc iframe').length > 0){
|
32 |
+
<!--[if !IE]-->
|
33 |
$$('#payment-buttons-container button').first().hide();
|
34 |
+
<!--[endif]-->
|
35 |
}
|
36 |
}
|
37 |
if(($F('p_method_hpdc') == 'hpdc') && ($F('heidelpay_use_dcard') == 1)){
|
46 |
if($F('heidelpay_use_dcard') == 1){
|
47 |
$$('#payment-buttons-container button').first().show();
|
48 |
}else{
|
49 |
+
<!--[if !IE]-->
|
50 |
$$('#payment-buttons-container button').first().hide();
|
51 |
+
<!--[endif]-->
|
52 |
}
|
53 |
});
|
54 |
}
|
app/design/frontend/base/default/template/heidelpay/form/xcard.phtml
CHANGED
@@ -20,14 +20,18 @@
|
|
20 |
if($('payment_form_hpxc').visible()){
|
21 |
if($$('#payment_form_hpxc #heidelpay_use_xcard').length == 0){
|
22 |
if($('p_method_hpxc').checked){
|
|
|
23 |
$$('#payment-buttons-container button').first().hide();
|
|
|
24 |
}
|
25 |
if($$('#payment_form_hpxc iframe').length == 0){ $$('#payment-buttons-container button').first().show(); }
|
26 |
}else{
|
27 |
if(($F('p_method_hpxc') == 'hpxc') && !($F('heidelpay_use_xcard') == 1)){
|
28 |
$$('#payment-buttons-container button').first().show();
|
29 |
if($$('#payment_form_hpxc iframe').length > 0){
|
|
|
30 |
$$('#payment-buttons-container button').first().hide();
|
|
|
31 |
}
|
32 |
}
|
33 |
if(($F('p_method_hpxc') == 'hpxc') && ($F('heidelpay_use_xcard') == 1)){
|
@@ -42,7 +46,9 @@
|
|
42 |
if($F('heidelpay_use_xcard') == 1){
|
43 |
$$('#payment-buttons-container button').first().show();
|
44 |
}else{
|
|
|
45 |
$$('#payment-buttons-container button').first().hide();
|
|
|
46 |
}
|
47 |
});
|
48 |
}
|
20 |
if($('payment_form_hpxc').visible()){
|
21 |
if($$('#payment_form_hpxc #heidelpay_use_xcard').length == 0){
|
22 |
if($('p_method_hpxc').checked){
|
23 |
+
<!--[if !IE]-->
|
24 |
$$('#payment-buttons-container button').first().hide();
|
25 |
+
<!--[endif]-->
|
26 |
}
|
27 |
if($$('#payment_form_hpxc iframe').length == 0){ $$('#payment-buttons-container button').first().show(); }
|
28 |
}else{
|
29 |
if(($F('p_method_hpxc') == 'hpxc') && !($F('heidelpay_use_xcard') == 1)){
|
30 |
$$('#payment-buttons-container button').first().show();
|
31 |
if($$('#payment_form_hpxc iframe').length > 0){
|
32 |
+
<!--[if !IE]-->
|
33 |
$$('#payment-buttons-container button').first().hide();
|
34 |
+
<!--[endif]-->
|
35 |
}
|
36 |
}
|
37 |
if(($F('p_method_hpxc') == 'hpxc') && ($F('heidelpay_use_xcard') == 1)){
|
46 |
if($F('heidelpay_use_xcard') == 1){
|
47 |
$$('#payment-buttons-container button').first().show();
|
48 |
}else{
|
49 |
+
<!--[if !IE]-->
|
50 |
$$('#payment-buttons-container button').first().hide();
|
51 |
+
<!--[endif]-->
|
52 |
}
|
53 |
});
|
54 |
}
|
app/locale/de_DE/Mage_Heidelpay.csv
CHANGED
@@ -153,4 +153,6 @@ Bitte sorgen Sie für ausreichende Deckung auf dem entsprechenden Konto."
|
|
153 |
"Account no. & Bank no.","Kontonummer & Bankleitzahl"
|
154 |
"IBAN & BIC","IBAN & BIC"
|
155 |
|
156 |
-
"Direct Debit data not correct or incomplete","Lastschriftdaten falsch oder unvollstaendig"
|
|
|
|
153 |
"Account no. & Bank no.","Kontonummer & Bankleitzahl"
|
154 |
"IBAN & BIC","IBAN & BIC"
|
155 |
|
156 |
+
"Direct Debit data not correct or incomplete","Lastschriftdaten falsch oder unvollstaendig"
|
157 |
+
"Please use the next-button next to our credit card information to proceed.","Bitte benutzen Sie den Weiter-Button unter der Kreditkarteneingabe um fortzufahren."
|
158 |
+
"Please use the next-button next to our debit card information to proceed.","Bitte benutzen Sie den Weiter-Button unter der Debitkarteneingabe um fortzufahren."
|
app/locale/en_US/Mage_Heidelpay.csv
CHANGED
@@ -153,4 +153,6 @@ Please ensure that there will be sufficient funds on the corresponding account."
|
|
153 |
"Account information","Account information"
|
154 |
"Account no. & Bank no.","Account no. & Bank no."
|
155 |
"IBAN & BIC","IBAN & BIC"
|
156 |
-
"Direct Debit data not correct or incomplete","Direct Debit data not correct or incomplete"
|
|
|
|
153 |
"Account information","Account information"
|
154 |
"Account no. & Bank no.","Account no. & Bank no."
|
155 |
"IBAN & BIC","IBAN & BIC"
|
156 |
+
"Direct Debit data not correct or incomplete","Direct Debit data not correct or incomplete"
|
157 |
+
"Please use the next-button next to our credit card information to proceed.","Please use the next-button next to our credit card information to proceed."
|
158 |
+
"Please use the next-button next to our debit card information to proceed.","Please use the next-button next to our debit card information to proceed."
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Heidelpay</name>
|
4 |
-
<version>14.09
|
5 |
<stability>stable</stability>
|
6 |
<license>proprietary</license>
|
7 |
<channel>community</channel>
|
@@ -38,11 +38,12 @@ Vangerowstraße 18<br />
|
|
38 |
Telefon: +49 (0) 6221 / 65 170-20<br />
|
39 |
E-Mail: sales@heidelpay.de<br />
|
40 |
Internet: www.heidelpay.de<br /></description>
|
41 |
-
<notes>-
|
|
|
42 |
<authors><author><name>Heidelberger Payment GmbH</name><user>Heidelpay</user><email>magento@heidelpay.de</email></author></authors>
|
43 |
-
<date>2014-09
|
44 |
-
<time>
|
45 |
-
<contents><target name="magelocal"><dir name="Mage"><dir name="Heidelpay"><dir name="Block"><file name="Cancel.php" hash="2f8e463c786a6ba61d125d44664dbee0"/><file name="Error.php" hash="a9d277e92cbc73e2695ce9641ba3d14e"/><dir name="Form"><file name="Barpay.php" hash="69f4f16bf0ffb1fe032c8dedf0b7fdc1"/><file name="Billsafe.php" hash="0556d8c262da2a64fc42ff8ee3a1c7e7"/><file name="Ccard.php" hash="a1c0b7cf7d406b11436481a5844d7751"/><file name="Debitcard.php" hash="e2198fc05197d5bef1247076e4ad080c"/><file name="Directdebit.php" hash="0977a4ad96b29fa69104b553706ded50"/><file name="Eps.php" hash="c68e7de42e4ef4512bad6208cbad2cac"/><file name="Giropay.php" hash="331b9cbdcb0c9c6e216d062b049b2d7c"/><file name="Ideal.php" hash="e322a1c3755ffec72c50057ce4f20511"/><file name="Invoice.php" hash="ea99e30c5d4e1164d10c7f78c5eeb9a6"/><file name="Mangirkart.php" hash="93d9d2c75f1884f077a01426d13db068"/><file name="Paypal.php" hash="ee5033af401aaf915ad74cf74b47121a"/><file name="Prepaid.php" hash="405ca5252cf5417b831b831f74cb7d28"/><file name="Sofortueberweisung.php" hash="8725dcb159ac01494da70a05caeeb33b"/><file name="Xcard.php" hash="54f4838dc2cc048feb6d2fccc6d84324"/></dir><file name="Form.php" hash="529a3c603e30be85a62dbd7d0d42b5c8"/><file name="Iframe.php" hash="af0b8f58d2c6c330fc2259ac7cbb34d2"/><dir name="Info"><file name="Payment.php" hash="149aa578e45842b7e871c749b5871a76"/></dir><file name="Info.php" hash="08de2792423ed3f30a048c003cfba0f6"/><file name="Lightbox.php" hash="ad707478642775fca33accad5c0d0ff8"/><file name="Paymentccard.php" hash="aaafda19384dd8dca17cc445e99d6ed9"/><file name="Redirect.php" hash="009292d502d3f058bbf819fd9167f62a"/><file name="Secure.php" hash="a90b0cec01e61b1b274577bcce6cf764"/><file name="Success.php" hash="18b9d658d2ba7e234bf8552240fc727f"/><file name="Suform.php" hash="74fa4deae5147dcf8041fdaf32beef2e"/></dir><dir name="Helper"><file name="Data.php" hash="5f729f633bf9fd01608cecb4fa2f3198"/></dir><dir name="Model"><dir name="Entity"><file name="Setup.php" hash="f7320a17102dbb268884faa0e4bbe667"/></dir><file name="Errors.php" hash="379fb8ee37db79c6e356526be338b929"/><dir name="Method"><file name="Hpbp.php" hash="995e60d4edc2e332274b779a3e72794a"/><file name="Hpbs.php" hash="f659a547ae3ca603044772c055310642"/><file name="Hpcc.php" hash="
|
46 |
<compatible/>
|
47 |
-
<dependencies><required><php><min>5.0.0</min><max>5.5.
|
48 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Heidelpay</name>
|
4 |
+
<version>14.10.09</version>
|
5 |
<stability>stable</stability>
|
6 |
<license>proprietary</license>
|
7 |
<channel>community</channel>
|
38 |
Telefon: +49 (0) 6221 / 65 170-20<br />
|
39 |
E-Mail: sales@heidelpay.de<br />
|
40 |
Internet: www.heidelpay.de<br /></description>
|
41 |
+
<notes>- added failure handling because of waiting and success status matching
|
42 |
+
- bugfix: prevent checkout without creditcard registration</notes>
|
43 |
<authors><author><name>Heidelberger Payment GmbH</name><user>Heidelpay</user><email>magento@heidelpay.de</email></author></authors>
|
44 |
+
<date>2014-10-09</date>
|
45 |
+
<time>07:56:39</time>
|
46 |
+
<contents><target name="magelocal"><dir name="Mage"><dir name="Heidelpay"><dir name="Block"><file name="Cancel.php" hash="2f8e463c786a6ba61d125d44664dbee0"/><file name="Error.php" hash="a9d277e92cbc73e2695ce9641ba3d14e"/><dir name="Form"><file name="Barpay.php" hash="69f4f16bf0ffb1fe032c8dedf0b7fdc1"/><file name="Billsafe.php" hash="0556d8c262da2a64fc42ff8ee3a1c7e7"/><file name="Ccard.php" hash="a1c0b7cf7d406b11436481a5844d7751"/><file name="Debitcard.php" hash="e2198fc05197d5bef1247076e4ad080c"/><file name="Directdebit.php" hash="0977a4ad96b29fa69104b553706ded50"/><file name="Eps.php" hash="c68e7de42e4ef4512bad6208cbad2cac"/><file name="Giropay.php" hash="331b9cbdcb0c9c6e216d062b049b2d7c"/><file name="Ideal.php" hash="e322a1c3755ffec72c50057ce4f20511"/><file name="Invoice.php" hash="ea99e30c5d4e1164d10c7f78c5eeb9a6"/><file name="Mangirkart.php" hash="93d9d2c75f1884f077a01426d13db068"/><file name="Paypal.php" hash="ee5033af401aaf915ad74cf74b47121a"/><file name="Prepaid.php" hash="405ca5252cf5417b831b831f74cb7d28"/><file name="Sofortueberweisung.php" hash="8725dcb159ac01494da70a05caeeb33b"/><file name="Xcard.php" hash="54f4838dc2cc048feb6d2fccc6d84324"/></dir><file name="Form.php" hash="529a3c603e30be85a62dbd7d0d42b5c8"/><file name="Iframe.php" hash="af0b8f58d2c6c330fc2259ac7cbb34d2"/><dir name="Info"><file name="Payment.php" hash="149aa578e45842b7e871c749b5871a76"/></dir><file name="Info.php" hash="08de2792423ed3f30a048c003cfba0f6"/><file name="Lightbox.php" hash="ad707478642775fca33accad5c0d0ff8"/><file name="Paymentccard.php" hash="aaafda19384dd8dca17cc445e99d6ed9"/><file name="Redirect.php" hash="009292d502d3f058bbf819fd9167f62a"/><file name="Secure.php" hash="a90b0cec01e61b1b274577bcce6cf764"/><file name="Success.php" hash="18b9d658d2ba7e234bf8552240fc727f"/><file name="Suform.php" hash="74fa4deae5147dcf8041fdaf32beef2e"/></dir><dir name="Helper"><file name="Data.php" hash="5f729f633bf9fd01608cecb4fa2f3198"/></dir><dir name="Model"><dir name="Entity"><file name="Setup.php" hash="f7320a17102dbb268884faa0e4bbe667"/></dir><file name="Errors.php" hash="379fb8ee37db79c6e356526be338b929"/><dir name="Method"><file name="Hpbp.php" hash="995e60d4edc2e332274b779a3e72794a"/><file name="Hpbs.php" hash="f659a547ae3ca603044772c055310642"/><file name="Hpcc.php" hash="2a27d8d579758d63e2d697047d81d173"/><file name="Hpdc.php" hash="579954ae6a861934fe212c8035a151da"/><file name="Hpdd.php" hash="837d5cb70cd0d4f027c623c5b48a579f"/><file name="Hpeps.php" hash="905619c5a1d8ff590303eba77188544f"/><file name="Hpgp.php" hash="12c8a50b75915b6c7386afb3580f89ea"/><file name="Hpidl.php" hash="8f82aef98b92c43056b98495dc418455"/><file name="Hpiv.php" hash="4af1b7c21f2677ea6c2a8cba909b1a34"/><file name="Hpmk.php" hash="7dbd03c72e199c059db4469c2719c21b"/><file name="Hppp.php" hash="429bc236cee3e614860771d621a94085"/><file name="Hpppal.php" hash="12050f50ecd4281295ae9c2a1d141892"/><file name="Hpsu.php" hash="71db120d702c040b57e64393382e3bf0"/><file name="Hpxc.php" hash="a14cc41cf731961d409ca9cc09092921"/><file name="Payment.php" hash="84704ddf1f8d2390dee650c191a5fe38"/></dir><dir name="Order"><file name="Payment.php" hash="34c087a79ae3911e638630c8005331c0"/><dir name="Pdf"><file name="Invoice.php" hash="7b836c1529b7a132f8b366d5a85a8883"/></dir></dir><file name="Session.php" hash="1ee3ff853b5fc2873cfa461735a22115"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Bookingmode.php" hash="642de393453f69e6eaa682c65374b3b7"/><file name="Ddmodulemode.php" hash="5c6fbdddcf59e880efe87bcd53c39832"/><file name="Modulemode.php" hash="adf1d3ca98c240b0b830a0e946333c7f"/><file name="Orderstatus.php" hash="8061af68dbe75f983ef48fe267d6e75e"/><file name="Sepamode.php" hash="1c578abf34ea1458bcc3ebc93ea0dfd4"/><file name="Transactionmode.php" hash="c71ce5dce331f4ff67a5c7d82ff2a319"/></dir></dir></dir></dir><dir name="controllers"><file name="PaymentController.php" hash="00c5fc7b7ebc92f63823641e01e98a6a"/></dir><dir name="etc"><file name="adminhtml.xml" hash="1e324f57ab7c3fe7d265be8a8c1b2a72"/><file name="config.xml" hash="832e7a63031297dc8ec9d5f8a9baac6d"/><file name="system.xml" hash="4c1bdc7d296a6da7792fcf401000adae"/></dir><dir name="sql"><dir name="heidelpay_setup"><file name="mysql4-install-1.0.0.php" hash="a555bfa9004359d452233da29628b577"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="heidelpay"><dir name="info"><file name="payment.phtml" hash="cf713fcaa600a8d550d3ed1e89d5387f"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="heidelpay.xml" hash="4f826fb5984fdcf960a82926566307b2"/></dir><dir name="template"><dir name="heidelpay"><file name="cancel.phtml" hash="e36b203fe39fea1f26a8e528cf62a62a"/><file name="error.phtml" hash="c07493da3275778795125a7d787642df"/><dir name="form"><file name="barpay.phtml" hash="671ee2711abac37171ee7da7afe1007f"/><file name="billsafe.phtml" hash="118dbb8987def369338bcd1ea5d97cf5"/><file name="ccard.phtml" hash="8fd424700c644338b64c3638ddc31be4"/><file name="debitcard.phtml" hash="5d9b9e36d9c8ca58885020c1777c3700"/><file name="directdebit.phtml" hash="0f45be2c98981b3434eab43684cf1263"/><file name="eps.phtml" hash="329f6644230081218299c1862b5bba4e"/><file name="giropay.phtml" hash="3193453c080a4559fd300d3c754c4fe0"/><file name="ideal.phtml" hash="041170d4288b788fe3f600b6dcf16026"/><file name="invoice.phtml" hash="6e761e68364e82e985b4410e35e82e7d"/><file name="mangirkart.phtml" hash="e56ee10949fede6a5d10c77e02c2018e"/><file name="paypal.phtml" hash="750dd11961c58ed4a71834d848efae2d"/><file name="prepaid.phtml" hash="f571e71e3deb18c14706bed8b3be7e75"/><file name="sofortueberweisung.phtml" hash="79484a3b235ef3834dc9629820eaeada"/><file name="xcard.phtml" hash="6a0f261ab646bfee5aea4b53552291f8"/></dir><file name="iframe.phtml" hash="c3ebbd4142db6532eb27527da5496205"/><dir name="info"><file name="payment.phtml" hash="caedeeef8c205ac2611f20abdb3c0b90"/></dir><file name="lightbox.phtml" hash="cfa65509f442d2d94275ede678a69f30"/><file name="redirect.phtml" hash="b57add411ecceb4aab8de3d9f9c7596a"/><file name="secure.phtml" hash="e88cb240cc7dcda0f38eaa34e079ce3a"/><file name="success.phtml" hash="c934ed6185335eaa30cfc85a796a9dc0"/><file name="suform.phtml" hash="51f2b4f966cea8787a3a2c084462da7f"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Heidelpay.xml" hash="7f4bf53ffc53df1e7358c6953474d113"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_Heidelpay.csv" hash="8d39abb67496dc53e7cc9ad94140d049"/></dir><dir name="de_DE"><file name="Mage_Heidelpay.csv" hash="20adefc3a2e599889c2e9eb0fd614537"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="heidelpay"><file name="BarPay.jpg" hash="1b79e14a7ab0d026d551fe1d4227feeb"/><file name="back.png" hash="f0c9f626542f28c55aa40dfc540e6935"/><file name="back_de.png" hash="83bc85d315edfa9b00bd157431b5ff32"/><file name="forward.jpg" hash="123f9980a2a179d594aa954683e284f2"/><file name="forward.png" hash="cb56c1f1c5035391d2d3be7fff2362f5"/><file name="forward_de.jpg" hash="6d84462f1cd2bc18a48f81e5efc42bba"/><file name="forward_de.png" hash="6a8a6e6ff98909b3e05c686f4817b836"/><file name="heidelpay.png" hash="393274a5c3cef1d30da770710f5f3c90"/><file name="heidelpay_style.css" hash="a62c70d6842d9c3ff9712ab6e9213121"/><file name="space.gif" hash="ea05ec2274832731bf2413a6192a245d"/></dir></dir></dir></dir></dir></target></contents>
|
47 |
<compatible/>
|
48 |
+
<dependencies><required><php><min>5.0.0</min><max>5.5.99</max></php></required></dependencies>
|
49 |
</package>
|