ZerebroInternet_Barzahlen - Version 1.2.1

Version Notes

In this version the following things were already tested successfully on 1.4.2.0,1.5.0.1,1.5.1.0,1.6.0.0,1.6.1.0,1.6.2.0,1.7.0.0,1.7.0.1,1.7.0.2

Download this release

Release Info

Developer Magento Core Team
Extension ZerebroInternet_Barzahlen
Version 1.2.1
Comparing to
See all releases


Code changes from version 1.2.0 to 1.2.1

Files changed (6) hide show
  1. app/code/community/ZerebroInternet/Barzahlen/Model/Check.php +3 -2
  2. app/code/community/ZerebroInternet/Barzahlen/controllers/IpnController.php +1 -0
  3. app/code/community/ZerebroInternet/Barzahlen/etc/config.xml +1 -1
  4. app/design/frontend/base/default/layout/barzahlen.xml +1 -1
  5. app/design/frontend/base/default/template/barzahlen/form.phtml +3 -0
  6. package.xml +4 -4
app/code/community/ZerebroInternet/Barzahlen/Model/Check.php CHANGED
@@ -40,11 +40,12 @@ class ZerebroInternet_Barzahlen_Model_Check extends ZerebroInternet_Barzahlen_Mo
40
  $config->saveConfig('payment/barzahlen/last_check', time(), 'default', 0);
41
  Mage::getConfig()->cleanCache();
42
  $barzahlen = Mage::getSingleton('barzahlen/barzahlen');
43
- $transArray['shop_id'] = $barzahlen->getConfigData('shop_id');
44
  $transArray['shopsystem'] = 'Magento';
45
  $transArray['shopsystem_version'] = Mage::getVersion();
46
  $transArray['plugin_version'] = (string) Mage::getConfig()->getNode()->modules->ZerebroInternet_Barzahlen->version;
47
- $transArray['hash'] = $this->_createHash($transArray, $barzahlen->getConfigData('payment_key'));
 
48
 
49
  $currentVersion = $this->_requestVersion($transArray);
50
  if ($currentVersion != false) {
40
  $config->saveConfig('payment/barzahlen/last_check', time(), 'default', 0);
41
  Mage::getConfig()->cleanCache();
42
  $barzahlen = Mage::getSingleton('barzahlen/barzahlen');
43
+ $transArray['shop_id'] = $barzahlen->getConfigData('shop_id') != null ? $barzahlen->getConfigData('shop_id') : $barzahlen->getConfigData('shop_id', 1);
44
  $transArray['shopsystem'] = 'Magento';
45
  $transArray['shopsystem_version'] = Mage::getVersion();
46
  $transArray['plugin_version'] = (string) Mage::getConfig()->getNode()->modules->ZerebroInternet_Barzahlen->version;
47
+ $paymentKey = $barzahlen->getConfigData('payment_key') != null ? $barzahlen->getConfigData('payment_key') : $barzahlen->getConfigData('payment_key', 1);
48
+ $transArray['hash'] = $this->_createHash($transArray, $paymentKey);
49
 
50
  $currentVersion = $this->_requestVersion($transArray);
51
  if ($currentVersion != false) {
app/code/community/ZerebroInternet/Barzahlen/controllers/IpnController.php CHANGED
@@ -39,6 +39,7 @@ class ZerebroInternet_Barzahlen_IpnController extends Mage_Core_Controller_Front
39
  } else {
40
  header("HTTP/1.1 400 Bad Request");
41
  header("Status: 400 Bad Request");
 
42
  }
43
  } catch (Exception $e) {
44
  Mage::logException($e);
39
  } else {
40
  header("HTTP/1.1 400 Bad Request");
41
  header("Status: 400 Bad Request");
42
+ die();
43
  }
44
  } catch (Exception $e) {
45
  Mage::logException($e);
app/code/community/ZerebroInternet/Barzahlen/etc/config.xml CHANGED
@@ -25,7 +25,7 @@
25
 
26
  <modules>
27
  <ZerebroInternet_Barzahlen>
28
- <version>1.2.0</version>
29
  </ZerebroInternet_Barzahlen>
30
  </modules>
31
 
25
 
26
  <modules>
27
  <ZerebroInternet_Barzahlen>
28
+ <version>1.2.1</version>
29
  </ZerebroInternet_Barzahlen>
30
  </modules>
31
 
app/design/frontend/base/default/layout/barzahlen.xml CHANGED
@@ -21,7 +21,7 @@
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL-3.0)
22
  */
23
  -->
24
- <layout version="1.2.0">
25
  <barzahlen_checkout_processing>
26
  <reference name="root">
27
  <action method="setTemplate"><template>page/1column.phtml</template></action>
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL-3.0)
22
  */
23
  -->
24
+ <layout version="1.2.1">
25
  <barzahlen_checkout_processing>
