Version Notes
1.3.3 is now loaded with Iframe functionality
1.3 database table name is now fetched from system.1.2.9 the same as 1.2.7 only because Magento upload did not work correctly.1.2.8 the same as 1.2.7 only because Magento upload did not work correctly.1.2.7Bugfix:FC;r ELV DE, ELV AT und CC wurde die Währung fix als 'EUR' übergeben.



The parameter currency was passed over as fixed value 'EUR' for payment modules 'Direct Debit German', 'Direct Debit Austria' and 'Credir Card'.Allgemeine Bemerkung:Die Cache-Ordner var/cache und var/session müssen wie immer nach Aktualisierungen geleert werden.


Notice: the cache folders var/cache and var/session must be emptied after updates.
Release Info
Developer | Gabriel Dixon |
Extension | Novalnet |
Version | 1.3.3 |
Comparing to | |
See all releases |
Code changes from version 1.3.2 to 1.3.3
- app/code/community/Mage/Novalnet/Model/NovalnetCc.php +4 -0
- app/code/community/Mage/Novalnet/Model/Observer.php +37 -176
- app/code/community/Mage/Novalnet/etc/config.xml +3 -3
- app/code/community/Mage/Novalnet/etc/system.xml +0 -33
- app/code/community/Mage/Novalnet/sql/novalnet_setup/mysql4-install-1.0.0.php +17 -12
- app/design/frontend/default/default/template/novalnet/cc/form.phtml +0 -8
- app/design/frontend/default/default/template/novalnet/cc/pciiframe.phtml +240 -5
- app/design/frontend/default/default/template/novalnet/pci/form.phtml +0 -5
- app/design/frontend/default/default/template/novalnet/pci/pciiframe_old.phtml +0 -85
- package.xml +9 -9
@@ -34,5 +34,9 @@ class Mage_Novalnet_Model_NovalnetCc extends Mage_Novalnet_Model_NovalnetPciAbst
|
|
34 |
protected $_nnPaymentId = 6;
|
35 |
|
36 |
protected $_code = 'novalnetCc';
|
|
|
|
|
|
|
37 |
|
|
|
38 |
}
|
34 |
protected $_nnPaymentId = 6;
|
35 |
|
36 |
protected $_code = 'novalnetCc';
|
37 |
+
|
38 |
+
protected $_formBlockType = 'novalnet/cc_form';
|
39 |
+
protected $_infoBlockType = 'novalnet/cc_info';
|
40 |
|
41 |
+
|
42 |
}
|
@@ -21,208 +21,69 @@ class Mage_Novalnet_Model_Observer extends Mage_Payment_Model_Method_Abstract
|
|
21 |
return Mage::getUrl('novalnet/pci/success', array('_secure' => true));
|
22 |
}
|
23 |
|
24 |
-
|
25 |
-
//public function getFormData(Varien_Object $payment, $amount)
|
26 |
public function getFormData($observer)
|
27 |
{
|
28 |
|
29 |
-
|
30 |
-
|
31 |
-
if($check_active=='1')
|
32 |
-
{
|
33 |
-
|
34 |
-
$get_user_email=Mage::getSingleton('customer/session')->getCustomer()->getEmail();
|
35 |
-
|
36 |
$dataObj = new Varien_Object();
|
37 |
-
$
|
38 |
-
|
39 |
-
|
40 |
-
|
41 |
-
$paymentid
|
42 |
-
$
|
43 |
-
$
|
44 |
-
$
|
45 |
-
$
|
46 |
-
$
|
47 |
-
$
|
48 |
-
$
|
49 |
-
$
|
50 |
-
|
51 |
-
$
|
52 |
-
$amount = (round($grand_total, 2) * 100);
|
53 |
-
$manualCheckAmt = (int)$this->getConfigData('manual_checking_amount');
|
54 |
-
|
55 |
-
if($manualCheckAmt && $manualCheckAmt>=$amount && $product2 && $tariff2) {
|
56 |
-
$pid = $this->getConfigData('second_product_id');
|
57 |
-
$tid = $this->getConfigData('second_tariff_id');
|
58 |
-
}
|
59 |
-
|
60 |
-
|
61 |
-
$test_mode = (!$this->getConfigData('live_mode'))? 1: 0;
|
62 |
-
$currencycode = Mage::app()->getStore()->getCurrentCurrencyCode();
|
63 |
-
|
64 |
-
$password = $this->getConfigData('password');
|
65 |
$order_status = $this->getConfigData('order_status');
|
66 |
-
$createinvoice
|
67 |
-
|
68 |
-
$firstname = $items_collect_order['0']['firstname'];
|
69 |
-
$lastname = $items_collect_order['0']['lastname'];
|
70 |
-
$email = $items_collect_order['0']['email'];
|
71 |
-
$street = $items_collect_order['0']['street'];
|
72 |
-
$SearchInStreet = '1';
|
73 |
-
$city = $items_collect_order['0']['city'];
|
74 |
-
$postcode = $items_collect_order['0']['postcode'];
|
75 |
-
$countryid = $items_collect_order['0']['country_id'];
|
76 |
-
$telephone = $items_collect_order['0']['telephone'];
|
77 |
-
$fax = $items_collect_order['0']['fax'];
|
78 |
-
$session = Mage::getSingleton('checkout/session')->getSessionId();
|
79 |
|
80 |
-
$
|
81 |
-
$last_main_order_id = $order_id_data['0']['increment_id'];
|
82 |
-
|
83 |
-
$returnURL = $this->getReturnURL();
|
84 |
$returnmethod = 'POST';
|
85 |
$errorreturnURL = $this->getReturnURL();
|
86 |
$errorreturnmethod = 'POST';
|
87 |
-
$input1
|
88 |
-
$Implementation
|
89 |
-
|
90 |
-
|
91 |
-
|
92 |
-
|
93 |
-
|
94 |
-
|
95 |
-
|
96 |
-
$inputval1 = $last_main_order_id+1;
|
97 |
-
}
|
98 |
-
|
99 |
-
$dataObj->setVendorId($vendorid)
|
100 |
->setVendorAuthcode($vendorAuthcode)
|
101 |
->setProductId($pid)
|
102 |
->setTariffId($tid)
|
|
|
|
|
|
|
103 |
->setUniqid($uniqid)
|
104 |
-
->setAmount($amount)
|
105 |
->setTestMode($test_mode)
|
106 |
-
->
|
107 |
-
->setCurrency($currencycode)
|
108 |
-
->setFirstname($firstname)
|
109 |
-
->setLastname($lastname)
|
110 |
-
->setEmail($email)
|
111 |
-
->setStreet($street)
|
112 |
-
->setSearchInStreet(1)
|
113 |
-
->setCity($city)
|
114 |
-
->setZip($postcode)
|
115 |
-
->setCountryCode($countryid)
|
116 |
->setLang()
|
117 |
->setRemoteIp(Mage::helper('novalnet')->getRealIpAddr())
|
118 |
-
->
|
119 |
-
->setFax($fax)
|
120 |
-
->setSession($session)
|
121 |
->setReturnUrl($returnURL)
|
122 |
->setReturnMethod($returnmethod)
|
123 |
->setErrorReturnUrl($errorreturnURL)
|
124 |
->setErrorReturnMethod($errorreturnmethod)
|
125 |
->setInput1($input1)
|
126 |
->setImplementation($Implementation)
|
127 |
-
->
|
128 |
-
->
|
129 |
-
|
130 |
-
$session=Mage::getSingleton('checkout/session')->setNovalnetRealOrderId($inputval1);
|
131 |
-
$session=Mage::getSingleton('checkout/session')->setOrderId($inputval1);
|
132 |
-
$session=Mage::getSingleton('checkout/session')->setPassword($password);
|
133 |
-
$session=Mage::getSingleton('checkout/session')->setOrderStatus($order_status);
|
134 |
-
$session=Mage::getSingleton('checkout/session')->setCreateInvoice($createinvoice);
|
135 |
-
$session=Mage::getSingleton('checkout/session')->setNovalnetQuoteId($session->getQuoteId());
|
136 |
-
|
137 |
|
138 |
-
$this->importHashData($dataObj)
|
139 |
-
->importEncodeData($dataObj);
|
140 |
-
|
141 |
-
$session=Mage::getSingleton('checkout/session')->setNnDataValue($dataObj);
|
142 |
-
return $dataObj;
|
143 |
-
}
|
144 |
-
}
|
145 |
-
|
146 |
-
|
147 |
-
public function importHashData($dataObj) {
|
148 |
-
|
149 |
-
$password = $this->getConfigData('password');
|
150 |
-
$hash = $this->generateHash($dataObj, $password);
|
151 |
-
|
152 |
-
if($hash == false) {
|
153 |
-
Mage::getSingleton('core/session')
|
154 |
-
->addError('Die Hashfunktionen sind nicht verfügbar!');
|
155 |
-
$url = Mage::getModel('core/url')->getUrl("checkout/onepage/failure");
|
156 |
-
Mage::app()->getResponse()->setRedirect($url);
|
157 |
-
Mage::app()->getResponse()->sendResponse();
|
158 |
-
exit;
|
159 |
-
}
|
160 |
-
|
161 |
-
$dataObj->setHash($hash);
|
162 |
-
|
163 |
-
return $this;
|
164 |
-
|
165 |
-
}
|
166 |
-
|
167 |
-
public function importEncodeData($dataObj) {
|
168 |
-
$encoding =$this->encode($dataObj, $this->getConfigData('password'));
|
169 |
-
if($encoding != true) {
|
170 |
-
Mage::getSingleton('core/session')
|
171 |
-
->addError('Die Methoden für die Verarbeitung von Zeichensätzen sind nicht verfügbar!');
|
172 |
-
$url = Mage::getModel('core/url')->getUrl("checkout/onepage/failure");
|
173 |
-
Mage::app()->getResponse()->setRedirect($url);
|
174 |
-
Mage::app()->getResponse()->sendResponse();
|
175 |
-
exit;
|
176 |
-
}
|
177 |
-
return $this;
|
178 |
-
}
|
179 |
-
|
180 |
-
public function generateHash($data, $key) {
|
181 |
-
|
182 |
-
if(!function_exists('md5') || $this->isEmptyString($key)) {
|
183 |
-
return false;
|
184 |
-
}
|
185 |
-
$hashFields = array('vendor_authcode', 'product_id', 'tariff_id', 'amount', 'test_mode', 'uniqid' );
|
186 |
-
$str = NULL;
|
187 |
-
foreach( $hashFields as $_value ) {
|
188 |
-
if($this->isEmptyString($data[$_value])) {
|
189 |
-
return false;
|
190 |
}
|
191 |
-
|
192 |
-
|
193 |
-
return md5($str . strrev($key));
|
194 |
-
}
|
195 |
-
|
196 |
-
public function encode(&$fields, $key) {
|
197 |
|
|
|
198 |
|
199 |
-
if(!function_exists('base64_encode') || !function_exists('pack') || !function_exists('crc32')) {
|
200 |
-
return false;
|
201 |
-
}
|
202 |
-
$toBeEncoded = array('vendor_authcode', 'product_id', 'tariff_id', 'test_mode', 'uniqid', 'amount');
|
203 |
-
foreach($toBeEncoded as $_value ) {
|
204 |
-
$data = $fields[$_value];
|
205 |
-
if($this->isEmptyString($data)) {
|
206 |
-
return false;
|
207 |
-
}
|
208 |
-
try {
|
209 |
-
$crc = sprintf('%u', crc32($data));//%u is a must for ccrc32 returns a signed value
|
210 |
-
$data = $crc."|".$data;
|
211 |
-
$data = bin2hex($data.$key);
|
212 |
-
$data = strrev(base64_encode($data));
|
213 |
-
$fields[$_value] = $data;
|
214 |
-
}catch(Exception $e) {
|
215 |
-
return false;
|
216 |
-
}
|
217 |
-
}
|
218 |
-
return true;
|
219 |
-
}
|
220 |
-
|
221 |
-
public function isEmptyString($str) {
|
222 |
-
$str = trim($str);
|
223 |
-
return !isset($str[0]);
|
224 |
-
}
|
225 |
-
|
226 |
|
227 |
|
228 |
}
|
21 |
return Mage::getUrl('novalnet/pci/success', array('_secure' => true));
|
22 |
}
|
23 |
|
|
|
|
|
24 |
public function getFormData($observer)
|
25 |
{
|
26 |
|
27 |
+
$check_active = $this->getConfigData('active');
|
|
|
|
|
|
|
|
|
|
|
|
|
28 |
$dataObj = new Varien_Object();
|
29 |
+
$dataObj->setCheckActive($check_active);
|
30 |
+
if($check_active=='1')
|
31 |
+
{
|
32 |
+
|
33 |
+
$paymentid = $this->_nnPaymentId;
|
34 |
+
$vendorid = $this->getConfigData('merchant_id');
|
35 |
+
$vendorAuthcode = $this->getConfigData('auth_code');
|
36 |
+
$pid = $this->getConfigData('product_id');
|
37 |
+
$tid = $this->getConfigData('tariff_id');
|
38 |
+
$uniqid = uniqid();
|
39 |
+
$product2 = $this->getConfigData('second_product_id');
|
40 |
+
$tariff2 = $this->getConfigData('second_tariff_id');
|
41 |
+
$manualCheckAmt = (int)$this->getConfigData('manual_checking_amount');
|
42 |
+
$test_mode = (!$this->getConfigData('live_mode'))? 1: 0;
|
43 |
+
$password = $this->getConfigData('password');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
44 |
$order_status = $this->getConfigData('order_status');
|
45 |
+
$createinvoice = $this->getConfigData('createinvoice');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
46 |
|
47 |
+
$returnURL = $this->getReturnURL();
|
|
|
|
|
|
|
48 |
$returnmethod = 'POST';
|
49 |
$errorreturnURL = $this->getReturnURL();
|
50 |
$errorreturnmethod = 'POST';
|
51 |
+
$input1 = 'order_id';
|
52 |
+
$Implementation = 'PHP_PCI';
|
53 |
+
$sessionid = Mage::getSingleton('checkout/session')->getSessionId();
|
54 |
+
|
55 |
+
|
56 |
+
$dataObj->setCheckActive($check_active)
|
57 |
+
->setPaymentId($paymentid)
|
58 |
+
->setVendorAuthcode($vendorAuthcode)
|
59 |
+
->setVendorId($vendorid)
|
|
|
|
|
|
|
|
|
60 |
->setVendorAuthcode($vendorAuthcode)
|
61 |
->setProductId($pid)
|
62 |
->setTariffId($tid)
|
63 |
+
->setProductId2($product2)
|
64 |
+
->setTariffId2($tariff2)
|
65 |
+
->setManualCheckAmt($manualCheckAmt)
|
66 |
->setUniqid($uniqid)
|
|
|
67 |
->setTestMode($test_mode)
|
68 |
+
->setPassword($password)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
69 |
->setLang()
|
70 |
->setRemoteIp(Mage::helper('novalnet')->getRealIpAddr())
|
71 |
+
->setSessionId($sessionid)
|
|
|
|
|
72 |
->setReturnUrl($returnURL)
|
73 |
->setReturnMethod($returnmethod)
|
74 |
->setErrorReturnUrl($errorreturnURL)
|
75 |
->setErrorReturnMethod($errorreturnmethod)
|
76 |
->setInput1($input1)
|
77 |
->setImplementation($Implementation)
|
78 |
+
->setOrderStatus($order_status)
|
79 |
+
->setCreateInvoice($createinvoice);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
80 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
81 |
}
|
82 |
+
|
83 |
+
$session=Mage::getSingleton('checkout/session')->setNnDataValue($dataObj);
|
|
|
|
|
|
|
|
|
84 |
|
85 |
+
}
|
86 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
87 |
|
88 |
|
89 |
}
|
@@ -95,8 +95,8 @@
|
|
95 |
</Mage_Novalnet>
|
96 |
</modules>
|
97 |
</translate>
|
98 |
-
<events>
|
99 |
-
<
|
100 |
<observers>
|
101 |
<Mage_Novalnet_Model_Observer>
|
102 |
<type>singleton</type>
|
@@ -104,7 +104,7 @@
|
|
104 |
<method>getFormData</method>
|
105 |
</Mage_Novalnet_Model_Observer>
|
106 |
</observers>
|
107 |
-
</
|
108 |
</events>
|
109 |
<layout>
|
110 |
<updates>
|
95 |
</Mage_Novalnet>
|
96 |
</modules>
|
97 |
</translate>
|
98 |
+
<events>
|
99 |
+
<controller_action_predispatch_checkout_onepage_index>
|
100 |
<observers>
|
101 |
<Mage_Novalnet_Model_Observer>
|
102 |
<type>singleton</type>
|
104 |
<method>getFormData</method>
|
105 |
</Mage_Novalnet_Model_Observer>
|
106 |
</observers>
|
107 |
+
</controller_action_predispatch_checkout_onepage_index>
|
108 |
</events>
|
109 |
<layout>
|
110 |
<updates>
|
@@ -416,15 +416,6 @@
|
|
416 |
<show_in_website>1</show_in_website>
|
417 |
<show_in_store>0</show_in_store>
|
418 |
</order_status>
|
419 |
-
<cctypes translate="label">
|
420 |
-
<label>Credit Card Types</label>
|
421 |
-
<frontend_type>multiselect</frontend_type>
|
422 |
-
<source_model>novalnet/novalnet_source_cctype</source_model>
|
423 |
-
<sort_order>4</sort_order>
|
424 |
-
<show_in_default>1</show_in_default>
|
425 |
-
<show_in_website>1</show_in_website>
|
426 |
-
<show_in_store>0</show_in_store>
|
427 |
-
</cctypes>
|
428 |
<merchant_id translate="label">
|
429 |
<label>Novalnet Merchant ID</label>
|
430 |
<frontend_type>text</frontend_type>
|
@@ -489,30 +480,6 @@
|
|
489 |
<show_in_website>1</show_in_website>
|
490 |
<show_in_store>0</show_in_store>
|
491 |
</second_tariff_id>
|
492 |
-
<callback translate="label">
|
493 |
-
<comment>
|
494 |
-
Bei aktiviertem PIN by Callback/SMS wird der Kunde zur Eingabe seiner Telefon- / Mobil- Nummer aufgefordert.
|
495 |
-
Per Telefon bzw. SMS erhält der Kunde von der Novalnet AG eine PIN, die er vor der Bestellung eingeben muss.
|
496 |
-
Ist die PIN gültig, so ist der Zahlungsprozess erfolgreich abgewickelt worden,
|
497 |
-
andernfalls wird der Kunde nochmals zu Eingabe der PIN aufgefordert. Dieser Service ist nur für Kunden aus Deutschland verfügbar.
|
498 |
-
This service is only available for german customers.
|
499 |
-
</comment>
|
500 |
-
<label>PIN by Callback/SMS</label>
|
501 |
-
<frontend_type>select</frontend_type>
|
502 |
-
<source_model>novalnet/novalnet_source_callbacktypes</source_model>
|
503 |
-
<sort_order>12</sort_order>
|
504 |
-
<show_in_default>1</show_in_default>
|
505 |
-
<show_in_website>1</show_in_website>
|
506 |
-
<show_in_store>0</show_in_store>
|
507 |
-
</callback>
|
508 |
-
<callback_minimum_amount>
|
509 |
-
<label>Minimum Amout For Callback</label>
|
510 |
-
<frontend_type>text</frontend_type>
|
511 |
-
<sort_order>13</sort_order>
|
512 |
-
<show_in_default>1</show_in_default>
|
513 |
-
<show_in_website>1</show_in_website>
|
514 |
-
<show_in_store>0</show_in_store>
|
515 |
-
</callback_minimum_amount>
|
516 |
<booking_reference translate="label">
|
517 |
<label>Booking Reference</label>
|
518 |
<frontend_type>text</frontend_type>
|
416 |
<show_in_website>1</show_in_website>
|
417 |
<show_in_store>0</show_in_store>
|
418 |
</order_status>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
419 |
<merchant_id translate="label">
|
420 |
<label>Novalnet Merchant ID</label>
|
421 |
<frontend_type>text</frontend_type>
|
480 |
<show_in_website>1</show_in_website>
|
481 |
<show_in_store>0</show_in_store>
|
482 |
</second_tariff_id>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
483 |
<booking_reference translate="label">
|
484 |
<label>Booking Reference</label>
|
485 |
<frontend_type>text</frontend_type>
|
@@ -3,18 +3,6 @@ $installer = $this;
|
|
3 |
$setup = new Mage_Sales_Model_Mysql4_Setup('core_setup');
|
4 |
|
5 |
$installer->startSetup();
|
6 |
-
$setup->addAttribute('order_payment', 'nn_account_holder', array('type'=>'varchar'));
|
7 |
-
$setup->addAttribute('order_payment', 'nn_account_number', array('type'=>'varchar'));
|
8 |
-
$setup->addAttribute('order_payment', 'nn_bank_sorting_code', array('type'=>'varchar'));
|
9 |
-
$setup->addAttribute('order_payment', 'nn_elv_country', array('type'=>'varchar'));
|
10 |
-
|
11 |
-
$setup->addAttribute('order_payment', 'nn_account_holder_at', array('type'=>'varchar'));
|
12 |
-
$setup->addAttribute('order_payment', 'nn_account_number_at', array('type'=>'varchar'));
|
13 |
-
$setup->addAttribute('order_payment', 'nn_bank_sorting_code_at', array('type'=>'varchar'));
|
14 |
-
$setup->addAttribute('order_payment', 'nn_elv_country_at', array('type'=>'varchar'));
|
15 |
-
$setup->addAttribute('order_payment', 'nn_testorder', array('type'=>'smallint'));
|
16 |
-
// Save the payment information for prepayment & invoice
|
17 |
-
$setup->addAttribute('order_payment', 'nn_comments', array('type'=>'text'));
|
18 |
|
19 |
$setup->addAttribute('quote_payment', 'nn_account_holder', array('type'=>'varchar'));
|
20 |
$setup->addAttribute('quote_payment', 'nn_account_number', array('type'=>'varchar'));
|
@@ -30,6 +18,23 @@ $setup->addAttribute('quote_payment', 'nn_testorder', array('type'=>'small
|
|
30 |
// Save the payment information for prepayment & invoice
|
31 |
$setup->addAttribute('quote_payment', 'nn_comments', array('type'=>'text'));
|
32 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
33 |
$installer->endSetup();
|
34 |
|
35 |
if (Mage::getVersion() >= 1.1) {
|
3 |
$setup = new Mage_Sales_Model_Mysql4_Setup('core_setup');
|
4 |
|
5 |
$installer->startSetup();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
6 |
|
7 |
$setup->addAttribute('quote_payment', 'nn_account_holder', array('type'=>'varchar'));
|
8 |
$setup->addAttribute('quote_payment', 'nn_account_number', array('type'=>'varchar'));
|
18 |
// Save the payment information for prepayment & invoice
|
19 |
$setup->addAttribute('quote_payment', 'nn_comments', array('type'=>'text'));
|
20 |
|
21 |
+
if (Mage::getVersion() >= '1.4.1.0') {
|
22 |
+
|
23 |
+
$setup->addAttribute('order_payment', 'nn_account_holder', array('type'=>'varchar'));
|
24 |
+
$setup->addAttribute('order_payment', 'nn_account_number', array('type'=>'varchar'));
|
25 |
+
$setup->addAttribute('order_payment', 'nn_bank_sorting_code', array('type'=>'varchar'));
|
26 |
+
$setup->addAttribute('order_payment', 'nn_elv_country', array('type'=>'varchar'));
|
27 |
+
|
28 |
+
$setup->addAttribute('order_payment', 'nn_account_holder_at', array('type'=>'varchar'));
|
29 |
+
$setup->addAttribute('order_payment', 'nn_account_number_at', array('type'=>'varchar'));
|
30 |
+
$setup->addAttribute('order_payment', 'nn_bank_sorting_code_at', array('type'=>'varchar'));
|
31 |
+
$setup->addAttribute('order_payment', 'nn_elv_country_at', array('type'=>'varchar'));
|
32 |
+
$setup->addAttribute('order_payment', 'nn_testorder', array('type'=>'smallint'));
|
33 |
+
// Save the payment information for prepayment & invoice
|
34 |
+
$setup->addAttribute('order_payment', 'nn_comments', array('type'=>'text'));
|
35 |
+
|
36 |
+
}
|
37 |
+
|
38 |
$installer->endSetup();
|
39 |
|
40 |
if (Mage::getVersion() >= 1.1) {
|
@@ -31,15 +31,7 @@
|
|
31 |
?>
|
32 |
<?php if ($this->checkCustomerAccess()):?>
|
33 |
<fieldset class="form-list">
|
34 |
-
<div style="position: relative; left: 17em; top: -2.5em">
|
35 |
-
<?php foreach($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
|
36 |
-
<img src='<?php echo $baseUrl?>frontend/default/default/images/novalnet/<?php echo $_typeCode ?>_Logo.png' alt='<?php echo $_typeName ?> Logo'/>
|
37 |
-
<?php endforeach ?>
|
38 |
-
</div>
|
39 |
<ul id="payment_form_<?php echo $code ?>" style="display:none">
|
40 |
-
<li>
|
41 |
-
<?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
|
42 |
-
</li>
|
43 |
</ul>
|
44 |
</fieldset>
|
45 |
<?php else:?>
|
31 |
?>
|
32 |
<?php if ($this->checkCustomerAccess()):?>
|
33 |
<fieldset class="form-list">
|
|
|
|
|
|
|
|
|
|
|
34 |
<ul id="payment_form_<?php echo $code ?>" style="display:none">
|
|
|
|
|
|
|
35 |
</ul>
|
36 |
</fieldset>
|
37 |
<?php else:?>
|
@@ -112,27 +112,262 @@ else
|
|
112 |
|
113 |
//]]>
|
114 |
</script>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
115 |
<div id="nn_iframe" style="display:none;">
|
116 |
<?php
|
117 |
|
118 |
if($paymentmethod=='novalnetCc')
|
119 |
{
|
120 |
-
$
|
121 |
-
|
122 |
-
$data_val=$session->getNnDataValue();
|
123 |
$form = new Varien_Data_Form();
|
124 |
$html = '<html><body>';
|
125 |
-
echo '<form action="https://payport.novalnet.de/pci_payport" id="
|
126 |
foreach ($data_val->toArray() as $field=>$value) {
|
127 |
$form->addField($field, 'hidden', array('name'=>$field, 'value'=>$value));
|
128 |
}
|
129 |
$html.= $form->toHtml();
|
130 |
$html.="<iframe id='my_iframe' name='my_iframe' width='518' height='350' ></iframe>";
|
131 |
$html.= '</form>';
|
132 |
-
$html.= '<script type="text/javascript">document.getElementById("review-buttons-container").style.display="none";document.getElementById("
|
133 |
$html.= '</body>';
|
134 |
echo $html.= '</html>';
|
|
|
135 |
}
|
136 |
?>
|
137 |
</div>
|
138 |
|
|
112 |
|
113 |
//]]>
|
114 |
</script>
|
115 |
+
<?php
|
116 |
+
$check_active = Mage::getSingleton('checkout/session')->getNnDataValue()->getCheckActive();
|
117 |
+
|
118 |
+
if($check_active=='1')
|
119 |
+
{
|
120 |
+
|
121 |
+
$sessionvalue=Mage::getSingleton('checkout/session');
|
122 |
+
$get_user_email=Mage::getSingleton('customer/session')->getCustomer()->getEmail();
|
123 |
+
$dataObj = new Varien_Object();
|
124 |
+
$dbc_collect_order = Mage::getSingleton('core/resource')->getConnection('core_read');
|
125 |
+
|
126 |
+
$datavalue = Mage::getSingleton('checkout/session');
|
127 |
+
$check_active = $datavalue->getNnDataValue()->getCheckActive();
|
128 |
+
$paymentid = $datavalue->getNnDataValue()->getPaymentId();
|
129 |
+
$vendorid = $datavalue->getNnDataValue()->getVendorId();
|
130 |
+
$vendorAuthcode = $datavalue->getNnDataValue()->getVendorAuthcode();
|
131 |
+
$pid = $datavalue->getNnDataValue()->getProductId();
|
132 |
+
$tid = $datavalue->getNnDataValue()->getTariffId();
|
133 |
+
$uniqid = $datavalue->getNnDataValue()->getUniqid();
|
134 |
+
$product2 = $datavalue->getNnDataValue()->getProductId2();
|
135 |
+
$tariff2 = $datavalue->getNnDataValue()->getTariffId2();
|
136 |
+
|
137 |
+
$grand_total = Mage::getSingleton('checkout/session')->getQuote()->getGrandTotal();
|
138 |
+
$amount = (round($grand_total, 2) * 100);
|
139 |
+
$manualCheckAmt = (int)$datavalue->getNnDataValue()->getManualCheckAmt();
|
140 |
+
|
141 |
+
if($manualCheckAmt && $manualCheckAmt>=$amount && $product2 && $tariff2) {
|
142 |
+
$pid = $datavalue->getNnDataValue()->getProductId2();
|
143 |
+
$tid = $datavalue->getNnDataValue()->getTariffId2();
|
144 |
+
}
|
145 |
+
|
146 |
+
$test_mode = $datavalue->getNnDataValue()->getTestMode();
|
147 |
+
$currencycode = Mage::app()->getStore()->getCurrentCurrencyCode();
|
148 |
+
$password = $datavalue->getNnDataValue()->getPassword();
|
149 |
+
$order_status = $datavalue->getNnDataValue()->getOrderStatus();
|
150 |
+
$createinvoice = $datavalue->getNnDataValue()->getCreateInvoice();
|
151 |
+
$returnURL = $datavalue->getNnDataValue()->getReturnUrl();
|
152 |
+
$returnmethod = 'POST';
|
153 |
+
$errorreturnURL = $datavalue->getNnDataValue()->getErrorReturnUrl();
|
154 |
+
$errorreturnmethod = 'POST';
|
155 |
+
$input1 = 'order_id';
|
156 |
+
$Implementation = 'PHP_PCI';
|
157 |
+
$sessionid = $datavalue->getNnDataValue()->getSessionId();
|
158 |
+
$lang = $datavalue->getNnDataValue()->getLang();
|
159 |
+
$remoteip = $datavalue->getNnDataValue()->getRemoteIp();
|
160 |
+
|
161 |
+
$magento_version=Mage::getVersion();
|
162 |
+
if($magento_version<'1.4.1.0')
|
163 |
+
{
|
164 |
+
|
165 |
+
$order_id_data = $dbc_collect_order->fetchAll("SELECT `increment_id` FROM `sales_order` ORDER BY `entity_id` DESC LIMIT 1");
|
166 |
+
$billingadd = Mage::getModel('checkout/session')->getQuote()->getBillingAddress();
|
167 |
+
|
168 |
+
$firstname = $billingadd->getFirstname();
|
169 |
+
$lastname = $billingadd->getLastname();
|
170 |
+
$email = $get_user_email;
|
171 |
+
$street = $billingadd->getData('street');
|
172 |
+
$SearchInStreet = '1';
|
173 |
+
$city = $billingadd->getCity();
|
174 |
+
$postcode = $billingadd->getPostcode();
|
175 |
+
$countryid = $billingadd->getCountryId();
|
176 |
+
$telephone = $billingadd->getTelephone();
|
177 |
+
$fax = $billingadd->getFax();
|
178 |
+
|
179 |
+
}
|
180 |
+
else
|
181 |
+
{
|
182 |
+
$items_collect_order = $dbc_collect_order->fetchAll("SELECT * FROM `sales_flat_quote_address` WHERE email='".$get_user_email."' and address_type='shipping' ORDER BY `address_id` DESC LIMIT 1");
|
183 |
+
$order_id_data = $dbc_collect_order->fetchAll("SELECT `increment_id` FROM `sales_flat_order` ORDER BY `entity_id` DESC LIMIT 1");
|
184 |
+
|
185 |
+
$firstname = $items_collect_order['0']['firstname'];
|
186 |
+
$lastname = $items_collect_order['0']['lastname'];
|
187 |
+
$email = $get_user_email;
|
188 |
+
$street = $items_collect_order['0']['street'];
|
189 |
+
$SearchInStreet = '1';
|
190 |
+
$city = $items_collect_order['0']['city'];
|
191 |
+
$postcode = $items_collect_order['0']['postcode'];
|
192 |
+
$countryid = $items_collect_order['0']['country_id'];
|
193 |
+
$telephone = $items_collect_order['0']['telephone'];
|
194 |
+
$fax = $items_collect_order['0']['fax'];
|
195 |
+
|
196 |
+
}
|
197 |
+
|
198 |
+
if(!$order_id_data)
|
199 |
+
{
|
200 |
+
$last_main_order_id = '100000000';
|
201 |
+
$inputval1 = $last_main_order_id+1;
|
202 |
+
}
|
203 |
+
else
|
204 |
+
{
|
205 |
+
$last_main_order_id = $order_id_data['0']['increment_id'];
|
206 |
+
$inputval1 = $last_main_order_id+1;
|
207 |
+
}
|
208 |
+
$dataObj->setVendorId($vendorid)
|
209 |
+
->setVendorAuthcode($vendorAuthcode)
|
210 |
+
->setProductId($pid)
|
211 |
+
->setTariffId($tid)
|
212 |
+
->setUniqid($uniqid)
|
213 |
+
->setAmount($amount)
|
214 |
+
->setTestMode($test_mode)
|
215 |
+
->setPaymentId($paymentid)
|
216 |
+
->setCurrency($currencycode)
|
217 |
+
->setFirstname($firstname)
|
218 |
+
->setLastname($lastname)
|
219 |
+
->setEmail($email)
|
220 |
+
->setStreet($street)
|
221 |
+
->setSearchInStreet(1)
|
222 |
+
->setCity($city)
|
223 |
+
->setZip($postcode)
|
224 |
+
->setCountryCode($countryid)
|
225 |
+
->setLang($lang)
|
226 |
+
->setRemoteIp($remoteip)
|
227 |
+
->setTel($telephone)
|
228 |
+
->setFax($fax)
|
229 |
+
->setSession($sessionid)
|
230 |
+
->setReturnUrl($returnURL)
|
231 |
+
->setReturnMethod($returnmethod)
|
232 |
+
->setErrorReturnUrl($errorreturnURL)
|
233 |
+
->setErrorReturnMethod($errorreturnmethod)
|
234 |
+
->setInput1($input1)
|
235 |
+
->setImplementation($Implementation)
|
236 |
+
->setInputval1($inputval1)
|
237 |
+
->setIsIframe(1);
|
238 |
+
|
239 |
+
$session=Mage::getSingleton('checkout/session')->setNovalnetRealOrderId($inputval1);
|
240 |
+
$session=Mage::getSingleton('checkout/session')->setOrderId($inputval1);
|
241 |
+
$session=Mage::getSingleton('checkout/session')->setPassword($password);
|
242 |
+
$session=Mage::getSingleton('checkout/session')->setOrderStatus($order_status);
|
243 |
+
$session=Mage::getSingleton('checkout/session')->setCreateInvoice($createinvoice);
|
244 |
+
$session=Mage::getSingleton('checkout/session')->setNovalnetQuoteId($session->getQuoteId());
|
245 |
+
|
246 |
+
$authcode_str='vendor_authcode';
|
247 |
+
$product_str='product_id';
|
248 |
+
$tarrif_str ='tariff_id';
|
249 |
+
$uniq_str='uniqid';
|
250 |
+
$amt_str='amount';
|
251 |
+
$testmode_str='test_mode';
|
252 |
+
|
253 |
+
$dataObj=importHashData($dataObj);
|
254 |
+
$authcode_enc_val=importEncodeData($dataObj,$authcode_str);
|
255 |
+
$product_enc_val=importEncodeData($dataObj,$product_str);
|
256 |
+
$tarrif_enc_val=importEncodeData($dataObj,$tarrif_str);
|
257 |
+
$uniq_enc_val=importEncodeData($dataObj,$uniq_str);
|
258 |
+
$amt_enc_val=importEncodeData($dataObj,$amt_str);
|
259 |
+
$testmode_enc_val=importEncodeData($dataObj,$testmode_str);
|
260 |
+
}
|
261 |
+
function importEncodeData($dataObj, $dataval)
|
262 |
+
{
|
263 |
+
$password = Mage::getSingleton('checkout/session')->getNnDataValue()->getPassword();
|
264 |
+
$encoding =encode($dataObj, $password, $dataval);
|
265 |
+
if($encoding != true)
|
266 |
+
{
|
267 |
+
|
268 |
+
Mage::getSingleton('core/session')
|
269 |
+
->addError('Die Methoden für die Verarbeitung von Zeichensätzen sind nicht verfügbar!');
|
270 |
+
$url = Mage::getModel('core/url')->getUrl("checkout/onepage/failure");
|
271 |
+
Mage::app()->getResponse()->setRedirect($url);
|
272 |
+
Mage::app()->getResponse()->sendResponse();
|
273 |
+
exit;
|
274 |
+
}
|
275 |
+
return $encoding;
|
276 |
+
}
|
277 |
+
|
278 |
+
function encode(&$fields, $key, $dataObj)
|
279 |
+
{
|
280 |
+
if(!function_exists('base64_encode') || !function_exists('pack') || !function_exists('crc32')) {
|
281 |
+
return false;
|
282 |
+
}
|
283 |
+
$toBeEncoded = array($dataObj);
|
284 |
+
foreach($toBeEncoded as $_value ) {
|
285 |
+
$data = $fields[$_value];
|
286 |
+
if(isEmptyString($data)) {
|
287 |
+
return false;
|
288 |
+
}
|
289 |
+
try {
|
290 |
+
$crc = sprintf('%u', crc32($data));//%u is a must for ccrc32 returns a signed value
|
291 |
+
$data = $crc."|".$data;
|
292 |
+
$data = bin2hex($data.$key);
|
293 |
+
$data = strrev(base64_encode($data));
|
294 |
+
if($dataObj==$_value)
|
295 |
+
{
|
296 |
+
|
297 |
+
return $fields[$_value] = $data;
|
298 |
+
}
|
299 |
+
}catch(Exception $e) {
|
300 |
+
return false;
|
301 |
+
}
|
302 |
+
}
|
303 |
+
return true;
|
304 |
+
}
|
305 |
+
|
306 |
+
|
307 |
+
function importHashData($dataObj)
|
308 |
+
{
|
309 |
+
$password = Mage::getSingleton('checkout/session')->getNnDataValue()->getPassword();
|
310 |
+
$hash = generateHash($dataObj, $password);
|
311 |
+
|
312 |
+
if($hash == false)
|
313 |
+
{
|
314 |
+
Mage::getSingleton('core/session')
|
315 |
+
->addError('Die Hashfunktionen sind nicht verfügbar!');
|
316 |
+
$url = Mage::getModel('core/url')->getUrl("checkout/onepage/failure");
|
317 |
+
Mage::app()->getResponse()->setRedirect($url);
|
318 |
+
Mage::app()->getResponse()->sendResponse();
|
319 |
+
exit;
|
320 |
+
}
|
321 |
+
$returnval=$dataObj->setHash($hash);
|
322 |
+
return $returnval;
|
323 |
+
}
|
324 |
+
|
325 |
+
function generateHash($data, $key)
|
326 |
+
{
|
327 |
+
$emptystring = isEmptyString($key);
|
328 |
+
if(!function_exists('md5') || $emptystring)
|
329 |
+
{
|
330 |
+
return false;
|
331 |
+
}
|
332 |
+
$hashFields = array('vendor_authcode', 'product_id', 'tariff_id', 'amount', 'test_mode', 'uniqid' );
|
333 |
+
$str = NULL;
|
334 |
+
foreach( $hashFields as $_value ) {
|
335 |
+
if(isEmptyString($data[$_value])) {
|
336 |
+
return false;
|
337 |
+
}
|
338 |
+
$str .= $data[$_value];
|
339 |
+
}
|
340 |
+
return md5($str . strrev($key));
|
341 |
+
}
|
342 |
+
|
343 |
+
function isEmptyString($str) {
|
344 |
+
$str = trim($str);
|
345 |
+
return !isset($str[0]);
|
346 |
+
}
|
347 |
+
|
348 |
+
|
349 |
+
?>
|
350 |
<div id="nn_iframe" style="display:none;">
|
351 |
<?php
|
352 |
|
353 |
if($paymentmethod=='novalnetCc')
|
354 |
{
|
355 |
+
$data_val=$dataObj;
|
|
|
|
|
356 |
$form = new Varien_Data_Form();
|
357 |
$html = '<html><body>';
|
358 |
+
echo '<form action="https://payport.novalnet.de/pci_payport" id="novalnetCc" name="novalnetCc" method="POST" target="my_iframe">';
|
359 |
foreach ($data_val->toArray() as $field=>$value) {
|
360 |
$form->addField($field, 'hidden', array('name'=>$field, 'value'=>$value));
|
361 |
}
|
362 |
$html.= $form->toHtml();
|
363 |
$html.="<iframe id='my_iframe' name='my_iframe' width='518' height='350' ></iframe>";
|
364 |
$html.= '</form>';
|
365 |
+
$html.= '<script type="text/javascript">document.getElementById("review-buttons-container").style.display="none";document.getElementById("novalnetCc").submit();</script>';
|
366 |
$html.= '</body>';
|
367 |
echo $html.= '</html>';
|
368 |
+
|
369 |
}
|
370 |
?>
|
371 |
</div>
|
372 |
|
373 |
+
|
@@ -31,11 +31,6 @@
|
|
31 |
?>
|
32 |
<?php if ($this->checkCustomerAccess()):?>
|
33 |
<fieldset class="form-list">
|
34 |
-
<div style="position: relative; left: 17em; top: -2.5em">
|
35 |
-
<?php foreach($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
|
36 |
-
<img src='<?php echo $baseUrl?>frontend/default/default/images/novalnet/<?php echo $_typeCode ?>_Logo.png' alt='<?php echo $_typeName ?> Logo'/>
|
37 |
-
<?php endforeach ?>
|
38 |
-
</div>
|
39 |
<ul id="payment_form_<?php echo $code ?>" style="display:none">
|
40 |
<li>
|
41 |
<?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
|
31 |
?>
|
32 |
<?php if ($this->checkCustomerAccess()):?>
|
33 |
<fieldset class="form-list">
|
|
|
|
|
|
|
|
|
|
|
34 |
<ul id="payment_form_<?php echo $code ?>" style="display:none">
|
35 |
<li>
|
36 |
<?php echo $this->__('You will be redirected to Novalnet AG website when you place an order.') ?>
|
@@ -1,85 +0,0 @@
|
|
1 |
-
|
2 |
-
<?php echo $this->getChildHtml('items_before'); ?>
|
3 |
-
<div id="checkout-review-table-wrapper">
|
4 |
-
<table class="data-table" id="checkout-review-table">
|
5 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?>
|
6 |
-
<col />
|
7 |
-
<col width="1" />
|
8 |
-
<col width="1" />
|
9 |
-
<col width="1" />
|
10 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
11 |
-
<col width="1" />
|
12 |
-
<col width="1" />
|
13 |
-
<?php endif; ?>
|
14 |
-
<thead>
|
15 |
-
<tr>
|
16 |
-
<th rowspan="<?php echo $rowspan ?>"><?php echo $this->__('Product Name') ?></th>
|
17 |
-
<th colspan="<?php echo $colspan ?>" class="a-center"><?php echo $this->__('Price') ?></th>
|
18 |
-
<th rowspan="<?php echo $rowspan ?>" class="a-center"><?php echo $this->__('Qty') ?></th>
|
19 |
-
<th colspan="<?php echo $colspan ?>" class="a-center"><?php echo $this->__('Subtotal') ?></th>
|
20 |
-
</tr>
|
21 |
-
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
|
22 |
-
<tr>
|
23 |
-
<th class="a-right"><?php echo $this->helper('tax')->getIncExcTaxLabel(false) ?></th>
|
24 |
-
<th><?php echo $this->helper('tax')->getIncExcTaxLabel(true) ?></th>
|
25 |
-
<th class="a-right"><?php echo $this->helper('tax')->getIncExcTaxLabel(false) ?></th>
|
26 |
-
<th><?php echo $this->helper('tax')->getIncExcTaxLabel(true) ?></th>
|
27 |
-
</tr>
|
28 |
-
<?php endif; ?>
|
29 |
-
</thead>
|
30 |
-
<?php echo $this->getChildHtml('totals'); ?>
|
31 |
-
<tbody>
|
32 |
-
<?php foreach($this->getItems() as $_item): ?>
|
33 |
-
<?php echo $this->getItemHtml($_item)?>
|
34 |
-
<?php endforeach ?>
|
35 |
-
</tbody>
|
36 |
-
</table>
|
37 |
-
</div>
|
38 |
-
<?php echo $this->getChildHtml('items_after'); ?>
|
39 |
-
<script type="text/javascript">
|
40 |
-
//<![CDATA[
|
41 |
-
decorateTable('checkout-review-table');
|
42 |
-
truncateOptions();
|
43 |
-
//]]>
|
44 |
-
</script>
|
45 |
-
<div id="checkout-review-submit">
|
46 |
-
<?php echo $this->getChildHtml('agreements') ?>
|
47 |
-
<div class="buttons-set" id="review-buttons-container">
|
48 |
-
<p class="f-left"><?php echo $this->__('Forgot an Item?') ?> <a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo $this->__('Edit Your Cart') ?></a></p>
|
49 |
-
<?php //echo $this->getChildHtml('button') ?>
|
50 |
-
|
51 |
-
<span class="please-wait" id="review-please-wait" style="display:none;">
|
52 |
-
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Submitting order information...') ?>" title="<?php echo $this->__('Submitting order information...') ?>" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
|
53 |
-
</span>
|
54 |
-
</div>
|
55 |
-
</div>
|
56 |
-
<div align="right">
|
57 |
-
<button id="placeorder_button" type="submit" title="<?php echo $this->__('Place Order') ?>" class="button btn-checkout" onclick="novalnet.save();"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
|
58 |
-
</div>
|
59 |
-
<script type="text/javascript">
|
60 |
-
//<![CDATA[
|
61 |
-
novalnet = new Novalnet('<?php echo $this->getUrl('checkout/onepage/saveOrder') ?>', '<?php echo $this->getUrl('checkout/onepage/success') ?>', $('checkout-agreements'));
|
62 |
-
|
63 |
-
//]]>
|
64 |
-
</script>
|
65 |
-
<div id="nn_iframe" style="display:none;">
|
66 |
-
<?php
|
67 |
-
|
68 |
-
$session=Mage::getSingleton('checkout/session');
|
69 |
-
|
70 |
-
$data_val=$session->getNnDataValue();
|
71 |
-
$form = new Varien_Data_Form();
|
72 |
-
$html = '<html><body>';
|
73 |
-
echo '<form action="https://payport.novalnet.de/pci_payport" id="novalnetCcpci" name="novalnetCcpci" method="POST" target="my_iframe">';
|
74 |
-
foreach ($data_val->toArray() as $field=>$value) {
|
75 |
-
$form->addField($field, 'hidden', array('name'=>$field, 'value'=>$value));
|
76 |
-
}
|
77 |
-
$html.= $form->toHtml();
|
78 |
-
$html.="<iframe id='my_iframe' name='my_iframe' width='518' height='350' ></iframe>";
|
79 |
-
$html.= '</form>';
|
80 |
-
$html.= '<script type="text/javascript">document.getElementById("review-buttons-container").style.display="none";document.getElementById("novalnetCcpci").submit();</script>';
|
81 |
-
$html.= '</body>';
|
82 |
-
echo $html.= '</html>';
|
83 |
-
|
84 |
-
?>
|
85 |
-
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1,23 +1,23 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Novalnet</name>
|
4 |
-
<version>1.3.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Novalnet AG ist ein deutsches EPayment - Unternehmen, bietet alle relevanten Zahlungsarten weltweit. / Novalnet is a German based payment service provider, which offers all the available payments and solutions worldwide.</summary>
|
10 |
<description>The NOVALNET AG is an essential component of e-Payment platform that facilitates your company to process all type of payments. As one of the leading company in Online-Payment the NOVALNET AG provides its customers an individual, technically qualified secured Payment system and also the best possible support throughout. NOVALNET AG is not only an e-Payment provider but also we offer our Merchants an optimal strategic solution for easy payment processing which is pocket-friendly for our customer.</description>
|
11 |
-
<notes>
|
12 |
-
1.3 database table name is now fetched from system.1.2.9 the same as 1.2.7 only because Magento upload did not work correctly.1.2.8 the same as 1.2.7 only because Magento upload did not work correctly.1.2.7Bugfix:FC;r ELV DE, ELV AT und CC wurde die W&#xE4;hrung fix als &amp;apos;EUR&amp;apos; &#xFC;bergeben.&#xD;
|
13 |
-
&#xD;
|
14 |
-
The parameter currency was passed over as fixed value &amp;apos;EUR&amp;apos; for payment modules &amp;apos;Direct Debit German&amp;apos;, &amp;apos;Direct Debit Austria&amp;apos; and &amp;apos;Credir Card&amp;apos;.Allgemeine Bemerkung:Die Cache-Ordner var/cache und var/session m&#xFC;ssen wie immer nach Aktualisierungen geleert werden
|
15 |
-
&#xD;
|
16 |
Notice: the cache folders var/cache and var/session must be emptied after updates.</notes>
|
17 |
<authors><author><name>Dixon Rajdaniel</name><user>Novalnet</user><email>dr@novalnet.de</email></author></authors>
|
18 |
-
<date>
|
19 |
-
<time>
|
20 |
-
<contents><target name="magecommunity"><dir name="Mage"><dir name="Novalnet"><dir name="Block"><dir name="Cc"><file name="Form.php" hash="67b6fad8502b7620892f22bbf959f26f"/><file name="Info.php" hash="c24e83809550bef8b52db11e447b0d2b"/></dir><dir name="Elvaustria"><file name="Form.php" hash="e43f7b046f7442d7c541f4c3e23eee96"/><file name="Info.php" hash="86885be407cf8b1919e0a4464c582daa"/></dir><dir name="Elvgerman"><file name="Form.php" hash="9e27b96c3bdcb5f39f5d5d1ea4626ca5"/><file name="Info.php" hash="5250c4450dd35de0b6b027ce36f31a35"/></dir><dir name="Invoice"><file name="Form.php" hash="95378a30aaf639280d320f02bea17d30"/><file name="Info.php" hash="ced5e0db4dd89743e338af2c570aae70"/></dir><dir name="Pci"><file name="Form.php" hash="495df856c7fea65106c3357a6e1ae3b5"/><file name="Info.php" hash="381d5d176cd6ff9675120f3885b9070e"/><file name="Redirect.php" hash="24070c631f417152cec3bc8c736b15e0"/></dir><dir name="Phonepayment"><file name="Form.php" hash="0a378f5d2501e3ee737405020b54e930"/><file name="Info.php" hash="ba9a8211a8009c3d2fd1b0a99614abee"/></dir><dir name="Prepayment"><file name="Form.php" hash="f228a0ef5ee5da05a82936d2935d7645"/><file name="Info.php" hash="64bd855914a0b25e22fab2c0f63939b4"/></dir><dir name="Secure"><file name="Form.php" hash="4701c66723891b9968cfa95ceab1ca1a"/><file name="Info.php" hash="d8ac878ca88b2b854e30bc490a736ca8"/><file name="Redirect.php" hash="da3ae9034328b652deea8f3767db82b5"/></dir></dir><dir name="Helper"><file name="Data.php" hash="6fe7c1ca7fd2ef5dc8c331082ddc3d51"/></dir><dir name="Model"><dir name="Mysql4"><file name="Setup.php" hash="39edfcc97c0c2b7c182795976c85e2d6"/></dir><dir name="Novalnet"><file name="Request.php" hash="c0234e4b26de88337c559f1bb1aacaba"/><file name="Result.php" hash="a8e0b204eedf4b9db7bbf93341e71f0c"/><dir name="Source"><file name="Callbacktypes.php" hash="dd1d2478f6aae100715e46c4d1756828"/><file name="Cctype.php" hash="ac531951c9c4b0d6534600c58fcf825f"/></dir></dir><file name="NovalnetCc.php" hash="
|
21 |
<compatible/>
|
22 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
|
23 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Novalnet</name>
|
4 |
+
<version>1.3.3</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Novalnet AG ist ein deutsches EPayment - Unternehmen, bietet alle relevanten Zahlungsarten weltweit. / Novalnet is a German based payment service provider, which offers all the available payments and solutions worldwide.</summary>
|
10 |
<description>The NOVALNET AG is an essential component of e-Payment platform that facilitates your company to process all type of payments. As one of the leading company in Online-Payment the NOVALNET AG provides its customers an individual, technically qualified secured Payment system and also the best possible support throughout. NOVALNET AG is not only an e-Payment provider but also we offer our Merchants an optimal strategic solution for easy payment processing which is pocket-friendly for our customer.</description>
|
11 |
+
<notes>1.3.3 is now loaded with Iframe functionality&amp;#xD;&#xD;
|
12 |
+
1.3 database table name is now fetched from system.1.2.9 the same as 1.2.7 only because Magento upload did not work correctly.1.2.8 the same as 1.2.7 only because Magento upload did not work correctly.1.2.7Bugfix:FC;r ELV DE, ELV AT und CC wurde die W&amp;amp;#xE4;hrung fix als &amp;amp;amp;apos;EUR&amp;amp;amp;apos; &amp;amp;#xFC;bergeben.&amp;amp;#xD;&amp;#xD;&#xD;
|
13 |
+
&amp;amp;#xD;&amp;#xD;&#xD;
|
14 |
+
The parameter currency was passed over as fixed value &amp;amp;amp;apos;EUR&amp;amp;amp;apos; for payment modules &amp;amp;amp;apos;Direct Debit German&amp;amp;amp;apos;, &amp;amp;amp;apos;Direct Debit Austria&amp;amp;amp;apos; and &amp;amp;amp;apos;Credir Card&amp;amp;amp;apos;.Allgemeine Bemerkung:Die Cache-Ordner var/cache und var/session m&amp;amp;#xFC;ssen wie immer nach Aktualisierungen geleert werden.&amp;#xD;&#xD;
|
15 |
+
&amp;amp;#xD;&amp;#xD;&#xD;
|
16 |
Notice: the cache folders var/cache and var/session must be emptied after updates.</notes>
|
17 |
<authors><author><name>Dixon Rajdaniel</name><user>Novalnet</user><email>dr@novalnet.de</email></author></authors>
|
18 |
+
<date>2012-01-02</date>
|
19 |
+
<time>12:26:09</time>
|
20 |
+
<contents><target name="magecommunity"><dir name="Mage"><dir name="Novalnet"><dir name="Block"><dir name="Cc"><file name="Form.php" hash="67b6fad8502b7620892f22bbf959f26f"/><file name="Info.php" hash="c24e83809550bef8b52db11e447b0d2b"/></dir><dir name="Elvaustria"><file name="Form.php" hash="e43f7b046f7442d7c541f4c3e23eee96"/><file name="Info.php" hash="86885be407cf8b1919e0a4464c582daa"/></dir><dir name="Elvgerman"><file name="Form.php" hash="9e27b96c3bdcb5f39f5d5d1ea4626ca5"/><file name="Info.php" hash="5250c4450dd35de0b6b027ce36f31a35"/></dir><dir name="Invoice"><file name="Form.php" hash="95378a30aaf639280d320f02bea17d30"/><file name="Info.php" hash="ced5e0db4dd89743e338af2c570aae70"/></dir><dir name="Pci"><file name="Form.php" hash="495df856c7fea65106c3357a6e1ae3b5"/><file name="Info.php" hash="381d5d176cd6ff9675120f3885b9070e"/><file name="Redirect.php" hash="24070c631f417152cec3bc8c736b15e0"/></dir><dir name="Phonepayment"><file name="Form.php" hash="0a378f5d2501e3ee737405020b54e930"/><file name="Info.php" hash="ba9a8211a8009c3d2fd1b0a99614abee"/></dir><dir name="Prepayment"><file name="Form.php" hash="f228a0ef5ee5da05a82936d2935d7645"/><file name="Info.php" hash="64bd855914a0b25e22fab2c0f63939b4"/></dir><dir name="Secure"><file name="Form.php" hash="4701c66723891b9968cfa95ceab1ca1a"/><file name="Info.php" hash="d8ac878ca88b2b854e30bc490a736ca8"/><file name="Redirect.php" hash="da3ae9034328b652deea8f3767db82b5"/></dir></dir><dir name="Helper"><file name="Data.php" hash="6fe7c1ca7fd2ef5dc8c331082ddc3d51"/></dir><dir name="Model"><dir name="Mysql4"><file name="Setup.php" hash="39edfcc97c0c2b7c182795976c85e2d6"/></dir><dir name="Novalnet"><file name="Request.php" hash="c0234e4b26de88337c559f1bb1aacaba"/><file name="Result.php" hash="a8e0b204eedf4b9db7bbf93341e71f0c"/><dir name="Source"><file name="Callbacktypes.php" hash="dd1d2478f6aae100715e46c4d1756828"/><file name="Cctype.php" hash="ac531951c9c4b0d6534600c58fcf825f"/></dir></dir><file name="NovalnetCc.php" hash="a68f1f3e7f73e4e0e7c498e7590a0ebc"/><file name="NovalnetCcpci.php" hash="fd867df4844adab5f46933097ceca25d"/><file name="NovalnetElvatpci.php" hash="986a6b9090e348c5cabe87250516708c"/><file name="NovalnetElvaustria.php" hash="656e1a08c5f65aa59abb3f2719421536"/><file name="NovalnetElvdepci.php" hash="16f96fca0b9ab6203d4403ddba753028"/><file name="NovalnetElvgerman.php" hash="3ca0bff0ce3c3c747be0da33f6e1a0b2"/><file name="NovalnetInvoice.php" hash="56254332784597b2d9e747b96aaf5206"/><file name="NovalnetPciAbstract.php" hash="2c82c47d8e9da38b2f397ea494e610f6"/><file name="NovalnetPhonepayment.php" hash="4bee5d5ef161b82aac6fa31b11843824"/><file name="NovalnetPrepayment.php" hash="49cd8025def458b9e07927b7afaf7fae"/><file name="NovalnetSecure.php" hash="52f137be63260b2899b2edd610b7fe4f"/><file name="Observer.php" hash="6e7bc4f2d961fd65afbb36cd0a3f980f"/></dir><dir name="controllers"><file name="PciController.php" hash="72a48e3ea7bd0141db884aff65babf25"/><file name="SecureController.php" hash="5104b240ae9ccb066b2b83671a1e587b"/></dir><dir name="etc"><file name="config.xml" hash="2162c4c801c1847eefd14fdf34b3c838"/><file name="system.xml" hash="7f91fe87bc052205f03e45940d9c5dc0"/></dir><dir name="sql"><dir name="novalnet_setup"><file name="mysql4-install-1.0.0.php" hash="32990c8b75f5da216c8751d0644e4680"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="novalnet"><dir><dir name="cc"><file name="form.phtml" hash="3a98902a7b8cee94ca0aa58ea3965c4f"/><file name="info.phtml" hash="8a932fe5a1bfe86d03139e224d7d5682"/></dir><dir name="elvaustria"><file name="form.phtml" hash="a55abf37fd664a9c30ff2f3cd6dadf14"/><file name="info.phtml" hash="c865f7bfcbdbdc3778494d06c2160db7"/></dir><dir name="elvgerman"><file name="form.phtml" hash="03c2b2b407fb5a812b825fce2e5bb122"/><file name="info.phtml" hash="c865f7bfcbdbdc3778494d06c2160db7"/></dir><dir name="invoice"><file name="form.phtml" hash="2648529fd204a27dc4f7f25fa2cd5fb2"/><file name="info.phtml" hash="cfc62c76287fb274401056d35466ba4e"/></dir><dir name="pci"><file name="form.phtml" hash="1ebc26e915b4e5240ac29b3cc956069f"/><file name="info.phtml" hash="31a1a88d15a6041a0145496cd6e239a1"/></dir><dir name="phonepayment"><file name="form.phtml" hash="6c9886f70020bdf314ff82f6b9b10332"/><file name="info.phtml" hash="ce4edf100d22b6a262670a62044b3ab5"/></dir><dir name="prepayment"><file name="form.phtml" hash="33e833624cf5f31f9ebadd333d081a9f"/><file name="info.phtml" hash="ce4edf100d22b6a262670a62044b3ab5"/></dir><dir name="secure"><file name="form.phtml" hash="924c965679f40ae06329869aa385f4d0"/><file name="info.phtml" hash="8a932fe5a1bfe86d03139e224d7d5682"/></dir></dir></dir><dir name="payment"><dir name="info"><dir name="pdf"><file name="cc.phtml" hash="975007b7c3f7dceb66feb4147852a712"/><file name="pci.phtml" hash="975007b7c3f7dceb66feb4147852a712"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="novalnet.xml" hash="c66652992b93637596c732a111a34184"/></dir><dir name="template"><dir><dir name="novalnet"><dir name="cc"><file name="form.phtml" hash="1d0b27175f3427a78eff0c50d6b3cc8e"/><file name="info.phtml" hash="5d71c930c1051ce205bf6096e36e9c16"/><file name="pciiframe.phtml" hash="770df7e15710d59b0eaf99b77133d63d"/></dir><dir name="elvaustria"><file name="form.phtml" hash="40b903a059dd814475ad17b7714e14ae"/><file name="info.phtml" hash="c865f7bfcbdbdc3778494d06c2160db7"/></dir><dir name="elvgerman"><file name="form.phtml" hash="c884ad276aece22b9278074333e164ea"/><file name="info.phtml" hash="c865f7bfcbdbdc3778494d06c2160db7"/></dir><dir name="invoice"><file name="form.phtml" hash="c91d975bddd597fa847865dfbf3fb892"/><file name="info.phtml" hash="cfc62c76287fb274401056d35466ba4e"/></dir><dir name="pci"><file name="form.phtml" hash="3e07a44dd1dc633a5f104e14dde7c7bf"/><file name="info.phtml" hash="5d71c930c1051ce205bf6096e36e9c16"/><file name="pciiframe.phtml" hash="39f52b2cc49927af05dd7356aa4d255f"/></dir><dir name="phonepayment"><file name="form.phtml" hash="6c9886f70020bdf314ff82f6b9b10332"/><file name="info.phtml" hash="ce4edf100d22b6a262670a62044b3ab5"/></dir><dir name="prepayment"><file name="form.phtml" hash="33e833624cf5f31f9ebadd333d081a9f"/><file name="info.phtml" hash="fc1580efac5b264615513441535394a6"/></dir><dir name="secure"><file name="form.phtml" hash="98411d5f1cb2a7eaf5d34ad7e3639661"/><file name="info.phtml" hash="8a932fe5a1bfe86d03139e224d7d5682"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Novalnet.xml" hash="71217c898352b41ed08facc218335405"/></dir></target><target name="magelocale"><dir name="de_AT"><file name="Mage_Novalnet.csv" hash="dc12e2400c27a3a0105a3748a287183d"/></dir><dir name="de_CH"><file name="Mage_Novalnet.csv" hash="dc12e2400c27a3a0105a3748a287183d"/></dir><dir name="de_DE"><file name="Mage_Novalnet.csv" hash="5b87a25271da2e64422000f058db3dfa"/></dir><dir name="en_US"><file name="Mage_Novalnet.csv" hash="519df0ea15b0feb96eed0a8bda8fee3d"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="novalnet"><file name="AE_Logo.png" hash="ed3b558031a1f03e1bd536ecf1233e0e"/><file name="ELV_Logo.png" hash="b265493a083f03e4da7d24c23cc55b67"/><file name="MC_Logo.png" hash="cd17acdae3de28aeff7da7952d2ef802"/><file name="NN_Logo.png" hash="e17794ee0b984fd6e1ec2b884da1a29b"/><file name="NN_Logo_T.png" hash="4d442efcb94c9fee7749022478a9d1f3"/><file name="VI_Logo.png" hash="5e963373aa1db58369730238cf311548"/><file name="acdc_info.png" hash="fa69e3f3098c4f85d9d3c796d82bdf0a"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="images"><dir name="novalnet"><file name="AE_Logo.png" hash="ed3b558031a1f03e1bd536ecf1233e0e"/><file name="ELV_Logo.png" hash="b265493a083f03e4da7d24c23cc55b67"/><file name="MC_Logo.png" hash="cd17acdae3de28aeff7da7952d2ef802"/><file name="NN_Logo.png" hash="e17794ee0b984fd6e1ec2b884da1a29b"/><file name="NN_Logo_T.png" hash="4d442efcb94c9fee7749022478a9d1f3"/><file name="VI_Logo.png" hash="5e963373aa1db58369730238cf311548"/><file name="acdc_info.png" hash="fa69e3f3098c4f85d9d3c796d82bdf0a"/></dir></dir><dir name="js"><file name="novalnet.js" hash="ba196f1c34101f64cdaab92ab58560bd"/></dir></dir></dir></dir></target></contents>
|
21 |
<compatible/>
|
22 |
<dependencies><required><php><min>5.0.0</min><max>6.0.0</max></php></required></dependencies>
|
23 |
</package>
|