ZerebroInternet_Barzahlen - Version 1.1.6

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.1.6
Comparing to
See all releases


Code changes from version 1.1.5 to 1.1.6

Files changed (7) hide show
  1. app/code/community/ZerebroInternet/Barzahlen/Model/Api.php +1 -1
  2. app/code/community/ZerebroInternet/Barzahlen/Model/Api/Request/Payment.php +1 -1
  3. app/code/community/ZerebroInternet/Barzahlen/Model/Api/Request/Refund.php +1 -1
  4. app/code/community/ZerebroInternet/Barzahlen/Model/Ipn.php +5 -2
  5. app/code/community/ZerebroInternet/Barzahlen/etc/config.xml +1 -1
  6. app/design/frontend/base/default/layout/barzahlen.xml +1 -1
  7. package.xml +4 -4
app/code/community/ZerebroInternet/Barzahlen/Model/Api.php CHANGED
@@ -112,7 +112,7 @@ class ZerebroInternet_Barzahlen_Model_Api extends ZerebroInternet_Barzahlen_Mode
112
  curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
113
  curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
114
  curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
115
- curl_setopt($curl, CURLOPT_CAINFO, dirname(__FILE__) . '/Api/certs/ca-bundle.crt');
116
  curl_setopt($curl, CURLOPT_TIMEOUT, 30);
117
  curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 15);
118
  curl_setopt($curl, CURLOPT_HTTP_VERSION, 1.1);
112
  curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
113
  curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
114
  curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
115
+ curl_setopt($curl, CURLOPT_CAINFO, Mage::getRoot() . '/code/community/ZerebroInternet/Barzahlen/Model/Api/certs/ca-bundle.crt');
116
  curl_setopt($curl, CURLOPT_TIMEOUT, 30);
117
  curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 15);
118
  curl_setopt($curl, CURLOPT_HTTP_VERSION, 1.1);
app/code/community/ZerebroInternet/Barzahlen/Model/Api/Request/Payment.php CHANGED
@@ -47,7 +47,7 @@ class ZerebroInternet_Barzahlen_Model_Api_Request_Payment extends ZerebroInterne
47
  $this->_customerZipcode = $arguments['customerZipcode'];
48
  $this->_customerCity = $this->isoConvert($arguments['customerCity']);
49
  $this->_customerCountry = $arguments['customerCountry'];
50
- $this->_amount = $arguments['amount'];
51
  $this->_currency = $arguments['currency'];
52
  $this->_orderId = $arguments['orderId'];
53
  }
47
  $this->_customerZipcode = $arguments['customerZipcode'];
48
  $this->_customerCity = $this->isoConvert($arguments['customerCity']);
49
  $this->_customerCountry = $arguments['customerCountry'];
50
+ $this->_amount = round($arguments['amount'], 2);
51
  $this->_currency = $arguments['currency'];
52
  $this->_orderId = $arguments['orderId'];
53
  }
app/code/community/ZerebroInternet/Barzahlen/Model/Api/Request/Refund.php CHANGED
@@ -36,7 +36,7 @@ class ZerebroInternet_Barzahlen_Model_Api_Request_Refund extends ZerebroInternet
36
  public function __construct(array $arguments) {
37
 
38
  $this->_transactionId = $arguments['transactionId'];
39
- $this->_amount = $arguments['amount'];
40
  $this->_currency = $arguments['currency'];
41
  }
42
 
36
  public function __construct(array $arguments) {
37
 
38
  $this->_transactionId = $arguments['transactionId'];
39
+ $this->_amount = round($arguments['amount'], 2);
40
  $this->_currency = $arguments['currency'];
41
  }
42
 
app/code/community/ZerebroInternet/Barzahlen/Model/Ipn.php CHANGED
@@ -84,7 +84,7 @@ class ZerebroInternet_Barzahlen_Model_Ipn {
84
  }
85
 
86
  if(isset($this->_receivedData['order_id'])) {
87
- if($this->_order->getGrandTotal() != $this->_receivedData['amount']) {
88
  Mage::helper('barzahlen')->bzLog('controller/ipn: order total amount doesn\'t match', $this->_receivedData);
89
  return false;
90
  }
@@ -136,14 +136,17 @@ class ZerebroInternet_Barzahlen_Model_Ipn {
136
  return;
137
  }
138
 
139
- Mage::getModel('sales/order_invoice_api')->create($this->_order->getIncrementId(), array(), $this->_createIpnComment(), false, true);
 
140
  }
141
 
142
  /**
143
  * Cancels an order after the period of ten days elasped.
144
  */
145
  protected function _processTransactionExpired() {
 
146
  $this->_order->registerCancellation($this->_createIpnComment(), false);
 
147
  }
148
 