26
  <reference name="root">
27
  <action method="setTemplate"><template>page/1column.phtml</template></action>
app/design/frontend/base/default/template/barzahlen/form.phtml CHANGED
@@ -25,6 +25,8 @@
25
  <ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none">
26
  <li>
27
  <?php
 
 
28
  echo $this->__('bz_frnt_info');
29
  echo Mage::getModel('barzahlen/barzahlen')->getConfigData('sandbox') ? "<br/><br/>".$this->__('bz_frnt_sandbox') : null;
30
  echo "<br/><br/>".$this->__('bz_frnt_partner')."&nbsp;";
@@ -32,6 +34,7 @@
32
  $count = str_pad($i,2,"0",STR_PAD_LEFT);
33
  echo '<img src="https://cdn.barzahlen.de/images/barzahlen_partner_'.$count.'.png" alt="" style="vertical-align: middle; height: 25px;" />';
34
  }
 
35
  ?>
36
  <br /><br />
37
  </li>
25
  <ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none">
26
  <li>
27
  <?php
28
+ echo '<div>';
29
+ echo '<img src="https://cdn.barzahlen.de/images/barzahlen_special.png" style="float: right; margin-left: 10px; max-width: 180px; max-height: 180px;">';
30
  echo $this->__('bz_frnt_info');
31
  echo Mage::getModel('barzahlen/barzahlen')->getConfigData('sandbox') ? "<br/><br/>".$this->__('bz_frnt_sandbox') : null;
32
  echo "<br/><br/>".$this->__('bz_frnt_partner')."&nbsp;";
34
  $count = str_pad($i,2,"0",STR_PAD_LEFT);
35
  echo '<img src="https://cdn.barzahlen.de/images/barzahlen_partner_'.$count.'.png" alt="" style="vertical-align: middle; height: 25px;" />';
36
  }
37
+ echo '</div>';
38
  ?>
39
  <br /><br />
40
  </li>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ZerebroInternet_Barzahlen</name>
4
- <version>1.2.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Source License (OSL) 3.0</license>
7
  <channel>community</channel>
@@ -14,9 +14,9 @@
14
  Barzahlen let's your customers pay cash online. You get a payment confirmation in real-time and you benefit from our payment guarantee and new customer groups. See how Barzahlen works: http://www.barzahlen.de/partner/funktionsweise</description>
15
  <notes>In this version the following things were already tested successfully on 1.4.2.0,1.5.0.1,1.5.1.0,1.6.0.0,1.6.1.0,1.6.2.0,1.7.0.0,1.7.0.1,1.7.0.2</notes>
16
  <authors><author><name>Martin Seener</name><user>auto-converted</user><email>support@barzahlen.de</email></author><author><name>Alexander Diebler</name><user>auto-converted</user><email>support@barzahlen.de</email></author></authors>
