Trollweb_Dibs - Version 1.1.4

Version Notes

Fixed failure to capture invoices. Due to SSL changes on DIBS servers.

Release Info

Developer	Roy Andre Tollefsen
Extension	Trollweb_Dibs
Version	1.1.4
Comparing to
See all releases

Code changes from version 1.1.3 to 1.1.4

Files changed (6) hide show

app/code/community/Trollweb/Dibs/Model/Dibspw/Api/Request.php +1 -1
app/code/community/Trollweb/Dibs/Model/Dibspw/Info.php +5 -5
app/code/community/Trollweb/Dibs/controllers/DibspwController.php +1 -8
app/code/community/Trollweb/Dibs/data/dibs_setup/data-install-1.0.0.php +2 -1
app/code/community/Trollweb/Dibs/etc/config.xml +2 -3
package.xml +2 -2

app/code/community/Trollweb/Dibs/Model/Dibspw/Api/Request.php CHANGED Viewed

	@@ -46,7 +46,7 @@ class Trollweb_Dibs_Model_Dibspw_Api_Request extends Varien_Object
46	CURLOPT_RETURNTRANSFER => 1,
47	CURLOPT_TIMEOUT => 10,
48	CURLOPT_SSL_VERIFYPEER => false,
49	- CURLOPT_SSLVERSION => 3,
50	),
51	));
52


46	CURLOPT_RETURNTRANSFER => 1,
47	CURLOPT_TIMEOUT => 10,
48	CURLOPT_SSL_VERIFYPEER => false,
49	+ CURLOPT_SSLVERSION => 1,
50	),
51	));
52

app/code/community/Trollweb/Dibs/Model/Dibspw/Info.php CHANGED Viewed

	@@ -22,10 +22,10 @@ class Trollweb_Dibs_Model_Dibspw_Info
22	protected $_hasTransaction = false;
23
24	protected $_publicMap = array(
25	- 'transaction_id',
26	- 'status',
27	- 'date',
28	- 'currency',
29	);
30
31	protected $_secureMap = array(
	@@ -92,4 +92,4 @@ class Trollweb_Dibs_Model_Dibspw_Info
92	public function hasTransaction() {
93	return $this->_hasTransaction;
94	}
95	- }


22	protected $_hasTransaction = false;
23
24	protected $_publicMap = array(
25	+ //'transaction_id',
26	+ //'status',
27	+ //'date',
28	+ //'currency',
29	);
30
31	protected $_secureMap = array(

92	public function hasTransaction() {
93	return $this->_hasTransaction;
94	}
95	+ }

app/code/community/Trollweb/Dibs/controllers/DibspwController.php CHANGED Viewed

	@@ -32,14 +32,7 @@ class Trollweb_Dibs_DibspwController extends Mage_Core_Controller_Front_Action
32	$post = $this->getRequest()->getParams();
33	$dibspw = Mage::getModel('dibs/dibspw_callback')->acceptOrder($post);
34
35	- ~~sleep~~(3);
36	-
37	- if ($dibspw->getOrder()->getStatus() == $hdibspw->getConfigData('order_status')) {
38	- $this->_redirect('checkout/onepage/success', array('_secure'=>true));
39	- }
40	- else {
41	- $this->_redirect('/', array('_secure'=>true));
42	- }
43	}
44
45	public function cancelAction() {


32	$post = $this->getRequest()->getParams();
33	$dibspw = Mage::getModel('dibs/dibspw_callback')->acceptOrder($post);
34
35	+ $this->_redirect('checkout/onepage/success', array('_secure'=>true));







36	}
37
38	public function cancelAction() {

app/code/community/Trollweb/Dibs/data/dibs_setup/data-install-1.0.0.php CHANGED Viewed

	@@ -16,13 +16,14 @@ $data = array(
16	'label' => 'Declined dibs'
17	),
18	);
19	-
20	foreach ($statuses as $code => $info) {
21	$data[] = array(
22	'status' => $code,
23	'label' => $info['label']
24	);
25	}