149
  /**
84
  }
85
 
86
  if(isset($this->_receivedData['order_id'])) {
87
+ if(round($this->_order->getGrandTotal(), 2) != round($this->_receivedData['amount'], 2)) {
88
  Mage::helper('barzahlen')->bzLog('controller/ipn: order total amount doesn\'t match', $this->_receivedData);
89
  return false;
90
  }
136
  return;
137
  }
138
 
139
+ Mage::getModel('sales/order_invoice_api')->create($this->_order->getIncrementId(), array(), $this->_createIpnComment(), true, true);
140
+ $this->_order->sendOrderUpdateEmail(true, $this->_createIpnComment());
141
  }
142
 
143
  /**
144
  * Cancels an order after the period of ten days elasped.
145
  */
146
  protected function _processTransactionExpired() {
147
+
148
  $this->_order->registerCancellation($this->_createIpnComment(), false);
149
+ $this->_order->sendOrderUpdateEmail(true, $this->_createIpnComment());
150
  }
151
 
152
  /**
app/code/community/ZerebroInternet/Barzahlen/etc/config.xml CHANGED
@@ -25,7 +25,7 @@
25
 
26
  <modules>
27
  <ZerebroInternet_Barzahlen>
28
- <version>1.1.5</version>
29
  </ZerebroInternet_Barzahlen>
30
  </modules>
31
 
25
 
26
  <modules>
27
  <ZerebroInternet_Barzahlen>
28
+ <version>1.1.6</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.1.5">
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.1.6">
25
  <barzahlen_checkout_processing>
26
  <reference name="root">
27
  <action method="setTemplate"><template>page/1column.phtml</template></action>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ZerebroInternet_Barzahlen</name>
4
- <version>1.1.5</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-03-12</date>
18
- <time>17:08:43</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="b5debd20e6e4610d445c8939eb604755"/></dir><file name="View.php" hash="356e39bbf6ec60ebc629e4db7250a2b8"/></dir></dir></dir><file name="Form.php" hash="7b8757345dd8078bc2656d4d6ff1bc5a"/><file name="Info.php" hash="aa843fd0bc613227083ebe1fc9758b23"/></dir><dir name="Helper"><file name="Data.php" hash="b09cbe4014347450f8acc16969489f0e"/></dir><dir name="Model"><dir name="Adminexceptions"><file name="Allspecificcountries.php" hash="050286cb2d67238f6d2a04657bcd47c7"/><file name="Maxordertotal.php" hash="1c1647bdf769bc7c4e7890b10212f655"/><file name="Notificationkey.php" hash="90c05ffb94c780c735e4d4a9f2e5e80c"/><file name="Paymentkey.php" hash="010bf4c06ec5c52f1a0b2ede1860bbdc"/><file name="Shopid.php" hash="028283a7457170e0d3082d43be5d4d54"/><file name="Specificcountry.php" hash="30ec14a1769fa2bbfc9473588e395a7f"/><file name="Title.php" hash="2d5aaaa22a305f0d17ec7f0b33708689"/></dir><dir name="Api"><dir name="Request"><file name="Abstract.php" hash="389992774bdd28ae2c87640c8076a793"/><file name="Payment.php" hash="b69ed622bdd218215d3d375e5642c945"/><file name="Refund.php" hash="3832874b945ee0cfe01fe403ac751f7d"/><file name="Resend.php" hash="03a9f603503b2c95a137b3afa074ea1a"/><file name="Update.php" hash="2609e7a4e9eab13910b25734dd506c3c"/></dir><dir name="certs"><file name="ca-bundle.crt" hash="7e78dcc7f5a3aefffbb327141dd7ddcf"/></dir><file name="Abstract.php" hash="ddbdffce737e21b046c6e18001f658f1"/><file name="Notification.php" hash="472ee435c75ba6f0340f9bdbd12a8c7c"/></dir><file name="Api.php" hash="c024a9242149375d44839ff97df16493"/><file name="Barzahlen.php" hash="f23a35c07c8e0cd6c178b834e075464f"/><file name="Ipn.php" hash="117d41011a39d2f6d6ffa1256377a19f"/><file name="Payment.php" hash="69b0fdae4a4892ee580f0fb4c0597ddf"/><file name="Refund.php" hash="f8639e94dbd5e1cdca46f516df6a9187"/><file name="Resend.php" hash="9e096207ac0408f6d757f9e4cafc81f2"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="0cd1ea9ea6d1372d1997eec682e4a7c9"/><file name="IpnController.php" hash="69c1f025b92054a8e798310c263b78a6"/><file name="ResendController.php" hash="3ff28616c405317300edff7bd8eee7e0"/></dir><dir name="etc"><file name="config.xml" hash="f48f31736e08ff13d8ec9af2d7bc1464"/><file name="system.xml" hash="d5678376c647bd0e575b7c0d58ed8a9b"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ZerebroInternet_Barzahlen.xml" hash="870d1ed9a0977ca9bfd861850ed8d72c"/></dir></target><target name="magelocale"><dir name="de_DE"><file name="ZerebroInternet_Barzahlen_Admin.csv" hash="74a07c8b552c792821bf8e537d2ea737"/><file name="ZerebroInternet_Barzahlen_Frontend.csv" hash="eca00f201a8a75063a90b69e12586596"/></dir><dir name="en_US"><file name="ZerebroInternet_Barzahlen_Admin.csv" hash="136c76958b729bd2fce5a27d07169d9a"/><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="a4d8e7a934b5ed3c934ed232cb8c4b72"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="barzahlen.xml" hash="244d89067b6f85a97cd66241544e7a8a"/></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.1.6</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-03-27</date>
18
+ <time>18:16:10</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="b5debd20e6e4610d445c8939eb604755"/></dir><file name="View.php" hash="356e39bbf6ec60ebc629e4db7250a2b8"/></dir></dir></dir><file name="Form.php" hash="7b8757345dd8078bc2656d4d6ff1bc5a"/><file name="Info.php" hash="aa843fd0bc613227083ebe1fc9758b23"/></dir><dir name="Helper"><file name="Data.php" hash="b09cbe4014347450f8acc16969489f0e"/></dir><dir name="Model"><dir name="Adminexceptions"><file name="Allspecificcountries.php" hash="050286cb2d67238f6d2a04657bcd47c7"/><file name="Maxordertotal.php" hash="1c1647bdf769bc7c4e7890b10212f655"/><file name="Notificationkey.php" hash="90c05ffb94c780c735e4d4a9f2e5e80c"/><file name="Paymentkey.php" hash="010bf4c06ec5c52f1a0b2ede1860bbdc"/><file name="Shopid.php" hash="028283a7457170e0d3082d43be5d4d54"/><file name="Specificcountry.php" hash="30ec14a1769fa2bbfc9473588e395a7f"/><file name="Title.php" hash="2d5aaaa22a305f0d17ec7f0b33708689"/></dir><dir name="Api"><dir name="Request"><file name="Abstract.php" hash="389992774bdd28ae2c87640c8076a793"/><file name="Payment.php" hash="5155bd60a89f6d1e81b7d9e6fc9ef18d"/><file name="Refund.php" hash="a2d7293d6f582f11189dbba1f5f8dce9"/><file name="Resend.php" hash="03a9f603503b2c95a137b3afa074ea1a"/><file name="Update.php" hash="2609e7a4e9eab13910b25734dd506c3c"/></dir><dir name="certs"><file name="ca-bundle.crt" hash="7e78dcc7f5a3aefffbb327141dd7ddcf"/></dir><file name="Abstract.php" hash="ddbdffce737e21b046c6e18001f658f1"/><file name="Notification.php" hash="472ee435c75ba6f0340f9bdbd12a8c7c"/></dir><file name="Api.php" hash="c30b68aeb92278f7c4535469d66a1df7"/><file name="Barzahlen.php" hash="f23a35c07c8e0cd6c178b834e075464f"/><file name="Ipn.php" hash="6f7952c112047816b3a66a1b050d64fe"/><file name="Payment.php" hash="69b0fdae4a4892ee580f0fb4c0597ddf"/><file name="Refund.php" hash="f8639e94dbd5e1cdca46f516df6a9187"/><file name="Resend.php" hash="9e096207ac0408f6d757f9e4cafc81f2"/></dir><dir name="controllers"><file name="CheckoutController.php" hash="0cd1ea9ea6d1372d1997eec682e4a7c9"/><file name="IpnController.php" hash="69c1f025b92054a8e798310c263b78a6"/><file name="ResendController.php" hash="3ff28616c405317300edff7bd8eee7e0"/></dir><dir name="etc"><file name="config.xml" hash="2cc035d62e23999e67d5c77b37636d1d"/><file name="system.xml" hash="d5678376c647bd0e575b7c0d58ed8a9b"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ZerebroInternet_Barzahlen.xml" hash="870d1ed9a0977ca9bfd861850ed8d72c"/></dir></target><target name="magelocale"><dir name="de_DE"><file name="ZerebroInternet_Barzahlen_Admin.csv" hash="74a07c8b552c792821bf8e537d2ea737"/><file name="ZerebroInternet_Barzahlen_Frontend.csv" hash="eca00f201a8a75063a90b69e12586596"/></dir><dir name="en_US"><file name="ZerebroInternet_Barzahlen_Admin.csv" hash="136c76958b729bd2fce5a27d07169d9a"/><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="a4d8e7a934b5ed3c934ed232cb8c4b72"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="barzahlen.xml" hash="e806d1cd4ff0d5432c0e4441fe2f4711"/></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>