Version Notes
- submit delivery address to paypal instead of billing address
Download this release
Release Info
Developer | Heidelberger Payment GmbH |
Extension | Heidelpay |
Version | 14.09.12 |
Comparing to | |
See all releases |
Code changes from version 14.09.05 to 14.09.12
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
|
@@ -289,7 +289,7 @@ class Mage_Heidelpay_Model_Method_Payment extends Mage_Payment_Model_Method_Abst
|
|
289 |
|
290 |
// prepare data
|
291 |
$billing = $this->getOrder()->getBillingAddress();
|
292 |
-
|
293 |
// Immer in der Basisw�hrung des Shops abrechnen
|
294 |
//$amount = number_format($this->getOrder()->getBaseGrandTotal(), 2, '.', '');
|
295 |
//$currency = $this->getOrder()->getBaseCurrencyCode();
|
@@ -298,8 +298,12 @@ class Mage_Heidelpay_Model_Method_Payment extends Mage_Payment_Model_Method_Abst
|
|
298 |
$currency = $this->getOrder()->getOrderCurrencyCode();
|
299 |
|
300 |
#echo '<pre>'.print_r($this->getOrder(), 1).'</pre>';
|
301 |
-
|
302 |
-
|
|
|
|
|
|
|
|
|
303 |
$locale = explode('_', Mage::app()->getLocale()->getLocaleCode());
|
304 |
$valid = array('XC', 'CC', 'DD', 'DC', 'OT', 'GP', 'SU', 'IV', 'IDL', 'EPS', 'PPAL', 'PP', 'MK', 'BS', 'BP'); // valid payment methods
|
305 |
if ( ! in_array($this->actualPaymethod, $valid)) throw new Exception('Invalid Payment Mode given. '.$this->actualPaymethod);
|
@@ -316,20 +320,37 @@ class Mage_Heidelpay_Model_Method_Payment extends Mage_Payment_Model_Method_Abst
|
|
316 |
$orderId = $this->getOrder()->getPayment()->getMethodInstance()->getTransactionId();
|
317 |
$insertId = $orderId;
|
318 |
$orderId .= '-'.$userId;
|
319 |
-
|
320 |
-
|
321 |
-
|
322 |
-
|
323 |
-
|
324 |
-
|
325 |
-
|
326 |
-
|
327 |
-
|
328 |
-
|
329 |
-
|
330 |
-
|
331 |
-
|
332 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
333 |
if (empty($userData['ip'])) $userData['ip'] = $_SERVER['REMOTE_ADDR']; // Falls IP Leer, dann aus dem Server holen
|
334 |
|
335 |
if ($debug) echo 'UniqueId: '.$this->getSession()->getHpUniqueId();
|
10 |
protected $_code = 'payment';
|
11 |
protected $_order;
|
12 |
protected $_moduleMode = 'DIRECT';
|
13 |
+
protected $version = '14.09.12';
|
14 |
|
15 |
/**
|
16 |
* Availability options
|
289 |
|
290 |
// prepare data
|
291 |
$billing = $this->getOrder()->getBillingAddress();
|
292 |
+
$shipping = $this->getOrder()->getShippingAddress();
|
293 |
// Immer in der Basisw�hrung des Shops abrechnen
|
294 |
//$amount = number_format($this->getOrder()->getBaseGrandTotal(), 2, '.', '');
|
295 |
//$currency = $this->getOrder()->getBaseCurrencyCode();
|
298 |
$currency = $this->getOrder()->getOrderCurrencyCode();
|
299 |
|
300 |
#echo '<pre>'.print_r($this->getOrder(), 1).'</pre>';
|
301 |
+
if ($this->actualPaymethod == 'PPAL') {
|
302 |
+
$street = $shipping->getStreet();
|
303 |
+
|
304 |
+
} else {
|
305 |
+
$street = $billing->getStreet();
|
306 |
+
}
|
307 |
$locale = explode('_', Mage::app()->getLocale()->getLocaleCode());
|
308 |
$valid = array('XC', 'CC', 'DD', 'DC', 'OT', 'GP', 'SU', 'IV', 'IDL', 'EPS', 'PPAL', 'PP', 'MK', 'BS', 'BP'); // valid payment methods
|
309 |
if ( ! in_array($this->actualPaymethod, $valid)) throw new Exception('Invalid Payment Mode given. '.$this->actualPaymethod);
|
320 |
$orderId = $this->getOrder()->getPayment()->getMethodInstance()->getTransactionId();
|
321 |
$insertId = $orderId;
|
322 |
$orderId .= '-'.$userId;
|
323 |
+
|
324 |
+
|
325 |
+
if ($this->actualPaymethod == 'PPAL') {
|
326 |
+
$userData = array(
|
327 |
+
'userid' => $userId,
|
328 |
+
'company' => $shipping->getCompany(),
|
329 |
+
'firstname' => $shipping->getFirstname(),
|
330 |
+
'lastname' => $shipping->getLastname(),
|
331 |
+
'salutation'=> 'MR',#($order->customer['gender']=='f' ? 'MRS' : 'MR'),
|
332 |
+
'street' => $street[0],
|
333 |
+
'zip' => $shipping->getPostcode(),
|
334 |
+
'city' => $shipping->getCity(),
|
335 |
+
'country' => $shipping->getCountry(),
|
336 |
+
'email' => $this->getOrder()->getCustomerEmail(),
|
337 |
+
'ip' => $this->getOrder()->getRemoteIp(),
|
338 |
+
);
|
339 |
+
} else {
|
340 |
+
$userData = array(
|
341 |
+
'userid' => $userId,
|
342 |
+
'company' => $billing->getCompany(),
|
343 |
+
'firstname' => $billing->getFirstname(),
|
344 |
+
'lastname' => $billing->getLastname(),
|
345 |
+
'salutation'=> 'MR',#($order->customer['gender']=='f' ? 'MRS' : 'MR'),
|
346 |
+
'street' => $street[0],
|
347 |
+
'zip' => $billing->getPostcode(),
|
348 |
+
'city' => $billing->getCity(),
|
349 |
+
'country' => $billing->getCountry(),
|
350 |
+
'email' => $this->getOrder()->getCustomerEmail(),
|
351 |
+
'ip' => $this->getOrder()->getRemoteIp(),
|
352 |
+
);
|
353 |
+
}
|
354 |
if (empty($userData['ip'])) $userData['ip'] = $_SERVER['REMOTE_ADDR']; // Falls IP Leer, dann aus dem Server holen
|
355 |
|
356 |
if ($debug) echo 'UniqueId: '.$this->getSession()->getHpUniqueId();
|
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.09.12</version>
|
6 |
</Mage_Heidelpay>
|
7 |
</modules>
|
8 |
<!--{{{Global-->
|
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,11 @@ 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>08:
|
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="fa6bcec0966cb83e814b5eac7160edd5"/><file name="Hpdc.php" hash="f6b8f9c73dfd92057e7d9919b2560ced"/><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="bc8331f27f261f716c26e4c2b1dd13d1"/><file name="Payment.php" hash="
|
46 |
<compatible/>
|
47 |
<dependencies><required><php><min>5.0.0</min><max>5.5.7</max></php></required></dependencies>
|
48 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Heidelpay</name>
|
4 |
+
<version>14.09.12</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>- submit delivery address to paypal instead of billing address</notes>
|
42 |
<authors><author><name>Heidelberger Payment GmbH</name><user>Heidelpay</user><email>magento@heidelpay.de</email></author></authors>
|
43 |
+
<date>2014-09-12</date>
|
44 |
+
<time>08:40:06</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="fa6bcec0966cb83e814b5eac7160edd5"/><file name="Hpdc.php" hash="f6b8f9c73dfd92057e7d9919b2560ced"/><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="bc8331f27f261f716c26e4c2b1dd13d1"/><file name="Payment.php" hash="66f3f295be1bffa107ed496802424da8"/></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="1d24d01d9d172f567b978243106a4582"/></dir><dir name="etc"><file name="adminhtml.xml" hash="1e324f57ab7c3fe7d265be8a8c1b2a72"/><file name="config.xml" hash="144d0cdb9b3c386abc1cf2e308faafa9"/><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="66187d3de3dc7ee17a06ddfd208c9edb"/><file name="debitcard.phtml" hash="6a4ef61fdcd29939f8afa047adc61087"/><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="f1c426f21a33f7603e415e98939a041d"/></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="162300a7a397e60facfd0193ad1ce605"/></dir><dir name="de_DE"><file name="Mage_Heidelpay.csv" hash="c7d5946c0511b1c5e859009e4ebf634a"/></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>
|
46 |
<compatible/>
|
47 |
<dependencies><required><php><min>5.0.0</min><max>5.5.7</max></php></required></dependencies>
|
48 |
</package>
|