Version Notes
- bugfix: invoice problems with bundle products
Download this release
Release Info
Developer | Heidelberger Payment GmbH |
Extension | Heidelpay |
Version | 14.10.14 |
Comparing to | |
See all releases |
Code changes from version 14.10.09 to 14.10.14
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.10.
|
14 |
|
15 |
/**
|
16 |
* Availability options
|
@@ -490,26 +490,24 @@ class Mage_Heidelpay_Model_Method_Payment extends Mage_Payment_Model_Method_Abst
|
|
490 |
$payment = $order->getPayment()->getMethodInstance();
|
491 |
#echo '<pre>'.print_r($payment, 1).'</pre>'; exit();
|
492 |
// fill order
|
493 |
-
|
494 |
-
|
495 |
-
|
496 |
-
|
497 |
-
|
498 |
-
|
499 |
-
|
500 |
-
|
501 |
-
|
502 |
-
|
503 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
504 |
|
505 |
-
$invoice->collectTotals();
|
506 |
-
$invoice->register()->capture();
|
507 |
-
Mage::getModel('core/resource_transaction')
|
508 |
-
->addObject($invoice)
|
509 |
-
->addObject($invoice->getOrder())
|
510 |
-
->save();
|
511 |
-
$invoice->sendEmail(true, 'Short ID: '.$shortid); // Rechnung versenden // NEW 18.04.2012
|
512 |
-
}
|
513 |
$order->setCustomerNote('Short ID: '.$shortid); // Kommentar auch in EMail
|
514 |
$order->setState($payment->getPaymentState());
|
515 |
$order->addStatusToHistory($payment->getPaymentState(), 'Short ID: '.$shortid, $order->getCustomerNoteNotify());
|
10 |
protected $_code = 'payment';
|
11 |
protected $_order;
|
12 |
protected $_moduleMode = 'DIRECT';
|
13 |
+
protected $version = '14.10.14';
|
14 |
|
15 |
/**
|
16 |
* Availability options
|
490 |
$payment = $order->getPayment()->getMethodInstance();
|
491 |
#echo '<pre>'.print_r($payment, 1).'</pre>'; exit();
|
492 |
// fill order
|
493 |
+
if ($order->canInvoice()) {
|
494 |
+
try {
|
495 |
+
$invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice();
|
496 |
+
if (!$invoice->getTotalQty()) {
|
497 |
+
Mage::throwException(Mage::helper('core')->__('Cannot create an invoice without products.'));
|
498 |
+
}
|
499 |
+
$invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_ONLINE);
|
500 |
+
$invoice->register();
|
501 |
+
$transactionSave = Mage::getModel('core/resource_transaction')
|
502 |
+
->addObject($invoice)
|
503 |
+
->addObject($invoice->getOrder())
|
504 |
+
->save();
|
505 |
+
if ($this->_invoiceOrderEmail) $invoice->sendEmail(true, $invoiceMailComment); // Rechnung versenden*/
|
506 |
+
}
|
507 |
+
catch (Mage_Core_Exception $e) {
|
508 |
+
}
|
509 |
+
}
|
510 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
511 |
$order->setCustomerNote('Short ID: '.$shortid); // Kommentar auch in EMail
|
512 |
$order->setState($payment->getPaymentState());
|
513 |
$order->addStatusToHistory($payment->getPaymentState(), 'Short ID: '.$shortid, $order->getCustomerNoteNotify());
|
app/code/local/Mage/Heidelpay/controllers/PaymentController.php
CHANGED
@@ -607,27 +607,24 @@ class Mage_Heidelpay_PaymentController extends Mage_Core_Controller_Front_Action
|
|
607 |
} else {
|
608 |
if (!empty($orderId)){
|
609 |
// fill order
|
610 |
-
|
611 |
-
|
612 |
-
|
613 |
-
|
614 |
-
|
615 |
-
|
616 |
-
|
617 |
-
|
618 |
-
|
619 |
-
|
620 |
-
|
621 |
-
|
622 |
-
|
623 |
-
|
624 |
-
|
625 |
-
|
626 |
-
|
627 |
-
|
628 |
-
if ($this->_invoiceOrderEmail) $invoice->sendEmail(true, $invoiceMailComment); // Rechnung versenden
|
629 |
-
}
|
630 |
-
|
631 |
Mage::log("Heidelpay - responseAction: order->setState " .$payment->getPaymentState());
|
632 |
$order->setState($payment->getPaymentState());
|
633 |
$order->addStatusToHistory($payment->getPaymentState(), 'Short ID: '.$shortid.' '.$invoiceMailComment, $order->getCustomerNoteNotify());
|
607 |
} else {
|
608 |
if (!empty($orderId)){
|
609 |
// fill order
|
610 |
+
if ($order->canInvoice()) {
|
611 |
+
try {
|
612 |
+
$invoice = Mage::getModel('sales/service_order', $order)->prepareInvoice();
|
613 |
+
if (!$invoice->getTotalQty()) {
|
614 |
+
Mage::throwException(Mage::helper('core')->__('Cannot create an invoice without products.'));
|
615 |
+
}
|
616 |
+
$invoice->setRequestedCaptureCase(Mage_Sales_Model_Order_Invoice::CAPTURE_ONLINE);
|
617 |
+
$invoice->register();
|
618 |
+
$transactionSave = Mage::getModel('core/resource_transaction')
|
619 |
+
->addObject($invoice)
|
620 |
+
->addObject($invoice->getOrder())
|
621 |
+
->save();
|
622 |
+
if ($this->_invoiceOrderEmail) $invoice->sendEmail(true, $invoiceMailComment); // Rechnung versenden
|
623 |
+
}
|
624 |
+
catch (Mage_Core_Exception $e) {
|
625 |
+
}
|
626 |
+
}
|
627 |
+
|
|
|
|
|
|
|
628 |
Mage::log("Heidelpay - responseAction: order->setState " .$payment->getPaymentState());
|
629 |
$order->setState($payment->getPaymentState());
|
630 |
$order->addStatusToHistory($payment->getPaymentState(), 'Short ID: '.$shortid.' '.$invoiceMailComment, $order->getCustomerNoteNotify());
|
app/code/local/Mage/Heidelpay/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Mage_Heidelpay>
|
5 |
-
<version>14.10.
|
6 |
</Mage_Heidelpay>
|
7 |
</modules>
|
8 |
<!--{{{Global-->
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Mage_Heidelpay>
|
5 |
+
<version>14.10.14</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.10.
|
5 |
<stability>stable</stability>
|
6 |
<license>proprietary</license>
|
7 |
<channel>community</channel>
|
@@ -38,12 +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 |
-
- 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-
|
45 |
-
<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="
|
47 |
<compatible/>
|
48 |
<dependencies><required><php><min>5.0.0</min><max>5.5.99</max></php></required></dependencies>
|
49 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Heidelpay</name>
|
4 |
+
<version>14.10.14</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>- bugfix: invoice problems with bundle products</notes>
|
|
|
42 |
<authors><author><name>Heidelberger Payment GmbH</name><user>Heidelpay</user><email>magento@heidelpay.de</email></author></authors>
|
43 |
+
<date>2014-10-14</date>
|
44 |
+
<time>08:59:41</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="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="06066735386dd5df3fa84f591f8c11b2"/></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="e377e8a5cfb6f01a9bad1ed7b7b1ab79"/></dir><dir name="etc"><file name="adminhtml.xml" hash="1e324f57ab7c3fe7d265be8a8c1b2a72"/><file name="config.xml" hash="c5fa67dd29f521a66a9fd388b4948a93"/><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>
|
46 |
<compatible/>
|
47 |
<dependencies><required><php><min>5.0.0</min><max>5.5.99</max></php></required></dependencies>
|
48 |
</package>
|