17
- <date>2013-05-06</date>
18
- <time>10:16:41</time>
19
- <contents><target name="magecommunity"><dir name="ZerebroInternet"><dir name="Barzahlen"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><file name="View.php" hash="ed34c5974f780caae8597af54dab5f10"/></dir><file name="View.php" hash="69e2ec7e15a7020363035f5bd44cc72f"/></dir></dir></dir><file name="Form.php" hash="bb19aebff7b6df230a736969d56c3824"/><file name="Info.php" hash="c8957f90e34f2148f9f18ddfd30b9549"/></dir><dir name="Helper"><file name="Data.php" hash="76418bc156cbe5ea9b80b8d0b6930003"/></dir><dir name="Model"><dir name="Adminexceptions"><file name="Allspecificcountries.php" hash="f8250081f964940755620a78d0a34759"/><file name="Maxordertotal.php" hash="847c5dfa19c386e07bab438007fb4ed0"/><file name="Notificationkey.php" hash="444e60cd86e21c63cebec46433036af1"/><file name="Paymentkey.php" hash="5c8dbb4a24a006843528921ae8408c6f"/><file name="Shopid.php" hash="4bf52f9fab2b85e8dd97159ae8cae868"/><file name="Specificcountry.php" hash="5b64217fdd81d1c25b97a1aea935e961"/><file name="Title.php" hash="b4ed0a701c1e7afff4d5349946aee93a"/></dir><dir name="Api"><dir name="Request"><file name="Abstract.php" hash="b0673b637619bf66d412a73cc7fc1f96"/><file name="Cancel.php" hash="30b16b5c838206262332808519379819"/><file name="Payment.php" hash="b6408794692541a0476f50f369f29647"/><file name="Refund.php" hash="68485f173d147e5f7412c673f87a0f1c"/><file name="Resend.php" hash="bcdb1cc3bc630bd7a910b894999a4feb"/><file name="Update.php" hash="c823a9157e5afbd41ed98f9687b62745"/></dir><dir name="certs"><file name="ca-bundle.crt" hash="7e78dcc7f5a3aefffbb327141dd7ddcf"/></dir><file name="Abstract.php" hash="a7bd0bce3d4ee08eaebcf153396d0d9a"/><file name="Notification.php" hash="4ebab86f0dfd41ad9f625d9573225669"/></dir><file name="Api.php" hash="06fbc9bec0f8a6dbb22a87d48bd98f0f"/><file name="Barzahlen.php" hash="e1e76fc47ac6aa1067a97fba8b73ca7d"/><file name="Cancel.php" hash="dd5dafa4f7c1eabca9205fb204784c36"/><file name="Check.php" hash="e9e70dcd2094ee81d8e3d6aa5a9f179d"/><file name="Ipn.php" hash="0fc9e193c2d23be08a2790f2729489ac"/><file name="Payment.php" hash="405e04ddab9d31893b2938dc72d3f93f"/><file name="Refund.php" hash="6f8aa14279682f8a9c6cbed5a7402c46"/><file name="Resend.php" hash="08d258616935fd00690440e4f9db2424"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="dea3cbe0437554bd7b9f98ad6fb96e52"/><file name="IpnController.php" hash="95e6e5c47f70adbf7188c5d15b976574"/><file name="ResendController.php" hash="ab6108dd5fa8e0ccfc8edcf8c99f639d"/></dir><dir name="etc"><file name="config.xml" hash="97f02506cf06c4a66dbbd43235ccae19"/><file name="system.xml" hash="a9a17c3c88d65f51ea30e8589c34a07c"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ZerebroInternet_Barzahlen.xml" hash="e06f159c8c6b298ea2bd8d360fd50904"/></dir></target><target name="magelocale"><dir name="de_DE"><file name="ZerebroInternet_Barzahlen_Admin.csv" hash="d0471ec8a3ba4d84eae8b3b6937b40cc"/><file name="ZerebroInternet_Barzahlen_Frontend.csv" hash="eca00f201a8a75063a90b69e12586596"/></dir><dir name="en_US"><file name="ZerebroInternet_Barzahlen_Admin.csv" hash="ba87e1f265f920303da24988a73b7efb"/><file name="ZerebroInternet_Barzahlen_Frontend.csv" hash="ba4c7050219ab94072c1acc567db96dd"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="barzahlen"><file name="info.phtml" hash="28b7003181c7334ae06cea890164fcf2"/></dir></dir></dir></dir><dir name="base"><dir name="default"><dir name="template"><dir name="barzahlen"><file name="form.phtml" hash="424b059387d5c4314ce710a498141498"/><file name="info.phtml" hash="74d5570ff6cc50fbd94ebed0e709435a"/><file name="mark.phtml" hash="e5180d493829dcd1c58837eec9d6e989"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="barzahlen.xml" hash="abe2c5604b460dbddc16c99eaf52539c"/></dir><dir name="template"><dir name="barzahlen"><file name="form.phtml" hash="cd4c65c40c68a70050ab1f43c9db1e89"/><file name="info.phtml" hash="74d5570ff6cc50fbd94ebed0e709435a"/><file name="mark.phtml" hash="e5180d493829dcd1c58837eec9d6e989"/><file name="processing.phtml" hash="7cbfff204dfec836d69d7a8ab7790488"/></dir></dir></dir></dir></dir></target></contents>
20
  <compatible/>
21
  <dependencies/>
22
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ZerebroInternet_Barzahlen</name>
4
+ <version>1.2.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Source License (OSL) 3.0</license>
7
  <channel>community</channel>
14
  Barzahlen let's your customers pay cash online. You get a payment confirmation in real-time and you benefit from our payment guarantee and new customer groups. See how Barzahlen works: http://www.barzahlen.de/partner/funktionsweise</description>
15
  <notes>In this version the following things were already tested successfully on 1.4.2.0,1.5.0.1,1.5.1.0,1.6.0.0,1.6.1.0,1.6.2.0,1.7.0.0,1.7.0.1,1.7.0.2</notes>
16
  <authors><author><name>Martin Seener</name><user>auto-converted</user><email>support@barzahlen.de</email></author><author><name>Alexander Diebler</name><user>auto-converted</user><email>support@barzahlen.de</email></author></authors>