26	$installer->getConnection()->insertArray(
27	$installer->getTable('sales/order_status'),
28	array('status', 'label'),


16	'label' => 'Declined dibs'
17	),
18	);
19	+ /*
20	foreach ($statuses as $code => $info) {
21	$data[] = array(
22	'status' => $code,
23	'label' => $info['label']
24	);
25	}
26	+ */
27	$installer->getConnection()->insertArray(
28	$installer->getTable('sales/order_status'),
29	array('status', 'label'),

app/code/community/Trollweb/Dibs/etc/config.xml CHANGED Viewed

	@@ -2,7 +2,7 @@
2	<config>
3	<modules>
4	<Trollweb_Dibs>
5	- <version>1.1.3</version>
6	</Trollweb_Dibs>
7	</modules>
8
	@@ -140,8 +140,7 @@
140	<cron_expr>/10 * * *</cron_expr>
141	</schedule>
142	<run>
143	- <model>dibs/dibspw_observer::cancelOrdersAfterTimeout
144	- </model>
145	</run>
146	</dibspw_timeout>
147	</jobs>


2	<config>
3	<modules>
4	<Trollweb_Dibs>
5	+ <version>1.1.4</version>
6	</Trollweb_Dibs>
7	</modules>
8

140	<cron_expr>/10 * * *</cron_expr>
141	</schedule>
142	<run>
143	+ <model>dibs/dibspw_observer::cancelOrdersAfterTimeout</model>

144	</run>
145	</dibspw_timeout>
146	</jobs>

package.xml CHANGED Viewed

	@@ -1,5 +1,5 @@
1	<?xml version="1.0"?>
2	- <package><name>Trollweb_Dibs</name><version>1.1.3</version><stability>stable</stability><license>MIT</license><channel>community</channel><extends></extends><summary>The DIBS Payment module for Magento, developed and supported by Trollweb Solutions.</summary><description><strong>The DIBS Payment module</strong><br />
3	<p>The DIBS module from Magento by Trollweb is the only one backed and supported by both DIBS and Trollweb, a leading Magento Payments module developer based in Norway and Sweden.</p>
4
5	<strong>100% free</strong><br />
	@@ -16,4 +16,4 @@
16
17	<p>If you need help installing and setting up the module we offer basic free support for the module, however any kind of customization and extensive setups are provided at our normalt hourly rates.</p>
18
19	- <p>For more details, visit <a href="http://trollweb.no/dibs">http://trollweb.no/dibs</a>.</p></description><notes>Fixed ~~callback~~ ~~issues~~.</notes><authors><author><name>Roy Andre Tollefsen</name><user>royandre</user><email>royandre@trollweb.no</email></author></authors><date>2014-02-25</date><time>5:18:01</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="locale"><dir name="nb_NO"><file name="Trollweb_Dibs.csv" hash="60ca9c9a98f3090b0a7292f1e6b28e0c"/></dir></dir><dir name="code"><dir name="community"><dir name="Trollweb"><dir name="Dibs"><dir name="Model"><file name="Dibspw.php" hash="820da87c53a9e781fcf9bdb2d8660744"/><dir name="Dibspw"><file name="Callback.php" hash="6461ffb964c25d1ae748b450aa2dc8c6"/><file name="Cart.php" hash="411a6006f56a68408ff4506aba35a362"/><file name="Info.php" hash="~~9ad8989469563cfe53d3b6cf68d9d506~~"/><file name="Observer.php" hash="db8a399f68514eb4e17e23a5c85d5a1c"/><dir name="Api"><file name="Request.php" hash="~~8ccf14c0954d43f734233ca0cf583351~~"/><file name="Result.php" hash="780ab87ac1a6bbdca01b92a217dc942e"/></dir></dir><dir name="Source"><file name="Cctype.php" hash="3f0858b5e684913986e535061861d686"/><file name="Language.php" hash="184def3e555e907192bb8f07e25d89cf"/><file name="Logo.php" hash="c2c7af61b1f948ba22cad9eb42ebe80e"/><file name="Optionalfields.php" hash="0cec2194ae4f379ccd8cfb480aa9a039"/><file name="Paymentaction.php" hash="72641656177c66080896b8a8313a6cb6"/><file name="Taxtype.php" hash="ee6e703a882b3836672a77a0b1a8dc87"/><file name="Timeout.php" hash="3611d291b6660aa217d5ae95fc808197"/></dir><dir name="Entity"><file name="Setup.php" hash="dd96c07255111a38551e39c24fb5547a"/></dir></dir><dir name="data"><dir name="dibs_setup"><file name="data-install-1.0.0.php" hash="~~94bfc464c6049f0284606b3fbe906eef~~"/></dir></dir><dir name="controllers"><file name="DibspwController.php" hash="~~ba70fea094950b23ed807b7dc38e0fd4~~"/></dir><dir name="Helper"><file name="Data.php" hash="3b4b7e914788a8016230b2ee3c9fe245"/><file name="Dibspw.php" hash="81e727dae8f6d169f5f174cf3c4a5342"/></dir><dir name="Block"><dir name="Dibspw"><file name="Form.php" hash="641369fcf543c94db1acc4c6ac2d1e60"/><file name="PaymentInfo.php" hash="25d502159a8b4783a9272ef0c029c180"/><file name="Redirect.php" hash="09e8f5f7db800c08c807a1816e929cdd"/></dir></dir><dir name="etc"><file name="config.xml" hash="~~69f123646cb3bd7aff4019c1f3b1ea88~~"/><file name="system.xml" hash="c6b6b76f6a2afe7df5ca1bb20cb62232"/></dir></dir></dir></dir></dir><dir name="design"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="Trollweb_Dibs.xml" hash="912239830f55c9b627038a19b8023e88"/></dir><dir name="template"><dir name="dibs"><dir name="dibspw"><file name="form.phtml" hash="26a735053ff7e74bde5d3c019a479b2d"/><file name="paymentinfo.phtml" hash="ea322fca27fd523ea3f820f9d49b9be1"/><file name="redirect.phtml" hash="fee8316fdd05846e8b8aef45ab45490f"/></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="dibs"><dir name="dibspw"><file name="form.phtml" hash="5739f81ca605856a9e7bd79915d4c1ca"/><file name="paymentinfo.phtml" hash="9b38da3623d46b6a8a246aab530d9dc0"/></dir></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Trollweb_Dibs.xml" hash="85fed3975d75a1d3ca9aaf73ad839b76"/></dir></dir></dir><dir name="skin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="trollweb"><dir name="dibs"><dir name="logos"><file name="black.jpg" hash="55dccedd53a923983891869509f68a27"/><file name="blue.jpg" hash="dbe53239b14c5900ab0cc0a9c3c9f9f1"/><file name="green.jpg" hash="c95d2aad8fbb780137dfc8dacc087fa6"/><file name="grey.jpg" hash="99db51b92759e228f01866d71baf3467"/><file name="red.jpg" hash="1c36abdf7e2a2f0d9701ac45517dc55b"/><file name="yellow.jpg" hash="22b3fdfb251a317d48b8cd216d081387"/></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="images"><dir name="trollweb"><dir name="dibs"><dir name="logos"><file name="black.jpg" hash="55dccedd53a923983891869509f68a27"/><file name="blue.jpg" hash="dbe53239b14c5900ab0cc0a9c3c9f9f1"/><file name="green.jpg" hash="c95d2aad8fbb780137dfc8dacc087fa6"/><file name="grey.jpg" hash="99db51b92759e228f01866d71baf3467"/><file name="red.jpg" hash="1c36abdf7e2a2f0d9701ac45517dc55b"/><file name="yellow.jpg" hash="22b3fdfb251a317d48b8cd216d081387"/></dir></dir></dir></dir></dir></dir></dir></dir></target></contents></package>


1	<?xml version="1.0"?>
2	+ <package><name>Trollweb_Dibs</name><version>1.1.4</version><stability>stable</stability><license>MIT</license><channel>community</channel><extends></extends><summary>The DIBS Payment module for Magento, developed and supported by Trollweb Solutions.</summary><description><strong>The DIBS Payment module</strong><br />
3	<p>The DIBS module from Magento by Trollweb is the only one backed and supported by both DIBS and Trollweb, a leading Magento Payments module developer based in Norway and Sweden.</p>
4
5	<strong>100% free</strong><br />

16
17	<p>If you need help installing and setting up the module we offer basic free support for the module, however any kind of customization and extensive setups are provided at our normalt hourly rates.</p>
18
19	+ <p>For more details, visit <a href="http://trollweb.no/dibs">http://trollweb.no/dibs</a>.</p></description><notes>Fixed failure to capture invoices. Due to SSL changes on DIBS servers.</notes><authors><author><name>Roy Andre Tollefsen</name><user>royandre</user><email>royandre@trollweb.no</email></author></authors><date>2014-11-11</date><time>1:05:51</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="locale"><dir name="nb_NO"><file name="Trollweb_Dibs.csv" hash="60ca9c9a98f3090b0a7292f1e6b28e0c"/></dir></dir><dir name="code"><dir name="community"><dir name="Trollweb"><dir name="Dibs"><dir name="Model"><file name="Dibspw.php" hash="820da87c53a9e781fcf9bdb2d8660744"/><dir name="Dibspw"><file name="Callback.php" hash="6461ffb964c25d1ae748b450aa2dc8c6"/><file name="Cart.php" hash="411a6006f56a68408ff4506aba35a362"/><file name="Info.php" hash="592ea41afc7111e2fcf20da52b14c71e"/><file name="Observer.php" hash="db8a399f68514eb4e17e23a5c85d5a1c"/><dir name="Api"><file name="Request.php" hash="9368e27d53ac97954e1f96199ee936ab"/><file name="Result.php" hash="780ab87ac1a6bbdca01b92a217dc942e"/></dir></dir><dir name="Source"><file name="Cctype.php" hash="3f0858b5e684913986e535061861d686"/><file name="Language.php" hash="184def3e555e907192bb8f07e25d89cf"/><file name="Logo.php" hash="c2c7af61b1f948ba22cad9eb42ebe80e"/><file name="Optionalfields.php" hash="0cec2194ae4f379ccd8cfb480aa9a039"/><file name="Paymentaction.php" hash="72641656177c66080896b8a8313a6cb6"/><file name="Taxtype.php" hash="ee6e703a882b3836672a77a0b1a8dc87"/><file name="Timeout.php" hash="3611d291b6660aa217d5ae95fc808197"/></dir><dir name="Entity"><file name="Setup.php" hash="dd96c07255111a38551e39c24fb5547a"/></dir></dir><dir name="data"><dir name="dibs_setup"><file name="data-install-1.0.0.php" hash="07e7e01d1082b1e89f90faf43634b81b"/></dir></dir><dir name="controllers"><file name="DibspwController.php" hash="28fc542d4461b725b074bee0403db1de"/></dir><dir name="Helper"><file name="Data.php" hash="3b4b7e914788a8016230b2ee3c9fe245"/><file name="Dibspw.php" hash="81e727dae8f6d169f5f174cf3c4a5342"/></dir><dir name="Block"><dir name="Dibspw"><file name="Form.php" hash="641369fcf543c94db1acc4c6ac2d1e60"/><file name="PaymentInfo.php" hash="25d502159a8b4783a9272ef0c029c180"/><file name="Redirect.php" hash="09e8f5f7db800c08c807a1816e929cdd"/></dir></dir><dir name="etc"><file name="config.xml" hash="5afda3d0c8e6693d99426c4cd764028c"/><file name="system.xml" hash="c6b6b76f6a2afe7df5ca1bb20cb62232"/></dir></dir></dir></dir></dir><dir name="design"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="Trollweb_Dibs.xml" hash="912239830f55c9b627038a19b8023e88"/></dir><dir name="template"><dir name="dibs"><dir name="dibspw"><file name="form.phtml" hash="26a735053ff7e74bde5d3c019a479b2d"/><file name="paymentinfo.phtml" hash="ea322fca27fd523ea3f820f9d49b9be1"/><file name="redirect.phtml" hash="fee8316fdd05846e8b8aef45ab45490f"/></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="dibs"><dir name="dibspw"><file name="form.phtml" hash="5739f81ca605856a9e7bd79915d4c1ca"/><file name="paymentinfo.phtml" hash="9b38da3623d46b6a8a246aab530d9dc0"/></dir></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Trollweb_Dibs.xml" hash="85fed3975d75a1d3ca9aaf73ad839b76"/></dir></dir></dir><dir name="skin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="trollweb"><dir name="dibs"><dir name="logos"><file name="black.jpg" hash="55dccedd53a923983891869509f68a27"/><file name="blue.jpg" hash="dbe53239b14c5900ab0cc0a9c3c9f9f1"/><file name="green.jpg" hash="c95d2aad8fbb780137dfc8dacc087fa6"/><file name="grey.jpg" hash="99db51b92759e228f01866d71baf3467"/><file name="red.jpg" hash="1c36abdf7e2a2f0d9701ac45517dc55b"/><file name="yellow.jpg" hash="22b3fdfb251a317d48b8cd216d081387"/></dir></dir></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="images"><dir name="trollweb"><dir name="dibs"><dir name="logos"><file name="black.jpg" hash="55dccedd53a923983891869509f68a27"/><file name="blue.jpg" hash="dbe53239b14c5900ab0cc0a9c3c9f9f1"/><file name="green.jpg" hash="c95d2aad8fbb780137dfc8dacc087fa6"/><file name="grey.jpg" hash="99db51b92759e228f01866d71baf3467"/><file name="red.jpg" hash="1c36abdf7e2a2f0d9701ac45517dc55b"/><file name="yellow.jpg" hash="22b3fdfb251a317d48b8cd216d081387"/></dir></dir></dir></dir></dir></dir></dir></dir></target></contents></package>