Version Notes
-
Download this release
Release Info
Developer | Rouven Alexander Rieker |
Extension | DebitPayment |
Version | 1.0.4 |
Comparing to | |
See all releases |
Code changes from version 1.0.2 to 1.0.4
- app/code/community/Itabs/Debit/Model/Export/Abstract.php +6 -2
- app/code/community/Itabs/Debit/etc/config.xml +1 -1
- app/design/frontend/base/default/template/debit/debit.phtml +33 -0
- app/design/frontend/base/default/template/debit/form.phtml +2 -2
- app/design/frontend/base/default/template/debit/sepa/debit.phtml +39 -0
- js/itabs/debit/blzcheck.js +10 -9
- package.xml +4 -4
app/code/community/Itabs/Debit/Model/Export/Abstract.php
CHANGED
@@ -68,7 +68,7 @@ class Itabs_Debit_Model_Export_Abstract extends Varien_Object
|
|
68 |
/**
|
69 |
* Check if there are orders available for export..
|
70 |
*
|
71 |
-
* @return
|
72 |
*/
|
73 |
protected function _hasOrdersToExport()
|
74 |
{
|
@@ -85,9 +85,13 @@ class Itabs_Debit_Model_Export_Abstract extends Varien_Object
|
|
85 |
|
86 |
// Check if collection coontains orders
|
87 |
if ($collection->count() == 0) {
|
88 |
-
|
|
|
|
|
|
|
89 |
return false;
|
90 |
}
|
|
|
91 |
return $collection;
|
92 |
}
|
93 |
}
|
68 |
/**
|
69 |
* Check if there are orders available for export..
|
70 |
*
|
71 |
+
* @return Itabs_Debit_Model_Mysql4_Orders_Collection|false
|
72 |
*/
|
73 |
protected function _hasOrdersToExport()
|
74 |
{
|
85 |
|
86 |
// Check if collection coontains orders
|
87 |
if ($collection->count() == 0) {
|
88 |
+
Mage::getSingleton('adminhtml/session')->addError(
|
89 |
+
$this->_getDebitHelper()->__('No orders to export.')
|
90 |
+
);
|
91 |
+
|
92 |
return false;
|
93 |
}
|
94 |
+
|
95 |
return $collection;
|
96 |
}
|
97 |
}
|
app/code/community/Itabs/Debit/etc/config.xml
CHANGED
@@ -25,7 +25,7 @@
|
|
25 |
<config>
|
26 |
<modules>
|
27 |
<Itabs_Debit>
|
28 |
-
<version>1.0.
|
29 |
</Itabs_Debit>
|
30 |
</modules>
|
31 |
<global>
|
25 |
<config>
|
26 |
<modules>
|
27 |
<Itabs_Debit>
|
28 |
+
<version>1.0.4</version>
|
29 |
</Itabs_Debit>
|
30 |
</modules>
|
31 |
<global>
|
app/design/frontend/base/default/template/debit/debit.phtml
ADDED
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* This file is part of the Itabs_Debit module.
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* @category Itabs
|
16 |
+
* @package Itabs_Debit
|
17 |
+
* @author Rouven Alexander Rieker <rouven.rieker@itabs.de>
|
18 |
+
* @copyright 2008-2013 ITABS GmbH / Rouven Alexander Rieker (http://www.itabs.de)
|
19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
+
* @version 1.0.2
|
21 |
+
* @link http://www.magentocommerce.com/magento-connect/debitpayment.html
|
22 |
+
*/
|
23 |
+
?>
|
24 |
+
<?php if($_info = $this->getMethod()): ?>
|
25 |
+
<?php echo $this->htmlEscape($_info->getTitle()) ?>
|
26 |
+
{{pdf_row_separator}}
|
27 |
+
<?php echo $this->__('Account holder: %s', $_info->getAccountName()) ?>
|
28 |
+
{{pdf_row_separator}}
|
29 |
+
<?php echo $this->__('Account number: %s', $_info->getAccountNumber()) ?>
|
30 |
+
{{pdf_row_separator}}
|
31 |
+
<?php echo $this->__('Bank code: %s', $_info->getAccountBLZ()) ?>
|
32 |
+
{{pdf_row_separator}}
|
33 |
+
<?php endif; ?>
|
app/design/frontend/base/default/template/debit/form.phtml
CHANGED
@@ -38,8 +38,8 @@ blzCheck = new blzAjaxCheck('<?php echo $this->getUrl('debit/ajax/checkblz');?>'
|
|
38 |
</li>
|
39 |
<li>
|
40 |
<div class="input-box">
|
41 |
-
<label for="
|
42 |
-
<span id="
|
43 |
</div>
|
44 |
</li>
|
45 |
<li>
|
38 |
</li>
|
39 |
<li>
|
40 |
<div class="input-box">
|
41 |
+
<label for="kreditinstitut"><?php echo $this->__('Kreditinstitut') ?></label><br />
|
42 |
+
<span id="kreditinstitut"><?php echo $this->getBankName(); ?></span>
|
43 |
</div>
|
44 |
</li>
|
45 |
<li>
|
app/design/frontend/base/default/template/debit/sepa/debit.phtml
ADDED
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* This file is part of the Itabs_Debit module.
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* @category Itabs
|
16 |
+
* @package Itabs_Debit
|
17 |
+
* @author Rouven Alexander Rieker <rouven.rieker@itabs.de>
|
18 |
+
* @copyright 2008-2013 ITABS GmbH / Rouven Alexander Rieker (http://www.itabs.de)
|
19 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
20 |
+
* @version 1.0.2
|
21 |
+
* @link http://www.magentocommerce.com/magento-connect/debitpayment.html
|
22 |
+
*/
|
23 |
+
?>
|
24 |
+
<?php
|
25 |
+
/**
|
26 |
+
* @see Itabs_Debit_Block_Info
|
27 |
+
* @var $this Itabs_Debit_Block_Info
|
28 |
+
*/
|
29 |
+
?>
|
30 |
+
<?php if($_info = $this->getMethod()): ?>
|
31 |
+
<?php echo $this->escapeHtml($_info->getTitle()) ?>
|
32 |
+
{{pdf_row_separator}}
|
33 |
+
<?php echo $this->__('Account holder: %s', $_info->getAccountName()) ?>
|
34 |
+
{{pdf_row_separator}}
|
35 |
+
<?php echo $this->__('SWIFT Code: %s', $_info->getAccountSwift()) ?>
|
36 |
+
{{pdf_row_separator}}
|
37 |
+
<?php echo $this->__('IBAN: %s', $_info->getAccountIban()) ?>
|
38 |
+
{{pdf_row_separator}}
|
39 |
+
<?php endif; ?>
|
js/itabs/debit/blzcheck.js
CHANGED
@@ -22,13 +22,13 @@
|
|
22 |
|
23 |
var blzAjaxCheck = Class.create();
|
24 |
blzAjaxCheck.prototype = {
|
25 |
-
initialize: function(checkBlzUrl, checkoutValidBlz){
|
26 |
this.checkBlzUrl = checkBlzUrl;
|
27 |
this.isBlzValid = false;
|
28 |
this.checkoutValidBlz = checkoutValidBlz;
|
29 |
},
|
30 |
checkBlz: function() {
|
31 |
-
|
32 |
this.checkBlzUrl,
|
33 |
{
|
34 |
method:'post',
|
@@ -39,21 +39,22 @@ blzAjaxCheck.prototype = {
|
|
39 |
);
|
40 |
},
|
41 |
setStatus: function(transport) {
|
42 |
-
if (transport && transport.responseText){
|
43 |
-
$('
|
44 |
-
try{
|
45 |
response = eval('(' + transport.responseText + ')');
|
46 |
-
}
|
47 |
-
catch (e) {
|
48 |
response = {};
|
49 |
}
|
50 |
}
|
|
|
51 |
if (response.found && response.found == 1) {
|
52 |
this.isBlzValid = true;
|
53 |
} else {
|
54 |
this.isBlzValid = false;
|
55 |
}
|
56 |
-
|
|
|
57 |
$('bankleitzahl').value = response.blz;
|
58 |
}
|
59 |
}
|
@@ -62,7 +63,7 @@ Event.observe(window, 'load', function() {
|
|
62 |
Validation.add('validate-debit-blz', Translator.translate('Please enter a valid bank code.'), function(v) {
|
63 |
|
64 |
blzCheck.checkBlz();
|
65 |
-
if(blzCheck.checkoutValidBlz == 1) {
|
66 |
if (!blzCheck.isBlzValid) {
|
67 |
return false;
|
68 |
}
|
22 |
|
23 |
var blzAjaxCheck = Class.create();
|
24 |
blzAjaxCheck.prototype = {
|
25 |
+
initialize: function(checkBlzUrl, checkoutValidBlz) {
|
26 |
this.checkBlzUrl = checkBlzUrl;
|
27 |
this.isBlzValid = false;
|
28 |
this.checkoutValidBlz = checkoutValidBlz;
|
29 |
},
|
30 |
checkBlz: function() {
|
31 |
+
new Ajax.Request(
|
32 |
this.checkBlzUrl,
|
33 |
{
|
34 |
method:'post',
|
39 |
);
|
40 |
},
|
41 |
setStatus: function(transport) {
|
42 |
+
if (transport && transport.responseText) {
|
43 |
+
$('kreditinstitut').update('');
|
44 |
+
try {
|
45 |
response = eval('(' + transport.responseText + ')');
|
46 |
+
} catch (e) {
|
|
|
47 |
response = {};
|
48 |
}
|
49 |
}
|
50 |
+
|
51 |
if (response.found && response.found == 1) {
|
52 |
this.isBlzValid = true;
|
53 |
} else {
|
54 |
this.isBlzValid = false;
|
55 |
}
|
56 |
+
|
57 |
+
$('kreditinstitut').update(response.bank);
|
58 |
$('bankleitzahl').value = response.blz;
|
59 |
}
|
60 |
}
|
63 |
Validation.add('validate-debit-blz', Translator.translate('Please enter a valid bank code.'), function(v) {
|
64 |
|
65 |
blzCheck.checkBlz();
|
66 |
+
if (blzCheck.checkoutValidBlz == 1) {
|
67 |
if (!blzCheck.isBlzValid) {
|
68 |
return false;
|
69 |
}
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>DebitPayment</name>
|
4 |
-
<version>1.0.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
@@ -10,9 +10,9 @@
|
|
10 |
<description>Gerade in Deutschland und Österreich gehört die Lastschrift (Bankeinzug) zu den populärsten Zahlungsmöglichkeiten. Mit Hilfe dieser Erweiterung können Sie Ihren Kunden die Zahlungsmöglichkeit Lastschrift anbieten.</description>
|
11 |
<notes>-</notes>
|
12 |
<authors><author><name>Rouven Alexander Rieker</name><user>therouv</user><email>rouven.rieker@itabs.de</email></author></authors>
|
13 |
-
<date>2013-
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir><dir name="Itabs"><dir name="Debit"><dir name="Block"><dir name="Account"><file name="Data.php" hash="46d21e3b0126391c45849fa77431df79"/></dir><dir name="Adminhtml"><dir name="Order"><file name="Grid.php" hash="31624d4fd050a63002a3388e5526ca22"/></dir><file name="Order.php" hash="f72a2756310e6c823279d02cd2fdb78c"/></dir><file name="Form.php" hash="48add093e25acfb570088b46d87d1b99"/><file name="Info.php" hash="a480acdc5f6b1c68d999e2a71d74f065"/></dir><dir name="Helper"><file name="Adminhtml.php" hash="df64233d90a492a9e99f5ec7686462ed"/><file name="Data.php" hash="402f17cff7547fa03d4579d3bed0e130"/></dir><dir name="Model"><file name="Debit.php" hash="5b6474d719e8565b69997698b99fcd39"/><dir name="Entity"><dir name="Customer"><dir name="Attribute"><dir name="Backend"><file name="Encrypted.php" hash="9d69160cebc29cbc82483eedd53b2388"/></dir></dir></dir></dir><dir name="Export"><file name="Abstract.php" hash="
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>DebitPayment</name>
|
4 |
+
<version>1.0.4</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
7 |
<channel>community</channel>
|
10 |
<description>Gerade in Deutschland und Österreich gehört die Lastschrift (Bankeinzug) zu den populärsten Zahlungsmöglichkeiten. Mit Hilfe dieser Erweiterung können Sie Ihren Kunden die Zahlungsmöglichkeit Lastschrift anbieten.</description>
|
11 |
<notes>-</notes>
|
12 |
<authors><author><name>Rouven Alexander Rieker</name><user>therouv</user><email>rouven.rieker@itabs.de</email></author></authors>
|
13 |
+
<date>2013-09-09</date>
|
14 |
+
<time>07:26:47</time>
|
15 |
+
<contents><target name="magecommunity"><dir><dir name="Itabs"><dir name="Debit"><dir name="Block"><dir name="Account"><file name="Data.php" hash="46d21e3b0126391c45849fa77431df79"/></dir><dir name="Adminhtml"><dir name="Order"><file name="Grid.php" hash="31624d4fd050a63002a3388e5526ca22"/></dir><file name="Order.php" hash="f72a2756310e6c823279d02cd2fdb78c"/></dir><file name="Form.php" hash="48add093e25acfb570088b46d87d1b99"/><file name="Info.php" hash="a480acdc5f6b1c68d999e2a71d74f065"/></dir><dir name="Helper"><file name="Adminhtml.php" hash="df64233d90a492a9e99f5ec7686462ed"/><file name="Data.php" hash="402f17cff7547fa03d4579d3bed0e130"/></dir><dir name="Model"><file name="Debit.php" hash="5b6474d719e8565b69997698b99fcd39"/><dir name="Entity"><dir name="Customer"><dir name="Attribute"><dir name="Backend"><file name="Encrypted.php" hash="9d69160cebc29cbc82483eedd53b2388"/></dir></dir></dir></dir><dir name="Export"><file name="Abstract.php" hash="6413b7ba41903819df36dbab719db604"/><file name="Csv.php" hash="8702a652cccd1212ae1c3c4b310f665c"/><file name="Dtaus.php" hash="98374282ff11b8205b8c766d49416671"/><file name="Interface.php" hash="68d7db50e9c6f8a82a8f877c87a31453"/></dir><dir name="Mysql4"><dir name="Orders"><file name="Collection.php" hash="e5f297a406f1690e019ce53b3216017a"/></dir><file name="Orders.php" hash="03adcf5ac5a08c88006d9d2df942e5d1"/></dir><file name="Observer.php" hash="ed1ebfa230a18e0bc97a224a7493a245"/><file name="Orders.php" hash="e8764f3dd1a7e3c5459beb06431a784b"/><dir name="System"><dir name="Config"><dir name="Source"><dir name="Customer"><file name="Group.php" hash="6f6f7c19ae872dc880e7d460b8f5fab1"/></dir><dir name="Debit"><file name="Status.php" hash="396c980bac99f9dcecc473cc76c4ade5"/><file name="Type.php" hash="da1333233710587ca475a5f110016a90"/></dir></dir></dir></dir><file name="Validation.php" hash="4cd7c783e0b1666845bd4a2c18dcf7ca"/></dir><dir name="Test"><dir name="Helper"><dir name="Data"><dir name="expectations"><file name="testGetBankByBlz.yaml" hash="1891b763363abe89398075f5f48dffcf"/><file name="testSanitizeData.yaml" hash="944c1c065a14ccae06d977e8723a7184"/></dir><dir name="providers"><file name="testGetBankByBlz.yaml" hash="6e48f3745c241357c11729cd2e33fb4a"/><file name="testSanitizeData.yaml" hash="8d2d56d46b3eb30eafde3bea4850f7af"/></dir></dir><file name="Data.php" hash="c4ec40ac8647d94f54f1e131d42a28c8"/></dir><dir name="Model"><dir name="Debit"><dir name="expectations"><file name="testMaskString.yaml" hash="de3b2951d14cc38685736491c78fe518"/></dir><dir name="providers"><file name="testMaskString.yaml" hash="e5fab742bdade5f476d065d85547e1f8"/></dir></dir><file name="Debit.php" hash="7f8f68a6d324f4be9f6e4f90f2619a95"/></dir></dir><dir name="controllers"><file name="AccountController.php" hash="bb34953f6e526e1837b4083430167d56"/><dir name="Adminhtml"><file name="OrderController.php" hash="bae6cfc5dd395266a8abc5722257569b"/></dir><file name="AjaxController.php" hash="990f4553ebaea7562a060f583e5d7cf8"/></dir><dir name="etc"><file name="adminhtml.xml" hash="782204255658c5487e095d959fd3c761"/><file name="bankleitzahlen.csv" hash="47834eb8f31d37940cac46f288fdb6b5"/><file name="config.xml" hash="7344c2b3b322fad4dcf50f5815be64bf"/><file name="system.xml" hash="d6f40bdf7bd5108ca3ba356575e05334"/></dir><dir name="sql"><dir name="debit_setup"><file name="mysql4-install-0.4.0.php" hash="49970cbdeae57aa74eea738b37faf8ea"/><file name="mysql4-upgrade-0.3.0-0.4.0.php" hash="49970cbdeae57aa74eea738b37faf8ea"/><file name="mysql4-upgrade-0.4.9-0.5.0.php" hash="f815cfc9f8c88f2fd1bd4cd9a0474cc8"/><file name="mysql4-upgrade-0.5.0-0.5.1.php" hash="bff1a739b0bbd7ea6d92fdeaba05ec51"/><file name="mysql4-upgrade-0.5.1-0.5.2.php" hash="0285a5e8a6011027666748966654561d"/><file name="mysql4-upgrade-0.5.2-1.0.0.php" hash="c92b2e61181ad789caf90c628c4b664f"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Itabs_Debit.xml" hash="d8fd637d248f66a0d0abf42ea5ce435f"/><file name="Mage_Debit.xml" hash="496520708d922fa920a25b3c1fe0c2fc"/></dir></dir></target><target name="magelocale"><dir><dir name="de_DE"><file name="Itabs_Debit.csv" hash="f1c1ce3732857ff1d50430c6f9ef866c"/></dir><dir name="en_US"><file name="Itabs_Debit.csv" hash="4dd222c29fc93c872992a6073e4ecfbe"/></dir></dir></target><target name="magedesign"><dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="debit.xml" hash="2ccbd328c11a45bca21de11be9c5493b"/></dir><dir name="template"><dir name="debit"><file name="debit.phtml" hash="0f14e40d3f69a60d4fe888516993f67f"/><file name="form.phtml" hash="f8960989e920bc95ce463fd32ff6c0e4"/><file name="info.phtml" hash="b9cd21d3d37a90a79c173046d228661a"/><dir><dir name="sepa"><file name="debit.phtml" hash="5f5bdd2868447900803726159978334d"/><file name="form.phtml" hash="7153f45630882f87cade2573f2d7cf5d"/><file name="info.phtml" hash="7f208c81ca5f7cb7fdd80344f2073839"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="debit.xml" hash="bbd4fa9edc15d28369b5de4d0a8d6a7a"/></dir><dir name="template"><dir name="debit"><dir><dir name="account"><file name="data.phtml" hash="227f24c9611887c23a6a6063891b22fd"/></dir><dir name="sepa"><dir name="account"><file name="data.phtml" hash="3ba110726633160967f4c5a9c94e6ba0"/></dir><file name="debit.phtml" hash="5f5bdd2868447900803726159978334d"/><file name="form.phtml" hash="c3a3b8bc6bf091528f87c977d66f24ac"/><file name="info.phtml" hash="3263b45d66e35a3f9843bc0c65d1022a"/></dir></dir><file name="debit.phtml" hash="0f14e40d3f69a60d4fe888516993f67f"/><file name="form.phtml" hash="aaa920f40d5fa40c05f11a38d239b575"/><file name="info.phtml" hash="2e3f6eedb2b5a0b82f24ef5a0402c2b7"/></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir><dir name="js"><dir name="itabs"><dir name="debit"><file name="blzcheck.js" hash="73248eae2afff7e830cf4603aa0ee131"/></dir></dir></dir></dir></target><target name="magelib"><dir><dir name="DTA"><file name="DTA.php" hash="e6fc2837be0ec433fa759485de446fe8"/><file name="DTABase.php" hash="f4249f16bf6c6551fd06e874573f3224"/><file name="DTAZV.php" hash="851b8a15747129fa21945e2d28d435e2"/></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|