17
+ <date>2013-06-27</date>
18
+ <time>08:03:59</time>
19
+ <contents><target name="magecommunity"><dir name="ZerebroInternet"><dir name="Barzahlen"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><file name="View.php" hash="ed34c5974f780caae8597af54dab5f10"/></dir><file name="View.php" hash="69e2ec7e15a7020363035f5bd44cc72f"/></dir></dir></dir><file name="Form.php" hash="bb19aebff7b6df230a736969d56c3824"/><file name="Info.php" hash="c8957f90e34f2148f9f18ddfd30b9549"/></dir><dir name="Helper"><file name="Data.php" hash="76418bc156cbe5ea9b80b8d0b6930003"/></dir><dir name="Model"><dir name="Adminexceptions"><file name="Allspecificcountries.php" hash="f8250081f964940755620a78d0a34759"/><file name="Maxordertotal.php" hash="847c5dfa19c386e07bab438007fb4ed0"/><file name="Notificationkey.php" hash="444e60cd86e21c63cebec46433036af1"/><file name="Paymentkey.php" hash="5c8dbb4a24a006843528921ae8408c6f"/><file name="Shopid.php" hash="4bf52f9fab2b85e8dd97159ae8cae868"/><file name="Specificcountry.php" hash="5b64217fdd81d1c25b97a1aea935e961"/><file name="Title.php" hash="b4ed0a701c1e7afff4d5349946aee93a"/></dir><dir name="Api"><dir name="Request"><file name="Abstract.php" hash="b0673b637619bf66d412a73cc7fc1f96"/><file name="Cancel.php" hash="30b16b5c838206262332808519379819"/><file name="Payment.php" hash="b6408794692541a0476f50f369f29647"/><file name="Refund.php" hash="68485f173d147e5f7412c673f87a0f1c"/><file name="Resend.php" hash="bcdb1cc3bc630bd7a910b894999a4feb"/><file name="Update.php" hash="c823a9157e5afbd41ed98f9687b62745"/></dir><dir name="certs"><file name="ca-bundle.crt" hash="7e78dcc7f5a3aefffbb327141dd7ddcf"/></dir><file name="Abstract.php" hash="a7bd0bce3d4ee08eaebcf153396d0d9a"/><file name="Notification.php" hash="4ebab86f0dfd41ad9f625d9573225669"/></dir><file name="Api.php" hash="06fbc9bec0f8a6dbb22a87d48bd98f0f"/><file name="Barzahlen.php" hash="e1e76fc47ac6aa1067a97fba8b73ca7d"/><file name="Cancel.php" hash="dd5dafa4f7c1eabca9205fb204784c36"/><file name="Check.php" hash="327aff9f4692d3367a473337bf1a2aec"/><file name="Ipn.php" hash="0fc9e193c2d23be08a2790f2729489ac"/><file name="Payment.php" hash="405e04ddab9d31893b2938dc72d3f93f"/><file name="Refund.php" hash="6f8aa14279682f8a9c6cbed5a7402c46"/><file name="Resend.php" hash="08d258616935fd00690440e4f9db2424"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="dea3cbe0437554bd7b9f98ad6fb96e52"/><file name="IpnController.php" hash="d8ffa31e1c0b50d8cbe1b022e6b3ec93"/><file name="ResendController.php" hash="ab6108dd5fa8e0ccfc8edcf8c99f639d"/></dir><dir name="etc"><file name="config.xml" hash="a98e5f3260d1e0192c6e11b99245fefa"/><file name="system.xml" hash="a9a17c3c88d65f51ea30e8589c34a07c"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ZerebroInternet_Barzahlen.xml" hash="e06f159c8c6b298ea2bd8d360fd50904"/></dir></target><target name="magelocale"><dir name="de_DE"><file name="ZerebroInternet_Barzahlen_Admin.csv" hash="d0471ec8a3ba4d84eae8b3b6937b40cc"/><file name="ZerebroInternet_Barzahlen_Frontend.csv" hash="eca00f201a8a75063a90b69e12586596"/></dir><dir name="en_US"><file name="ZerebroInternet_Barzahlen_Admin.csv" hash="ba87e1f265f920303da24988a73b7efb"/><file name="ZerebroInternet_Barzahlen_Frontend.csv" hash="ba4c7050219ab94072c1acc567db96dd"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="barzahlen"><file name="info.phtml" hash="28b7003181c7334ae06cea890164fcf2"/></dir></dir></dir></dir><dir name="base"><dir name="default"><dir name="template"><dir name="barzahlen"><file name="form.phtml" hash="424b059387d5c4314ce710a498141498"/><file name="info.phtml" hash="74d5570ff6cc50fbd94ebed0e709435a"/><file name="mark.phtml" hash="e5180d493829dcd1c58837eec9d6e989"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="barzahlen.xml" hash="d07b3c0837faa75858c31724947f187f"/></dir><dir name="template"><dir name="barzahlen"><file name="form.phtml" hash="64322cfc9225bdd006b37ceda42110ab"/><file name="info.phtml" hash="74d5570ff6cc50fbd94ebed0e709435a"/><file name="mark.phtml" hash="e5180d493829dcd1c58837eec9d6e989"/><file name="processing.phtml" hash="7cbfff204dfec836d69d7a8ab7790488"/></dir></dir></dir></dir></dir></target></contents>
20
  <compatible/>
21
  <dependencies/>
22
  </package>