Dibspw - Version 4.1.2

Version Notes

4.1.2
- Confirmed compatibility with Magento 1.7.*
- Improved stability by using more low-level Magento API integration
- Improved compatibility with DIBS invoice payments
- Added option to limit payment method usage by countries
- Added Transaction ID to order confirmation mail

4.1.1
- Fixed error on redirect with expired session
- Improved compatibility with DIBS FlexWin Magento extension
- Fixed order statuses bug
- Fixed account parameter bugs
- Fixed layout
- Fixed crash on dibspw_results table remove
- Fixed logo appearance bugs
- Fixed bug with message appearance in inappropriate places
- Added Sort Order option
- A lot of other fixes and improvements

4.1.0
- New module for DIBS Payment Window and Mobile Payment Window integration methods.

Download this release

Release Info

Developer DIBS A/S
Extension Dibspw
Version 4.1.2
Comparing to
See all releases


Code changes from version 4.1.1 to 4.1.2

Files changed (32) hide show
  1. app/code/community/Dibspw/Adminhtml/Block/Sales/Order/View/Tab/Info.php +0 -48
  2. app/code/community/Dibspw/Adminhtml/etc/config.xml +0 -34
  3. app/code/community/Dibspw/{Sales/Block/Order/Print.php → Dibspw/Block/Info.php} +25 -22
  4. app/code/community/Dibspw/Dibspw/Model/Dibspw.php +3 -24
  5. app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Dibslogos.php +61 -35
  6. app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Dibspaytypes.php +27 -31
  7. app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Dibsyesno.php +4 -7
  8. app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Lang.php +7 -9
  9. app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Orderstatusafter.php +2 -2
  10. app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Orderstatusbefore.php +4 -4
  11. app/code/community/Dibspw/Dibspw/Model/System/Config/Source/PBBdistribution.php +5 -7
  12. app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Paymentwindow.php +5 -9
  13. app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_api.php +78 -51
  14. app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_error.tmpl +15 -0
  15. app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_helpers.php +15 -7
  16. app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_helpers_cms.php +86 -99
  17. app/code/community/Dibspw/Dibspw/controllers/DibspwController.php +10 -5
  18. app/code/community/Dibspw/Dibspw/etc/config.xml +2 -1
  19. app/code/community/Dibspw/Dibspw/etc/system.xml +29 -6
  20. app/code/community/Dibspw/Dibspw/sql/dibspw_setup/{mysql4-install-4.1.1.php → mysql4-install-4.1.2.php} +0 -0
  21. app/code/community/Dibspw/Dibspw/sql/dibspw_setup/{mysql4-upgrade-4.1.0-4.1.1.php → mysql4-upgrade-4.1.1-4.1.2.php} +0 -0
  22. app/code/community/Dibspw/Sales/Block/Order/Info.php +0 -49
  23. app/code/community/Dibspw/Sales/etc/config.xml +0 -35
  24. app/design/frontend/base/default/template/dibspw/dibspw/form.phtml +2 -2
  25. app/etc/modules/Dibspw_Adminhtml.xml +0 -32
  26. app/etc/modules/Dibspw_Sales.xml +0 -32
  27. app/locale/da_DK/Mage_Dibspw.csv +23 -20
  28. app/locale/en_US/Mage_Dibspw.csv +23 -20
  29. app/locale/nb_NO/Mage_Dibspw.csv +22 -19
  30. app/locale/nn_NO/Mage_Dibspw.csv +23 -20
  31. app/locale/sv_SE/Mage_Dibspw.csv +23 -20
  32. package.xml +12 -5
app/code/community/Dibspw/Adminhtml/Block/Sales/Order/View/Tab/Info.php DELETED
@@ -1,48 +0,0 @@
1
- <?php
2
- /**
3
- * Magento
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
- * DISCLAIMER
16
- *
17
- * Do not edit or add to this file if you wish to upgrade Magento to newer
18
- * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
- *
21
- * @category Mage
22
- * @package Mage_Adminhtml
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
-
27
- /**
28
- * Order information tab
29
- *
30
- * @category Mage
31
- * @package Mage_Adminhtml
32
- * @author Magento Core Team <core@magentocommerce.com>
33
- */
34
- class Dibspw_Adminhtml_Block_Sales_Order_View_Tab_Info extends Mage_Adminhtml_Block_Sales_Order_View_Tab_Info {
35
-
36
- public function getPaymentHtml() {
37
- $res = parent::getPaymentHtml();
38
- $oOrder = $this->getSource();
39
- $oPaymentObj = $oOrder->getPayment()->getMethodInstance();
40
- $sPaymentClass = get_class($oPaymentObj);
41
- if($sPaymentClass !== FALSE && (strpos($sPaymentClass, "Dibsfw") !== FALSE ||
42
- strpos($sPaymentClass, "Dibspw") !== FALSE)) {
43
- $res .= $oPaymentObj->cms_dibs_getAdminOrderInfo($oOrder);
44
- }
45
-
46
- return $res;
47
- }
48
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Dibspw/Adminhtml/etc/config.xml DELETED
@@ -1,34 +0,0 @@
1
- <?xml version="1.0"?>
2
- <!--
3
- /**
4
- * Dibs A/S
5
- * Dibs Payment Extension
6
- *
7
- * NOTICE OF LICENSE
8
- *
9
- * This source file is subject to the Open Software License (OSL 3.0)
10
- * that is bundled with this package in the file LICENSE.txt.
11
- * It is also available through the world-wide-web at this URL:
12
- * http://opensource.org/licenses/osl-3.0.php
13
- * If you did not receive a copy of the license and are unable to
14
- * obtain it through the world-wide-web, please send an email
15
- * to license@magentocommerce.com so we can send you a copy immediately.
16
- *
17
- * @category Payments & Gateways Extensions
18
- * @package Dibspw_Dibspw
19
- * @author Dibs A/S
20
- * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
- */
23
- -->
24
- <config>
25
- <global>
26
- <blocks>
27
- <adminhtml>
28
- <rewrite>
29
- <sales_order_view_tab_info>Dibspw_Adminhtml_Block_Sales_Order_View_Tab_Info</sales_order_view_tab_info>
30
- </rewrite>
31
- </adminhtml>
32
- </blocks>
33
- </global>
34
- </config>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Dibspw/{Sales/Block/Order/Print.php → Dibspw/Block/Info.php} RENAMED
@@ -19,31 +19,34 @@
19
  * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
- * @package Mage_Sales
23
  * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
24
- * Modifications copyrighted by Dibs A/S, (c) 2010.
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
 
28
- /**
29
- * Order information for print
30
- *
31
- * @category Mage
32
- * @package Mage_Sales
33
- */
34
-
35
- class Dibspw_Sales_Block_Order_Print extends Mage_Sales_Block_Order_Print {
 
 
 
 
 
 
36
 
37
- public function getPaymentInfoHtml() {
38
- $res = $this->getChildHtml('payment_info');
39
- $oOrder = $this->getOrder();
40
- $oPaymentObj = $oOrder->getPayment()->getMethodInstance();
41
- $sPaymentClass = get_class($oPaymentObj);
42
- if($sPaymentClass !== FALSE && (strpos($sPaymentClass, "Dibsfw") !== FALSE ||
43
- strpos($sPaymentClass, "Dibspw") !== FALSE)) {
44
- $res .= $oPaymentObj->cms_dibs_getOrderInfo($oOrder);
45
- }
46
-
47
- return $res;
48
  }
49
- }
19
  * needs please refer to http://www.magentocommerce.com for more information.
20
  *
21
  * @category Mage
22
+ * @package Mage_Core
23
  * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
24
+ * Modifications copyrighted by Dibs A/S, (c) 2012.
25
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
26
  */
27
 
28
+ class Dibspw_Dibspw_Block_Info extends Mage_Payment_Block_Info {
29
+
30
+ /**
31
+ * Render the value as an array
32
+ *
33
+ * @param mixed $value
34
+ * @param bool $escapeHtml
35
+ * @return $array
36
+ */
37
+ public function getValueAsArray($value, $escapeHtml = false) {
38
+ if(strpos($value, Mage::helper('dibspw')->__('DIBSPW_LABEL_18')) !== FALSE) $escapeHtml = false;
39
+
40
+ return parent::getValueAsArray($value, $escapeHtml);
41
+ }
42
 
43
+ protected function _prepareSpecificInformation($transport = null) {
44
+ $oDataObj = parent::_prepareSpecificInformation();
45
+ $aData = ($this->getIsSecureMode() === FALSE) ?
46
+ $this->getMethod()->cms_dibs_getAdminOrderInfo() :
47
+ $this->getMethod()->cms_dibs_getOrderInfo();
48
+ foreach($aData as $sKey => $sVal) $oDataObj->setData($sKey, $sVal);
49
+
50
+ return $oDataObj;
 
 
 
51
  }
52
+ }
app/code/community/Dibspw/Dibspw/Model/Dibspw.php CHANGED
@@ -24,9 +24,6 @@ require_once dirname(__FILE__) . '/dibs_api/pw/dibs_pw_api.php';
24
 
25
  class Dibspw_Dibspw_Model_Dibspw extends dibs_pw_api {
26
 
27
- protected $_code = 'Dibspw';
28
- protected $_formBlockType = 'Dibspw_Dibspw_block_form';
29
-
30
  /*
31
  * Validate the currency code is avaialable to use for dibs or not
32
  */
@@ -41,31 +38,13 @@ class Dibspw_Dibspw_Model_Dibspw extends dibs_pw_api {
41
  }
42
 
43
  public function getCheckoutFormFields() {
44
- $order = Mage::getModel('sales/order');
45
- $order->loadByIncrementId(Mage::getSingleton('checkout/session')->getLastRealOrderId());
46
- $aFields = $this->api_dibs_get_requestFields($order);
47
 
48
  return $aFields;
49
  }
50
 
51
- /**
52
- * Using internal pages for input payment data
53
- *
54
- * @return bool
55
- */
56
- public function canUseInternal() {
57
- return false;
58
- }
59
-
60
- /**
61
- * Using for multiple shipping address
62
- *
63
- * @return bool
64
- */
65
- public function canUseForMultishipping() {
66
- return false;
67
- }
68
-
69
  public function getOrderPlaceRedirectUrl() {
70
  return Mage::getUrl('Dibspw/Dibspw/redirect', array('_secure' => true));
71
  }
24
 
25
  class Dibspw_Dibspw_Model_Dibspw extends dibs_pw_api {
26
 
 
 
 
27
  /*
28
  * Validate the currency code is avaialable to use for dibs or not
29
  */
38
  }
39
 
40
  public function getCheckoutFormFields() {
41
+ $oOrder = Mage::getModel('sales/order');
42
+ $oOrder->loadByIncrementId(Mage::getSingleton('checkout/session')->getLastRealOrderId());
43
+ $aFields = $this->api_dibs_get_requestFields($oOrder);
44
 
45
  return $aFields;
46
  }
47
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
48
  public function getOrderPlaceRedirectUrl() {
49
  return Mage::getUrl('Dibspw/Dibspw/redirect', array('_secure' => true));
50
  }
app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Dibslogos.php CHANGED
@@ -20,43 +20,69 @@
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
 
23
 
24
- class Dibspw_Dibspw_Model_System_Config_Source_Dibslogos
25
- {
26
-
27
- public function toOptionArray()
28
- {
29
  return array(
30
- array('value'=>'DIBS', 'label'=>Mage::helper('adminhtml')->__('DIBS Standard Logo')),
31
- array('value'=>'PBB', 'label'=>Mage::helper('adminhtml')->__('DIBS PayByBill Logo')),
32
- array('value'=>'VISA_SECURE', 'label'=>Mage::helper('adminhtml')->__('Verified by VISA')),
33
- array('value'=>'MC_SECURE', 'label'=>Mage::helper('adminhtml')->__('MasterCard SecureCode')),
34
- array('value'=>'JCB_SECURE', 'label'=>Mage::helper('adminhtml')->__('JCB J/Secure')),
35
- array('value'=>'PCI', 'label'=>Mage::helper('adminhtml')->__('PCI')),
36
- array('value'=>'MC', 'label'=>Mage::helper('adminhtml')->__('MasterCard')),
37
- array('value'=>'MTRO', 'label'=>Mage::helper('adminhtml')->__('Maestro')),
38
- array('value'=>'VISA', 'label'=>Mage::helper('adminhtml')->__('Visa')),
39
- array('value'=>'ELEC', 'label'=>Mage::helper('adminhtml')->__('Visa Electron')),
40
- array('value'=>'DIN', 'label'=>Mage::helper('adminhtml')->__('Diners Club')),
41
- array('value'=>'AMEX', 'label'=>Mage::helper('adminhtml')->__('American Express')),
42
- array('value'=>'DK', 'label'=>Mage::helper('adminhtml')->__('Dankort')),
43
- array('value'=>'EDK', 'label'=>Mage::helper('adminhtml')->__('eDankort')),
44
- array('value'=>'SEB', 'label'=>Mage::helper('adminhtml')->__('SEB Direktbetalning')),
45
- array('value'=>'SHB', 'label'=>Mage::helper('adminhtml')->__('SHB Direktbetalning')),
46
- array('value'=>'FSB', 'label'=>Mage::helper('adminhtml')->__('Swedbank Direktbetalning')),
47
- array('value'=>'SOLO', 'label'=>Mage::helper('adminhtml')->__('Nordea Solo-E betalning')),
48
- array('value'=>'DNB', 'label'=>Mage::helper('adminhtml')->__('Danske Netbetaling (Danske Bank)')),
49
- array('value'=>'MOCA', 'label'=>Mage::helper('adminhtml')->__('Mobilcash')),
50
- array('value'=>'BAX', 'label'=>Mage::helper('adminhtml')->__('BankAxess')),
51
- array('value'=>'FFK', 'label'=>Mage::helper('adminhtml')->__('Forbrugsforeningen Card')),
52
- array('value'=>'JCB', 'label'=>Mage::helper('adminhtml')->__('JCB (Japan Credit Bureau)')),
53
- array('value'=>'AKTIA', 'label'=>Mage::helper('adminhtml')->__('Aktia Web Payment')),
54
- array('value'=>'ELV', 'label'=>Mage::helper('adminhtml')->__('Bank Einzug (eOLV)')),
55
- array('value'=>'EW', 'label'=>Mage::helper('adminhtml')->__('eWire')),
56
- array('value'=>'GIT', 'label'=>Mage::helper('adminhtml')->__('Getitcard')),
57
- array('value'=>'VAL', 'label'=>Mage::helper('adminhtml')->__('Valus')),
58
- array('value'=>'ING', 'label'=>Mage::helper('adminhtml')->__('ING iDeal Payment'))
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
59
  );
60
  }
61
 
62
- }
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
23
+ class Dibspw_Dibspw_Model_System_Config_Source_Dibslogos {
24
 
25
+ public function toOptionArray() {
 
 
 
 
26
  return array(
27
+ array('value' => 'DIBS',
28
+ 'label' => Mage::helper('adminhtml')->__('DIBS Standard Logo')),
29
+ array('value' => 'PBB',
30
+ 'label' => Mage::helper('adminhtml')->__('DIBS PayByBill Logo')),
31
+ array('value' => 'VISA_SECURE',
32
+ 'label' => Mage::helper('adminhtml')->__('Verified by VISA')),
33
+ array('value' => 'MC_SECURE',
34
+ 'label' => Mage::helper('adminhtml')->__('MasterCard SecureCode')),
35
+ array('value' => 'JCB_SECURE',
36
+ 'label' => Mage::helper('adminhtml')->__('JCB J/Secure')),
37
+ array('value' => 'PCI',
38
+ 'label' => Mage::helper('adminhtml')->__('PCI')),
39
+ array('value' => 'MC',
40
+ 'label' => Mage::helper('adminhtml')->__('MasterCard')),
41
+ array('value' => 'MTRO',
42
+ 'label' => Mage::helper('adminhtml')->__('Maestro')),
43
+ array('value' => 'VISA',
44
+ 'label' => Mage::helper('adminhtml')->__('Visa')),
45
+ array('value' => 'ELEC',
46
+ 'label' => Mage::helper('adminhtml')->__('Visa Electron')),
47
+ array('value' => 'DIN',
48
+ 'label' => Mage::helper('adminhtml')->__('Diners Club')),
49
+ array('value' => 'AMEX',
50
+ 'label' => Mage::helper('adminhtml')->__('American Express')),
51
+ array('value' => 'DK',
52
+ 'label' => Mage::helper('adminhtml')->__('Dankort')),
53
+ array('value' => 'EDK',
54
+ 'label' => Mage::helper('adminhtml')->__('eDankort')),
55
+ array('value' => 'SEB',
56
+ 'label' => Mage::helper('adminhtml')->__('SEB Direktbetalning')),
57
+ array('value' => 'SHB',
58
+ 'label' => Mage::helper('adminhtml')->__('SHB Direktbetalning')),
59
+ array('value' => 'FSB',
60
+ 'label' => Mage::helper('adminhtml')->__('Swedbank Direktbetalning')),
61
+ array('value' => 'SOLO',
62
+ 'label' => Mage::helper('adminhtml')->__('Nordea Solo-E betalning')),
63
+ array('value' => 'DNB',
64
+ 'label' => Mage::helper('adminhtml')->__('Danske Netbetaling (Danske Bank)')),
65
+ array('value' => 'MOCA',
66
+ 'label' => Mage::helper('adminhtml')->__('Mobilcash')),
67
+ array('value' => 'BAX',
68
+ 'label' => Mage::helper('adminhtml')->__('BankAxess')),
69
+ array('value' => 'FFK',
70
+ 'label' => Mage::helper('adminhtml')->__('Forbrugsforeningen Card')),
71
+ array('value' => 'JCB',
72
+ 'label' => Mage::helper('adminhtml')->__('JCB (Japan Credit Bureau)')),
73
+ array('value' => 'AKTIA',
74
+ 'label' => Mage::helper('adminhtml')->__('Aktia Web Payment')),
75
+ array('value' => 'ELV',
76
+ 'label' => Mage::helper('adminhtml')->__('Bank Einzug (eOLV)')),
77
+ array('value' => 'EW',
78
+ 'label' => Mage::helper('adminhtml')->__('eWire')),
79
+ array('value' => 'GIT',
80
+ 'label' => Mage::helper('adminhtml')->__('Getitcard')),
81
+ array('value' => 'VAL',
82
+ 'label' => Mage::helper('adminhtml')->__('Valus')),
83
+ array('value' => 'ING',
84
+ 'label' => Mage::helper('adminhtml')->__('ING iDeal Payment'))
85
  );
86
  }
87
 
88
+ }
app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Dibspaytypes.php CHANGED
@@ -20,39 +20,35 @@
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
 
23
 
24
- class Dibspw_Dibspw_Model_System_Config_Source_Dibspaytypes
25
- {
26
-
27
- public function toOptionArray()
28
- {
29
  return array(
30
- array('value'=>'DIBS', 'label'=>Mage::helper('adminhtml')->__('DIBS Contracted Paytypes')),
31
- array('value'=>'PBB', 'label'=>Mage::helper('adminhtml')->__('DIBS PayByBill')),
32
- array('value'=>'MC', 'label'=>Mage::helper('adminhtml')->__('MasterCard')),
33
- array('value'=>'MTRO', 'label'=>Mage::helper('adminhtml')->__('Maestro')),
34
- array('value'=>'VISA', 'label'=>Mage::helper('adminhtml')->__('Visa')),
35
- array('value'=>'ELEC', 'label'=>Mage::helper('adminhtml')->__('Visa Electron')),
36
- array('value'=>'DIN', 'label'=>Mage::helper('adminhtml')->__('Diners Club')),
37
- array('value'=>'AMEX', 'label'=>Mage::helper('adminhtml')->__('American Express')),
38
- array('value'=>'DK', 'label'=>Mage::helper('adminhtml')->__('Dankort')),
39
- array('value'=>'EDK', 'label'=>Mage::helper('adminhtml')->__('eDankort')),
40
- array('value'=>'SEB', 'label'=>Mage::helper('adminhtml')->__('SEB Direktbetalning')),
41
- array('value'=>'SHB', 'label'=>Mage::helper('adminhtml')->__('SHB Direktbetalning')),
42
- array('value'=>'FSB', 'label'=>Mage::helper('adminhtml')->__('Swedbank Direktbetalning')),
43
- array('value'=>'SOLO', 'label'=>Mage::helper('adminhtml')->__('Nordea Solo-E betalning')),
44
- array('value'=>'DNB', 'label'=>Mage::helper('adminhtml')->__('Danske Netbetaling (Danske Bank)')),
45
- array('value'=>'MOCA', 'label'=>Mage::helper('adminhtml')->__('Mobilcash')),
46
- array('value'=>'BAX', 'label'=>Mage::helper('adminhtml')->__('BankAxess')),
47
- array('value'=>'FFK', 'label'=>Mage::helper('adminhtml')->__('Forbrugsforeningen Card')),
48
- array('value'=>'JCB', 'label'=>Mage::helper('adminhtml')->__('JCB (Japan Credit Bureau)')),
49
- array('value'=>'AKTIA', 'label'=>Mage::helper('adminhtml')->__('Aktia Web Payment')),
50
- array('value'=>'ELV', 'label'=>Mage::helper('adminhtml')->__('Bank Einzug (eOLV)')),
51
- array('value'=>'EW', 'label'=>Mage::helper('adminhtml')->__('eWire')),
52
- array('value'=>'GIT', 'label'=>Mage::helper('adminhtml')->__('Getitcard')),
53
- array('value'=>'VAL', 'label'=>Mage::helper('adminhtml')->__('Valus')),
54
- array('value'=>'ING', 'label'=>Mage::helper('adminhtml')->__('ING iDeal Payment'))
55
  );
56
  }
57
-
58
  }
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
23
+ class Dibspw_Dibspw_Model_System_Config_Source_Dibspaytypes {
24
 
25
+ public function toOptionArray() {
 
 
 
 
26
  return array(
27
+ array('value' => 'DIBS', 'label' => Mage::helper('adminhtml')->__('DIBS Contracted Paytypes')),
28
+ array('value' => 'PBB', 'label' => Mage::helper('adminhtml')->__('DIBS PayByBill')),
29
+ array('value' => 'MC', 'label' => Mage::helper('adminhtml')->__('MasterCard')),
30
+ array('value' => 'MTRO', 'label' => Mage::helper('adminhtml')->__('Maestro')),
31
+ array('value' => 'VISA', 'label' => Mage::helper('adminhtml')->__('Visa')),
32
+ array('value' => 'ELEC', 'label' => Mage::helper('adminhtml')->__('Visa Electron')),
33
+ array('value' => 'DIN', 'label' => Mage::helper('adminhtml')->__('Diners Club')),
34
+ array('value' => 'AMEX', 'label' => Mage::helper('adminhtml')->__('American Express')),
35
+ array('value' => 'DK', 'label' => Mage::helper('adminhtml')->__('Dankort')),
36
+ array('value' => 'EDK', 'label' => Mage::helper('adminhtml')->__('eDankort')),
37
+ array('value' => 'SEB', 'label' => Mage::helper('adminhtml')->__('SEB Direktbetalning')),
38
+ array('value' => 'SHB', 'label' => Mage::helper('adminhtml')->__('SHB Direktbetalning')),
39
+ array('value' => 'FSB', 'label' => Mage::helper('adminhtml')->__('Swedbank Direktbetalning')),
40
+ array('value' => 'SOLO', 'label' => Mage::helper('adminhtml')->__('Nordea Solo-E betalning')),
41
+ array('value' => 'DNB', 'label' => Mage::helper('adminhtml')->__('Danske Netbetaling (Danske Bank)')),
42
+ array('value' => 'MOCA', 'label' => Mage::helper('adminhtml')->__('Mobilcash')),
43
+ array('value' => 'BAX', 'label' => Mage::helper('adminhtml')->__('BankAxess')),
44
+ array('value' => 'FFK', 'label' => Mage::helper('adminhtml')->__('Forbrugsforeningen Card')),
45
+ array('value' => 'JCB', 'label' => Mage::helper('adminhtml')->__('JCB (Japan Credit Bureau)')),
46
+ array('value' => 'AKTIA', 'label' => Mage::helper('adminhtml')->__('Aktia Web Payment')),
47
+ array('value' => 'ELV', 'label' => Mage::helper('adminhtml')->__('Bank Einzug (eOLV)')),
48
+ array('value' => 'EW', 'label' => Mage::helper('adminhtml')->__('eWire')),
49
+ array('value' => 'GIT', 'label' => Mage::helper('adminhtml')->__('Getitcard')),
50
+ array('value' => 'VAL', 'label' => Mage::helper('adminhtml')->__('Valus')),
51
+ array('value' => 'ING', 'label' => Mage::helper('adminhtml')->__('ING iDeal Payment'))
52
  );
53
  }
 
54
  }
app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Dibsyesno.php CHANGED
@@ -20,15 +20,12 @@
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
 
23
 
24
- class Dibspw_Dibspw_Model_System_Config_Source_Dibsyesno
25
- {
26
-
27
- public function toOptionArray()
28
- {
29
  return array(
30
- array('value'=>'yes', 'label'=>Mage::helper('adminhtml')->__('Yes')),
31
- array('value'=>'no', 'label'=>Mage::helper('adminhtml')->__('No')),
32
  );
33
  }
34
  }
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
23
+ class Dibspw_Dibspw_Model_System_Config_Source_Dibsyesno {
24
 
25
+ public function toOptionArray() {
 
 
 
 
26
  return array(
27
+ array('value' => 'yes', 'label' => Mage::helper('adminhtml')->__('Yes')),
28
+ array('value' => 'no', 'label' => Mage::helper('adminhtml')->__('No')),
29
  );
30
  }
31
  }
app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Lang.php CHANGED
@@ -20,17 +20,15 @@
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
 
23
 
24
- class Dibspw_Dibspw_Model_System_Config_Source_Lang
25
- {
26
- public function toOptionArray()
27
- {
28
  return array(
29
- array('value'=>'da_DK', 'label'=>Mage::helper('adminhtml')->__('Danish')),
30
- array('value'=>'en_UK', 'label'=>Mage::helper('adminhtml')->__('English')),
31
- array('value'=>'fi_FIN', 'label'=>Mage::helper('adminhtml')->__('Finnish')),
32
- array('value'=>'nb_NO', 'label'=>Mage::helper('adminhtml')->__('Norwegian')),
33
- array('value'=>'sv_SE', 'label'=>Mage::helper('adminhtml')->__('Swedish')),
34
  );
35
  }
36
  }
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
23
+ class Dibspw_Dibspw_Model_System_Config_Source_Lang {
24
 
25
+ public function toOptionArray() {
 
 
 
26
  return array(
27
+ array('value' => 'da_DK', 'label' => Mage::helper('adminhtml')->__('Danish')),
28
+ array('value' => 'en_UK', 'label' => Mage::helper('adminhtml')->__('English')),
29
+ array('value' => 'fi_FIN', 'label' => Mage::helper('adminhtml')->__('Finnish')),
30
+ array('value' => 'nb_NO', 'label' => Mage::helper('adminhtml')->__('Norwegian')),
31
+ array('value' => 'sv_SE', 'label' => Mage::helper('adminhtml')->__('Swedish')),
32
  );
33
  }
34
  }
app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Orderstatusafter.php CHANGED
@@ -20,7 +20,6 @@
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
23
-
24
  class Dibspw_Dibspw_Model_System_Config_Source_Orderstatusafter {
25
 
26
  public function toOptionArray() {
@@ -28,6 +27,7 @@ class Dibspw_Dibspw_Model_System_Config_Source_Orderstatusafter {
28
  $aOpts = array();
29
  $aOpts[] = array('value' => '', 'label' => Mage::helper('adminhtml')->__('-- Please Select --'));
30
  foreach($aStatuses as $sCode => $sLabel) $aOpts[] = array('value' => $sCode, 'label' => $sLabel);
 
31
  return $aOpts;
32
  }
33
- }
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
 
23
  class Dibspw_Dibspw_Model_System_Config_Source_Orderstatusafter {
24
 
25
  public function toOptionArray() {
27
  $aOpts = array();
28
  $aOpts[] = array('value' => '', 'label' => Mage::helper('adminhtml')->__('-- Please Select --'));
29
  foreach($aStatuses as $sCode => $sLabel) $aOpts[] = array('value' => $sCode, 'label' => $sLabel);
30
+
31
  return $aOpts;
32
  }
33
+ }
app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Orderstatusbefore.php CHANGED
@@ -20,14 +20,14 @@
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
23
-
24
  class Dibspw_Dibspw_Model_System_Config_Source_Orderstatusbefore {
25
-
26
  public function toOptionArray() {
27
  $aStatuses = Mage::getSingleton('sales/order_config')->getStates();
28
  $aOpts = array();
29
  $aOpts[] = array('value' => '', 'label' => Mage::helper('adminhtml')->__('-- Please Select --'));
30
- foreach($aStatuses as $sCode => $sLabel) $aOpts[] = array('value' => $sCode, 'label' => $sLabel);
 
31
  return $aOpts;
32
  }
33
- }
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
 
23
  class Dibspw_Dibspw_Model_System_Config_Source_Orderstatusbefore {
24
+
25
  public function toOptionArray() {
26
  $aStatuses = Mage::getSingleton('sales/order_config')->getStates();
27
  $aOpts = array();
28
  $aOpts[] = array('value' => '', 'label' => Mage::helper('adminhtml')->__('-- Please Select --'));
29
+ foreach($aStatuses as $sCode => $sLabel)$aOpts[] = array('value' => $sCode, 'label' => $sLabel);
30
+
31
  return $aOpts;
32
  }
33
+ }
app/code/community/Dibspw/Dibspw/Model/System/Config/Source/PBBdistribution.php CHANGED
@@ -20,15 +20,13 @@
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
 
23
 
24
- class Dibspw_Dibspw_Model_System_Config_Source_PBBdistribution
25
- {
26
- public function toOptionArray()
27
- {
28
  return array(
29
- array('value'=>'empty', 'label'=>Mage::helper('adminhtml')->__('-')),
30
- array('value'=>'paper', 'label'=>Mage::helper('adminhtml')->__('Paper')),
31
- array('value'=>'email', 'label'=>Mage::helper('adminhtml')->__('Email')),
32
  );
33
  }
34
  }
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
23
+ class Dibspw_Dibspw_Model_System_Config_Source_PBBdistribution {
24
 
25
+ public function toOptionArray() {
 
 
 
26
  return array(
27
+ array('value' => 'empty', 'label' => Mage::helper('adminhtml')->__('-')),
28
+ array('value' => 'paper', 'label' => Mage::helper('adminhtml')->__('Paper')),
29
+ array('value' => 'email', 'label' => Mage::helper('adminhtml')->__('Email')),
30
  );
31
  }
32
  }
app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Paymentwindow.php CHANGED
@@ -20,17 +20,13 @@
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
 
23
 
24
- class Dibspw_Dibspw_Model_System_Config_Source_Paymentwindow
25
- {
26
- public function toOptionArray()
27
- {
28
  return array(
29
- array('value'=>1, 'label'=>Mage::helper('adminhtml')->__('Auto')),
30
- array('value'=>2, 'label'=>Mage::helper('adminhtml')->__('DIBS Payment Window')),
31
- array('value'=>3, 'label'=>Mage::helper('adminhtml')->__('Mobile Payment Window'))
32
  );
33
  }
34
-
35
-
36
  }
20
  * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
  */
23
+ class Dibspw_Dibspw_Model_System_Config_Source_Paymentwindow {
24
 
25
+ public function toOptionArray() {
 
 
 
26
  return array(
27
+ array('value' => 1, 'label' => Mage::helper('adminhtml')->__('Auto')),
28
+ array('value' => 2, 'label' => Mage::helper('adminhtml')->__('DIBS Payment Window')),
29
+ array('value' => 3, 'label' => Mage::helper('adminhtml')->__('Mobile Payment Window'))
30
  );
31
  }
 
 
32
  }
app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_api.php CHANGED
@@ -5,7 +5,11 @@ require_once dirname(__FILE__) . '/dibs_pw_helpers.php';
5
 
6
  class dibs_pw_api extends dibs_pw_helpers {
7
 
8
- private static $sDibsTable = 'dibspw_results';
 
 
 
 
9
 
10
  private static $sDefaultCurr = array(0 => 'EUR', 1 => '978');
11
 
@@ -179,13 +183,12 @@ class dibs_pw_api extends dibs_pw_helpers {
179
  $sVal = trim($sVal);
180
  if(!empty($sVal)) $aData[$sKey] = self::api_dibs_utf8Fix($sVal);
181
  }
182
- if(isset($oOrder->ship->rate) && $oOrder->ship->rate > 0) {
183
- $aData['shippingFee'] = self::api_dibs_round($oOrder->ship->rate);
184
- $aData['shippingFeeVAT'] = self::api_dibs_round($oOrder->ship->tax);
185
- }
186
  if(isset($oOrder->items) && count($oOrder->items) > 0) {
187
- $aData['oitypes'] = 'QUANTITY;UNITCODE;DESCRIPTION;AMOUNT;ITEMID;VATPERCENT';
188
- $aData['oinames'] = 'Qty;UnitCode;Description;Amount;ItemId;VatPercent';
 
 
189
 
190
  $i = 1;
191
  foreach($oOrder->items as $oItem) {
@@ -207,10 +210,8 @@ class dibs_pw_api extends dibs_pw_helpers {
207
  }
208
  if(!empty($aData['orderid'])) $aData['yourRef'] = $aData['orderid'];
209
  if((string)$this->helper_dibs_tools_conf('capturenow') == 'yes') $aData['capturenow'] = 1;
210
- $sDistributionType = $this->helper_dibs_tools_conf('distr');
211
- if((string)$sDistributionType != 'empty') {
212
- $aData['distributiontype'] = strtoupper($sDistributionType);
213
- }
214
  }
215
 
216
  /**
@@ -238,14 +239,11 @@ class dibs_pw_api extends dibs_pw_helpers {
238
  $this->api_dibs_checkTable();
239
  $sQuery = "SELECT COUNT(`orderid`) AS order_exists
240
  FROM `" . $this->helper_dibs_tools_prefix() . self::api_dibs_get_tableName() . "`
241
- WHERE `orderid` = '" . $iOrderId . "'
242
- LIMIT 1;";
243
  if($this->helper_dibs_db_read_single($sQuery, 'order_exists') <= 0) {
244
- $this->helper_dibs_db_write(
245
- "INSERT INTO `" . $this->helper_dibs_tools_prefix() .
246
- self::api_dibs_get_tableName() . "`(`orderid`)
247
- VALUES('" . $iOrderId."')"
248
- );
249
  }
250
  }
251
 
@@ -294,36 +292,58 @@ class dibs_pw_api extends dibs_pw_helpers {
294
  * @return int
295
  */
296
  final public function api_dibs_checkMainFields($mOrder, $bUrlDecode = TRUE) {
297
- if(!isset($_POST['orderid'])) return 12;
298
  $mOrder = $this->helper_dibs_obj_order($mOrder, TRUE);
299
- if(!$mOrder->orderid) return 11;
300
 
301
- if(!isset($_POST['amount'])) return 22;
302
  $iAmount = (isset($_POST['voucherAmount']) && $_POST['voucherAmount'] > 0) ?
303
  $_POST['amountOriginal'] : $_POST['amount'];
304
- if(abs((int)$iAmount - (int)self::api_dibs_round($mOrder->amount)) >= 0.01) return 21;
305
- if(!isset($_POST['currency'])) return 32;
306
- if((int)$mOrder->currency != (int)$_POST['currency']) return 31;
307
 
308
  $sHMAC = $this->helper_dibs_tools_conf('hmac');
309
- if(!empty($sHMAC) && self::api_dibs_checkMAC($sHMAC, $bUrlDecode) !== TRUE) return 41;
310
 
311
  return 0;
312
  }
313
-
314
  /**
315
- * Returns text representation of array code.
 
316
  *
317
- * @param int $iErrCode
318
  * @return string
319
  */
320
- function api_dibs_errCodeToMessage($iErrCode) {
321
- return "<h3>" . $this->helper_dibs_tools_lang('txt_err_fatal') . "</h3>\n" .
322
- 'Error code: ' . $iErrCode . ". <br>\n Error message: " .
323
- $this->helper_dibs_tools_lang('txt_err_' . $iErrCode) . "\n<br><br>\n" .
324
- "<input type=\"button\" onclick=window.location.replace('" .
325
- $this->helper_dibs_tools_url($this->helper_dibs_obj_urls()->carturl) .
326
- "') value=\" " . $this->helper_dibs_tools_lang('txt_msg_toshop') . " \">";
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
327
  }
328
 
329
  /**
@@ -333,14 +353,12 @@ class dibs_pw_api extends dibs_pw_helpers {
333
  */
334
  final public function api_dibs_action_success($mOrder) {
335
  $iErr = $this->api_dibs_checkMainFields($mOrder);
336
- if(empty($iErr)) {
337
- $this->api_dibs_updateResultRow(array('success_action' => '1', 'success_error' => ''));
338
- }
339
- else {
340
- $this->api_dibs_updateResultRow(array('success_error' => 'Errno: ' . $iErr));
341
- echo $this->api_dibs_errCodeToMessage($iErr);
342
- exit();
343
  }
 
 
344
  }
345
 
346
  /**
@@ -348,7 +366,7 @@ class dibs_pw_api extends dibs_pw_helpers {
348
  */
349
  final public function api_dibs_action_cancel() {
350
  if(isset($_POST['orderid']) && !empty($_POST['orderid'])) {
351
- $this->api_dibs_updateResultRow(array('cancel_action' => '1'));
352
  }
353
  }
354
 
@@ -360,8 +378,8 @@ class dibs_pw_api extends dibs_pw_helpers {
360
  final public function api_dibs_action_callback($mOrder) {
361
  $iErr = $this->api_dibs_checkMainFields($mOrder, FALSE);
362
  if(!empty($iErr)) {
363
- if($iErr != 11 && $iErr != 12) {
364
- $this->api_dibs_updateResultRow(array('callback_error' => 'Errno: ' . $iErr));
365
  }
366
  exit((string)$iErr);
367
  }
@@ -390,11 +408,12 @@ class dibs_pw_api extends dibs_pw_helpers {
390
  unset($aResponse, $sDbKey, $sPostKey);
391
  $this->api_dibs_updateResultRow($aFields);
392
 
393
- if(method_exists($this, 'helper_dibs_hook_callback')) {
 
394
  $this->helper_dibs_hook_callback($mOrder);
395
  }
396
  }
397
- else $this->api_dibs_updateResultRow(array('callback_error' => 'Err: status not 0.'));
398
  exit();
399
  }
400
 
@@ -452,8 +471,7 @@ class dibs_pw_api extends dibs_pw_helpers {
452
  */
453
  final public static function api_dibs_checkMAC($sHMAC, $bUrlDecode = FALSE) {
454
  $_POST['MAC'] = isset($_POST['MAC']) ? $_POST['MAC'] : "";
455
- return ($_POST['MAC'] == self::api_dibs_calcMAC($_POST, $sHMAC, $bUrlDecode)) ?
456
- TRUE : FALSE;
457
  }
458
 
459
  /**
@@ -482,8 +500,8 @@ class dibs_pw_api extends dibs_pw_helpers {
482
  * @return string
483
  */
484
  final public static function api_dibs_get_currencyValue($sCode, $bFlip = FALSE) {
485
- $aCurrency = self::api_dibs_get_currencyArray();
486
- if($bFlip === TRUE) $aCurrency = array_flip($aCurrency);
487
  return isset($aCurrency[$sCode]) ? $aCurrency[$sCode] :
488
  $aCurrency[self::$sDefaultCurr[$bFlip === TRUE ? 1 : 0]];
489
  }
@@ -535,6 +553,15 @@ class dibs_pw_api extends dibs_pw_helpers {
535
  $sText : utf8_encode($sText);
536
  }
537
 
 
 
 
 
 
 
 
 
 
538
  /**
539
  * Detects mobile device by user-agent and received headers.
540
  *
5
 
6
  class dibs_pw_api extends dibs_pw_helpers {
7
 
8
+ private static $sDibsTable = 'dibs_pw_results';
9
+
10
+ private static $sErrorTmpl = 'dibs_pw_error.tmpl';
11
+
12
+ private static $sTmplMarker = '#';
13
 
14
  private static $sDefaultCurr = array(0 => 'EUR', 1 => '978');
15
 
183
  $sVal = trim($sVal);
184
  if(!empty($sVal)) $aData[$sKey] = self::api_dibs_utf8Fix($sVal);
185
  }
186
+ $oOrder->items[] = $oOrder->ship;
 
 
 
187
  if(isset($oOrder->items) && count($oOrder->items) > 0) {
188
+ $aData['oitypes'] = 'QUANTITY;UNITCODE;DESCRIPTION;AMOUNT;ITEMID;' .
189
+ (self::$bTaxAmount ? 'VATAMOUNT' : 'VATPERCENT');
190
+ $aData['oinames'] = 'Qty;UnitCode;Description;Amount;ItemId;' .
191
+ (self::$bTaxAmount ? 'VatAmount' : 'VatPercent');
192
 
193
  $i = 1;
194
  foreach($oOrder->items as $oItem) {
210
  }
211
  if(!empty($aData['orderid'])) $aData['yourRef'] = $aData['orderid'];
212
  if((string)$this->helper_dibs_tools_conf('capturenow') == 'yes') $aData['capturenow'] = 1;
213
+ $sDistribType = $this->helper_dibs_tools_conf('distr');
214
+ if((string)$sDistribType != 'empty') $aData['distributiontype'] = strtoupper($sDistribType);
 
 
215
  }
216
 
217
  /**
239
  $this->api_dibs_checkTable();
240
  $sQuery = "SELECT COUNT(`orderid`) AS order_exists
241
  FROM `" . $this->helper_dibs_tools_prefix() . self::api_dibs_get_tableName() . "`
242
+ WHERE `orderid` = '" . self::api_dibs_sqlEncode($iOrderId) . "' LIMIT 1;";
 
243
  if($this->helper_dibs_db_read_single($sQuery, 'order_exists') <= 0) {
244
+ $this->helper_dibs_db_write("INSERT INTO `" . $this->helper_dibs_tools_prefix() .
245
+ self::api_dibs_get_tableName() . "`(`orderid`)
246
+ VALUES('" . $iOrderId."')");
 
 
247
  }
248
  }
249
 
292
  * @return int
293
  */
294
  final public function api_dibs_checkMainFields($mOrder, $bUrlDecode = TRUE) {
295
+ if(!isset($_POST['orderid'])) return 1;
296
  $mOrder = $this->helper_dibs_obj_order($mOrder, TRUE);
297
+ if(!$mOrder->orderid) return 2;
298
 
299
+ if(!isset($_POST['amount'])) return 3;
300
  $iAmount = (isset($_POST['voucherAmount']) && $_POST['voucherAmount'] > 0) ?
301
  $_POST['amountOriginal'] : $_POST['amount'];
302
+ if(abs((int)$iAmount - (int)self::api_dibs_round($mOrder->amount)) >= 0.01) return 4;
303
+ if(!isset($_POST['currency'])) return 5;
304
+ if((int)$mOrder->currency != (int)$_POST['currency']) return 6;
305
 
306
  $sHMAC = $this->helper_dibs_tools_conf('hmac');
307
+ if(!empty($sHMAC) && self::api_dibs_checkMAC($sHMAC, $bUrlDecode) !== TRUE) return 7;
308
 
309
  return 0;
310
  }
311
+
312
  /**
313
+ * Give fallback verification error page
314
+ * if module has no ability to use CMS for error displaying.
315
  *
316
+ * @param int $iCode
317
  * @return string
318
  */
319
+ public function api_dibs_getFatalErrorPage($iCode) {
320
+ return self::api_dibs_renderTemplate(self::$sErrorTmpl,
321
+ array('errname' => $this->helper_dibs_tools_lang('0', "err"),
322
+ 'msg_errcode' => $this->helper_dibs_tools_lang('errcode'),
323
+ 'errcode' => $iCode,
324
+ 'msg_errmsg' => $this->helper_dibs_tools_lang('errmsg'),
325
+ 'err_errmsg' => $this->helper_dibs_tools_lang($iCode, "err"),
326
+ 'link_toshop' => $this->helper_dibs_obj_urls()->carturl,
327
+ 'msg_toshop' => $this->helper_dibs_tools_lang('toshop')));
328
+ }
329
+
330
+ /**
331
+ * Simple template loader and renderer. Used to load fallback error template.
332
+ *
333
+ * @param string $sTmplName
334
+ * @param array $sParams
335
+ * @return string
336
+ */
337
+ private static function api_dibs_renderTemplate($sTmplName, $sParams = array()) {
338
+ $sTmpl = file_get_contents(dirname(__FILE__) . self::api_dibs_getDS() . $sTmplName);
339
+ if($sTmpl !== FALSE) {
340
+ foreach($sParams as $sKey => $sVal) {
341
+ $sTmpl = str_replace(self::$sTmplMarker . $sKey . self::$sTmplMarker, $sVal, $sTmpl);
342
+ }
343
+ }
344
+ else $sTmpl = "";
345
+
346
+ return $sTmpl;
347
  }
348
 
349
  /**
353
  */
354
  final public function api_dibs_action_success($mOrder) {
355
  $iErr = $this->api_dibs_checkMainFields($mOrder);
356
+ if($iErr != 1 && $iErr != 2) {
357
+ $this->api_dibs_updateResultRow(array('success_action' => empty($iErr) ? 1 : 0,
358
+ 'success_error' => $iErr));
 
 
 
 
359
  }
360
+
361
+ return $iErr;
362
  }
363
 
364
  /**
366
  */
367
  final public function api_dibs_action_cancel() {
368
  if(isset($_POST['orderid']) && !empty($_POST['orderid'])) {
369
+ $this->api_dibs_updateResultRow(array('cancel_action' => 1));
370
  }
371
  }
372
 
378
  final public function api_dibs_action_callback($mOrder) {
379
  $iErr = $this->api_dibs_checkMainFields($mOrder, FALSE);
380
  if(!empty($iErr)) {
381
+ if($iErr != 1 && $iErr != 2) {
382
+ $this->api_dibs_updateResultRow(array('callback_error' => $iErr));
383
  }
384
  exit((string)$iErr);
385
  }
408
  unset($aResponse, $sDbKey, $sPostKey);
409
  $this->api_dibs_updateResultRow($aFields);
410
 
411
+ if(method_exists($this, 'helper_dibs_hook_callback') &&
412
+ is_callable(array($this, 'helper_dibs_hook_callback'))) {
413
  $this->helper_dibs_hook_callback($mOrder);
414
  }
415
  }
416
+ else $this->api_dibs_updateResultRow(array('callback_error' => 8));
417
  exit();
418
  }
419
 
471
  */
472
  final public static function api_dibs_checkMAC($sHMAC, $bUrlDecode = FALSE) {
473
  $_POST['MAC'] = isset($_POST['MAC']) ? $_POST['MAC'] : "";
474
+ return ($_POST['MAC'] == self::api_dibs_calcMAC($_POST, $sHMAC, $bUrlDecode)) ? TRUE : FALSE;
 
475
  }
476
 
477
  /**
500
  * @return string
501
  */
502
  final public static function api_dibs_get_currencyValue($sCode, $bFlip = FALSE) {
503
+ $aCurrency = ($bFlip === TRUE) ? array_flip(self::api_dibs_get_currencyArray()) :
504
+ self::api_dibs_get_currencyArray();
505
  return isset($aCurrency[$sCode]) ? $aCurrency[$sCode] :
506
  $aCurrency[self::$sDefaultCurr[$bFlip === TRUE ? 1 : 0]];
507
  }
553
  $sText : utf8_encode($sText);
554
  }
555
 
556
+ /**
557
+ * Returns DIRECTORY_SEPARATOR value if it exists in PHP scope and UNIX separator otherwise.
558
+ *
559
+ * @return string
560
+ */
561
+ final public static function api_dibs_getDS() {
562
+ return defined("DIRECTORY_SEPARATOR") ? DIRECTORY_SEPARATOR : "/";
563
+ }
564
+
565
  /**
566
  * Detects mobile device by user-agent and received headers.
567
  *
app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_error.tmpl ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <!doctype html>
2
+ <html>
3
+ <head>
4
+ <title>#errname#</title>
5
+ </head>
6
+ <body>
7
+ <h3>#errname#</h3>
8
+ <p>
9
+ #msg_errcode#&nbsp;#errcode#
10
+ <br />
11
+ #msg_errmsg#&nbsp;#err_errmsg#
12
+ </p>
13
+ <button type="submit" formaction="#link_toshop#">#msg_toshop#</button>
14
+ </body>
15
+ </html>
app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_helpers.php CHANGED
@@ -1,6 +1,9 @@
1
  <?php
2
  class dibs_pw_helpers extends dibs_pw_helpers_cms implements dibs_pw_helpers_interface {
3
 
 
 
 
4
  /**
5
  * Process write SQL query (insert, update, delete) with build-in CMS ADO engine.
6
  *
@@ -51,8 +54,8 @@ class dibs_pw_helpers extends dibs_pw_helpers_cms implements dibs_pw_helpers_int
51
  * @param type $sKey
52
  * @return type
53
  */
54
- function helper_dibs_tools_lang($sKey) {
55
- return Mage::helper('dibspw')->__('dibspw_' . $sKey);
56
  }
57
 
58
  /**
@@ -101,7 +104,7 @@ class dibs_pw_helpers extends dibs_pw_helpers_cms implements dibs_pw_helpers_int
101
  'sku' => $oItem->getSku(),
102
  'price' => $oItem->getPrice(),
103
  'qty' => $oItem->getQtyOrdered(),
104
- 'tax' => $oItem->getTaxPercent()
105
  );
106
  }
107
  return $aItems;
@@ -115,9 +118,14 @@ class dibs_pw_helpers extends dibs_pw_helpers_cms implements dibs_pw_helpers_int
115
  */
116
  function helper_dibs_obj_ship($mOrderInfo) {
117
  return (object)array(
118
- 'rate' => isset($mOrderInfo['shipping_amount']) ?
119
- $mOrderInfo['shipping_amount'] : (int)0,
120
- 'tax' => $this->cms_get_shippingTaxPercent($mOrderInfo)
 
 
 
 
 
121
  );
122
  }
123
 
@@ -177,7 +185,7 @@ class dibs_pw_helpers extends dibs_pw_helpers_cms implements dibs_pw_helpers_int
177
  */
178
  function helper_dibs_obj_etc($mOrderInfo) {
179
  return (object)array(
180
- 'sysmod' => 'mgn1_4_1_1',
181
  'callbackfix' => $this->helper_dibs_tools_url("Dibspw/Dibspw/callback")
182
  );
183
  }
1
  <?php
2
  class dibs_pw_helpers extends dibs_pw_helpers_cms implements dibs_pw_helpers_interface {
3
 
4
+ public static $bTaxAmount = true;
5
+
6
+
7
  /**
8
  * Process write SQL query (insert, update, delete) with build-in CMS ADO engine.
9
  *
54
  * @param type $sKey
55
  * @return type
56
  */
57
+ function helper_dibs_tools_lang($sKey, $sType = 'msg') {
58
+ return Mage::helper('dibspw')->__("dibspw_txt_" . $sType . "_" . $sKey);
59
  }
60
 
61
  /**
104
  'sku' => $oItem->getSku(),
105
  'price' => $oItem->getPrice(),
106
  'qty' => $oItem->getQtyOrdered(),
107
+ 'tax' => $oItem->getTaxAmount() / $oItem->getQtyOrdered()
108
  );
109
  }
110
  return $aItems;
118
  */
119
  function helper_dibs_obj_ship($mOrderInfo) {
120
  return (object)array(
121
+ 'id' => 'shipping0',
122
+ 'name' => 'Shipping Cost',
123
+ 'sku' => '',
124
+ 'price' => isset($mOrderInfo['shipping_amount']) ?
125
+ $mOrderInfo['shipping_amount'] : (int)0,
126
+ 'qty' => 1,
127
+ 'tax' => isset($mOrderInfo['shipping_tax_amount']) ?
128
+ $mOrderInfo['shipping_tax_amount'] : (int)0
129
  );
130
  }
131
 
185
  */
186
  function helper_dibs_obj_etc($mOrderInfo) {
187
  return (object)array(
188
+ 'sysmod' => 'mgn1_4_1_2',
189
  'callbackfix' => $this->helper_dibs_tools_url("Dibspw/Dibspw/callback")
190
  );
191
  }
app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_helpers_cms.php CHANGED
@@ -1,118 +1,113 @@
1
  <?php
2
  class dibs_pw_helpers_cms extends Mage_Payment_Model_Method_Abstract {
3
  protected $_code = 'Dibspw';
 
 
 
 
4
 
5
- public function cms_dibs_getOrderInfo($oOrder) {
6
- $res = "";
 
7
  $this->api_dibs_checkTable();
8
- $read = Mage::getSingleton('core/resource')->getConnection('core_read');
9
- $row = $read->fetchRow("SELECT * FROM " . Mage::getConfig()->getTablePrefix() .
10
- dibs_pw_api::api_dibs_get_tableName() .
11
- " WHERE orderid = " . $oOrder->getIncrementId());
12
-
13
- if (count($row) > 0) {
14
- if ($row['status'] == 'ACCEPTED') {
15
- $res .= "<table border='0' width='100%'>";
16
-
17
- if ($row['transaction'] != '0') {
18
- $res .= "<tr><td>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_8') . "</td>" .
19
- "<td>" . $row['transaction'] . "</td></tr>";
20
- }
21
-
22
- if ($row['paytype'] != '0') {
23
- $res .= "<tr><td>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_12') . "</td>" .
24
- "<td>" . $this->cms_dibs_printLogo($row['paytype']) . "</td></tr>";
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
25
  }
26
-
27
- if ($row['fee'] != '0') {
28
- $res .= "<tr><td>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_11') . "</td>" .
29
- "<td>" . $oOrder->getOrderCurrencyCode() . "&nbsp;" .
30
- number_format(((int)$row['fee']) / 100, 2, ',', ' ') . "</td></tr>";
31
- }
32
-
33
- $res .= "</table><br />";
34
  }
35
- else $res .= "<br />" . Mage::helper('dibspw')->__('DIBSPW_LABEL_19') . "<br />";
36
  }
37
 
38
- return $res;
39
- }
40
 
41
- public function cms_dibs_getAdminOrderInfo($oOrder) {
42
- $res = "";
43
  $this->api_dibs_checkTable();
44
- $read = Mage::getSingleton('core/resource')->getConnection('core_read');
45
- $row = $read->fetchRow("SELECT `status`, `transaction`, `amount`, `currency`, `fee`,
46
- `paytype`, `ext_info` FROM " . Mage::getConfig()->getTablePrefix() .
47
- dibs_pw_api::api_dibs_get_tableName() . "
48
- WHERE orderid = " . $oOrder->getIncrementId());
 
 
 
 
49
 
50
- if(count($row) > 0) {
51
- if($row['status'] == 'ACCEPTED') {
52
- $row['ext'] = (isset($row['ext_info']) && $row['ext_info'] != NULL) ?
53
- unserialize($row['ext_info']) : array();
54
-
55
- $res .= "<br /><br />" . "<table border='0' width='100%'><tr><td colspan='2'><b>" .
56
- Mage::helper('dibspw')->__('DIBSPW_LABEL_7') . "</b></td></tr>";
 
57
 
58
- if($row['transaction'] != '0') {
59
- $res .= "<tr><td>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_8') . "</td>" .
60
- "<td>" . $row['transaction'] . "</td></tr>";
61
- }
62
-
63
- if($row['amount'] != '0') {
64
- $res .= "<tr><td>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_9') . "</td>" .
65
- "<td>" . $oOrder->getOrderCurrencyCode() . "&nbsp;" .
66
- number_format(((int) $row['amount']) / 100, 2, ',', ' ') . "</td></tr>";
67
- }
68
 
69
- if($row['currency'] != '0') {
70
- $res .= "<tr><td>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_10') . "</td>" .
71
- "<td>" . $row['currency'] . "</td></tr>";
72
- }
73
 
74
- if($row['fee'] != '0') {
75
- $res .= "<tr><td>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_11') . "</td>" .
76
- "<td>" . $oOrder->getOrderCurrencyCode() . "&nbsp;" .
77
- number_format(((int) $row['fee']) / 100, 2, ',', ' ') . "</td></tr>";
78
- }
79
 
80
- if($row['paytype'] != '0') {
81
- $res .= "<tr><td>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_12') . "</td>" .
82
- "<td>" . $this->cms_dibs_printLogo($row['paytype']) . "</td></tr>";
83
- }
 
 
 
84
 
85
- if($row['ext']['acquirer'] != '0') {
86
- $res .= "<tr><td>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_16') . "</td>";
87
- "<td>" . $row['ext']['acquirer'] . "</td></tr>";
88
- }
89
 
90
- if($row['ext']['enrolled'] != '0') {
91
- $res .= "<tr><td>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_17') . "</td>";
92
- "<td>" . $row['ext']['enrolled'] . "</td></tr>";
 
93
  }
94
-
95
- $res .= "</table><br /><a href='https://payment.architrade.com/admin/' target='_blank'>" .
96
- Mage::helper('dibspw')->__('DIBSPW_LABEL_18') . "</a><br /><br />";
97
  }
98
- else $res .= "<br>" . Mage::helper('dibspw')->__('DIBSPW_LABEL_19') . "<br>";
99
  }
100
-
101
  return $res;
102
  }
103
 
104
- private function cms_dibs_getPaymentPart($sPaymentstr) {
105
- $aPaymentPartStr = explode(',', $sPaymentstr, 2);
106
- return $aPaymentPartStr[0];
107
- }
108
-
109
- public function cms_dibs_printLogo($paytype) {
110
- $sImgHtml = "";
111
- $sLogo = $this->cms_dibs_getPaymentPart($paytype);
112
- if(preg_match("/[a-z\(\)_]+/is", $sLogo)) $sImgHtml = $this->cms_get_imgHtml($sLogo);
113
- return !empty($sImgHtml) ? $sImgHtml : $this->cms_get_imgHtml("dibs");
114
- }
115
-
116
  public function cms_get_imgHtml($sLogo) {
117
  $sImgUrl = Mage::getDesign()->getSkinUrl('images/Dibspw/Dibspw/' .
118
  preg_replace("/(\(|\)|_)/s", "",
@@ -121,14 +116,6 @@ class dibs_pw_helpers_cms extends Mage_Payment_Model_Method_Abstract {
121
  '<img src="' . $sImgUrl . '" alt="' . htmlentities($sLogo) . '" />' : "";
122
  }
123
 
124
- function cms_get_shippingTaxPercent($oOrder) {
125
- if($oOrder['shipping_tax_amount'] == 0 || $oOrder['shipping_amount'] == 0) return 0;
126
- else {
127
- return ($oOrder['shipping_tax_amount'] * 100) / $oOrder['shipping_amount'];
128
- }
129
- }
130
-
131
-
132
  public function setOrderStatusAfterPayment(){
133
  $order = Mage::getModel('sales/order');
134
  $order->loadByIncrementId($_REQUEST['orderid']);
1
  <?php
2
  class dibs_pw_helpers_cms extends Mage_Payment_Model_Method_Abstract {
3
  protected $_code = 'Dibspw';
4
+ protected $_formBlockType = 'Dibspw_Dibspw_block_form';
5
+ protected $_infoBlockType = 'Dibspw_Dibspw_block_info';
6
+ protected $_canUseInternal = false;
7
+ protected $_canUseForMultishipping = false;
8
 
9
+ public function cms_dibs_getOrderInfo() {
10
+ $aPayInfo = array();
11
+ $bMailing = false;
12
  $this->api_dibs_checkTable();
13
+ $oOrder = Mage::registry('current_order');
14
+ if($oOrder === NULL) {
15
+ $oOrder = Mage::getModel('sales/order')->loadByIncrementId($_POST['orderid']);
16
+ $bMailing = true;
17
+ }
18
+ if($oOrder !== NULL && is_callable(array($oOrder, 'getIncrementId'))) {
19
+ $iOid = $oOrder->getIncrementId();
20
+ if(!empty($iOid)) {
21
+ $oRead = Mage::getSingleton('core/resource')->getConnection('core_read');
22
+ $aRow = $oRead->fetchRow("SELECT `status`, `transaction`, `paytype`, `fee` FROM `" .
23
+ Mage::getConfig()->getTablePrefix() .
24
+ dibs_pw_api::api_dibs_get_tableName() .
25
+ "` WHERE `orderid` = " . $iOid . " LIMIT 1;");
26
+ if(count($aRow) > 0) {
27
+ if($aRow['status'] == 'ACCEPTED') {
28
+ if($aRow['transaction'] != '0') {
29
+ $aPayInfo[Mage::helper('dibspw')->__('DIBSPW_LABEL_8')] = $aRow['transaction'];
30
+ }
31
+
32
+ if($bMailing === FALSE) {
33
+ if(!empty($aRow['paytype'])) {
34
+ $aPayInfo[Mage::helper('dibspw')->__('DIBSPW_LABEL_12')] = $aRow['paytype'];
35
+ }
36
+
37
+ if(!empty($aRow['fee'])) {
38
+ $aPayInfo[Mage::helper('dibspw')->__('DIBSPW_LABEL_11')] =
39
+ $oOrder->getOrderCurrencyCode() . "&nbsp;" .
40
+ number_format(((int) $aRow['fee']) / 100, 2, ',', ' ');
41
+ }
42
+ }
43
+ }
44
+ else $aPayInfo[Mage::helper('dibspw')->__('DIBSPW_LABEL_25')] = Mage::helper('dibspw')->__('DIBSPW_LABEL_19');
45
  }
 
 
 
 
 
 
 
 
46
  }
 
47
  }
48
 
49
+ return $aPayInfo;
50
+ }
51
 
52
+ public function cms_dibs_getAdminOrderInfo() {
53
+ $res = array();
54
  $this->api_dibs_checkTable();
55
+ $oOrder = Mage::registry('current_order');
56
+ if($oOrder !== NULL && is_callable(array($oOrder, 'getIncrementId'))) {
57
+ $iOid = $oOrder->getIncrementId();
58
+ if(!empty($iOid)) {
59
+ $read = Mage::getSingleton('core/resource')->getConnection('core_read');
60
+ $row = $read->fetchRow("SELECT `status`, `transaction`, `amount`, `currency`, `fee`,
61
+ `paytype`, `ext_info` FROM " . Mage::getConfig()->getTablePrefix() .
62
+ dibs_pw_api::api_dibs_get_tableName() . "
63
+ WHERE orderid = " . $iOid . " LIMIT 1;");
64
 
65
+ if(count($row) > 0) {
66
+ if($row['status'] == 'ACCEPTED') {
67
+ $row['ext'] = (isset($row['ext_info']) && $row['ext_info'] != NULL) ?
68
+ unserialize($row['ext_info']) : array();
69
+
70
+ if(!empty($row['transaction'])) {
71
+ $res[Mage::helper('dibspw')->__('DIBSPW_LABEL_8')] = $row['transaction'];
72
+ }
73
 
74
+ if(!empty($row['amount'])) {
75
+ $res[Mage::helper('dibspw')->__('DIBSPW_LABEL_9')] = $oOrder->getOrderCurrencyCode() .
76
+ "&nbsp;" . number_format(((int) $row['amount']) / 100, 2, ',', ' ');
77
+ }
 
 
 
 
 
 
78
 
79
+ if(!empty($row['currency'])) {
80
+ $res[Mage::helper('dibspw')->__('DIBSPW_LABEL_10')] = $row['currency'];
81
+ }
 
82
 
83
+ if(!empty($row['fee'])) {
84
+ $res[Mage::helper('dibspw')->__('DIBSPW_LABEL_11')] = $oOrder->getOrderCurrencyCode() .
85
+ "&nbsp;" . number_format(((int) $row['fee']) / 100, 2, ',', ' ');
86
+ }
 
87
 
88
+ if(!empty($row['paytype'])) {
89
+ $res[Mage::helper('dibspw')->__('DIBSPW_LABEL_12')] = $row['paytype'];
90
+ }
91
+
92
+ if($row['ext']['acquirer'] != '0') {
93
+ $res[Mage::helper('dibspw')->__('DIBSPW_LABEL_16')] = $row['ext']['acquirer'];
94
+ }
95
 
96
+ if($row['ext']['enrolled'] != '0') {
97
+ $res[Mage::helper('dibspw')->__('DIBSPW_LABEL_17')] = $row['ext']['enrolled'];
98
+ }
 
99
 
100
+ $res[Mage::helper('dibspw')->__('DIBSPW_LABEL_25')] = Mage::helper('dibspw')->__('DIBSPW_LABEL_18') .
101
+ ': <a href="https://payment.architrade.com/admin/">https://payment.architrade.com/admin/</a>';
102
+ }
103
+ else $res[Mage::helper('dibspw')->__('DIBSPW_LABEL_25')] = Mage::helper('dibspw')->__('DIBSPW_LABEL_19');
104
  }
 
 
 
105
  }
 
106
  }
107
+
108
  return $res;
109
  }
110
 
 
 
 
 
 
 
 
 
 
 
 
 
111
  public function cms_get_imgHtml($sLogo) {
112
  $sImgUrl = Mage::getDesign()->getSkinUrl('images/Dibspw/Dibspw/' .
113
  preg_replace("/(\(|\)|_)/s", "",
116
  '<img src="' . $sImgUrl . '" alt="' . htmlentities($sLogo) . '" />' : "";
117
  }
118
 
 
 
 
 
 
 
 
 
119
  public function setOrderStatusAfterPayment(){
120
  $order = Mage::getModel('sales/order');
121
  $order->loadByIncrementId($_REQUEST['orderid']);
app/code/community/Dibspw/Dibspw/controllers/DibspwController.php CHANGED
@@ -67,12 +67,17 @@ class Dibspw_Dibspw_DibspwController extends Mage_Core_Controller_Front_Action {
67
  $session = Mage::getSingleton('checkout/session');
68
  $session->setQuoteId($session->getDibspwStandardQuoteId(true));
69
  $oOrder = Mage::getModel('sales/order');
70
- $fields = array();
71
 
72
- $this->oDibsModel->api_dibs_action_success($oOrder);
73
- Mage::app()->getFrontController()->getResponse()->setRedirect(
74
- $this->oDibsModel->helper_dibs_tools_url('checkout/onepage/success')
75
- );
 
 
 
 
 
 
76
  }
77
 
78
  public function callbackAction() {
67
  $session = Mage::getSingleton('checkout/session');
68
  $session->setQuoteId($session->getDibspwStandardQuoteId(true));
69
  $oOrder = Mage::getModel('sales/order');
 
70
 
71
+ $iResult = $this->oDibsModel->api_dibs_action_success($oOrder);
72
+ if(!empty($iResult)) {
73
+ echo $this->oDibsModel->api_dibs_getFatalErrorPage($iResult);
74
+ exit();
75
+ }
76
+ else {
77
+ Mage::app()->getFrontController()->getResponse()->setRedirect(
78
+ $this->oDibsModel->helper_dibs_tools_url('checkout/onepage/success')
79
+ );
80
+ }
81
  }
82
 
83
  public function callbackAction() {
app/code/community/Dibspw/Dibspw/etc/config.xml CHANGED
@@ -24,7 +24,7 @@
24
  <config>
25
  <modules>
26
  <Dibspw_Dibspw>
27
- <version>4.1.1</version>
28
  <depends>
29
  <Mage_Paygate />
30
  </depends>
@@ -132,6 +132,7 @@
132
  <handlestock>1</handlestock>
133
  <DIBSPW_distr>empty</DIBSPW_distr>
134
  <sort_order>0</sort_order>
 
135
  </Dibspw>
136
  </payment>
137
  </default>
24
  <config>
25
  <modules>
26
  <Dibspw_Dibspw>
27
+ <version>4.1.2</version>
28
  <depends>
29
  <Mage_Paygate />
30
  </depends>
132
  <handlestock>1</handlestock>
133
  <DIBSPW_distr>empty</DIBSPW_distr>
134
  <sort_order>0</sort_order>
135
+ <allowspecific>0</allowspecific>
136
  </Dibspw>
137
  </payment>
138
  </default>
app/code/community/Dibspw/Dibspw/etc/system.xml CHANGED
@@ -32,6 +32,11 @@
32
  <show_in_default>1</show_in_default>
33
  <show_in_website>1</show_in_website>
34
  <show_in_store>1</show_in_store>
 
 
 
 
 
35
  <fields>
36
  <active translate="label">
37
  <label>Enabled</label>
@@ -155,7 +160,7 @@
155
  <show_in_store>1</show_in_store>
156
  </DIBSPW_distr>
157
  <order_status translate="label">
158
- <label>Order status (Before the payment is made)</label>
159
  <frontend_type>select</frontend_type>
160
  <source_model>dibspw/System_Config_Source_Orderstatusbefore</source_model>
161
  <sort_order>15</sort_order>
@@ -164,7 +169,7 @@
164
  <show_in_store>1</show_in_store>
165
  </order_status>
166
  <order_status_after_payment translate="label">
167
- <label>New order status (When the payment is made)</label>
168
  <frontend_type>select</frontend_type>
169
  <source_model>dibspw/System_Config_Source_Orderstatusafter</source_model>
170
  <sort_order>16</sort_order>
@@ -172,11 +177,29 @@
172
  <show_in_website>1</show_in_website>
173
  <show_in_store>1</show_in_store>
174
  </order_status_after_payment>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
175
  <sendmailorderconfirmation translate="label">
176
  <label>Send Email Order Confirmation. Enabling this setting will result in an email confirmation is send to the cardholder as the payment is made.</label>
177
  <frontend_type>select</frontend_type>
178
  <source_model>adminhtml/system_config_source_yesno</source_model>
179
- <sort_order>17</sort_order>
180
  <show_in_default>1</show_in_default>
181
  <show_in_website>1</show_in_website>
182
  <show_in_store>1</show_in_store>
@@ -185,7 +208,7 @@
185
  <label>Which logos to show</label>
186
  <frontend_type>multiselect</frontend_type>
187
  <source_model>dibspw/system_config_source_dibslogos</source_model>
188
- <sort_order>18</sort_order>
189
  <show_in_default>1</show_in_default>
190
  <show_in_website>1</show_in_website>
191
  <show_in_store>1</show_in_store>
@@ -194,7 +217,7 @@
194
  <label>Handle stock. The quantity purchased in stock will at first be decremented as the payment is made.</label>
195
  <frontend_type>select</frontend_type>
196
  <source_model>adminhtml/system_config_source_yesno</source_model>
197
- <sort_order>19</sort_order>
198
  <show_in_default>1</show_in_default>
199
  <show_in_website>1</show_in_website>
200
  <show_in_store>1</show_in_store>
@@ -202,7 +225,7 @@
202
  <sort_order translate="label">
203
  <label>Sort Order</label>
204
  <frontend_type>text</frontend_type>
205
- <sort_order>20</sort_order>
206
  <show_in_default>1</show_in_default>
207
  <show_in_website>1</show_in_website>
208
  <show_in_store>1</show_in_store>
32
  <show_in_default>1</show_in_default>
33
  <show_in_website>1</show_in_website>
34
  <show_in_store>1</show_in_store>
35
+ <comment>
36
+ <![CDATA[Detailed description of configuration parameters can be found on
37
+ <a href="http://tech.dibs.dk/" target="_blank">
38
+ our Tech site</a>.]]>
39
+ </comment>
40
  <fields>
41
  <active translate="label">
42
  <label>Enabled</label>
160
  <show_in_store>1</show_in_store>
161
  </DIBSPW_distr>
162
  <order_status translate="label">
163
+ <label>New order status (Before the payment is made)</label>
164
  <frontend_type>select</frontend_type>
165
  <source_model>dibspw/System_Config_Source_Orderstatusbefore</source_model>
166
  <sort_order>15</sort_order>
169
  <show_in_store>1</show_in_store>
170
  </order_status>
171
  <order_status_after_payment translate="label">
172
+ <label>Paid order status (When the payment is made)</label>
173
  <frontend_type>select</frontend_type>
174
  <source_model>dibspw/System_Config_Source_Orderstatusafter</source_model>
175
  <sort_order>16</sort_order>
177
  <show_in_website>1</show_in_website>
178
  <show_in_store>1</show_in_store>
179
  </order_status_after_payment>
180
+ <allowspecific translate="label">
181
+ <label>Payment from Applicable Countries</label>
182
+ <frontend_type>allowspecific</frontend_type>
183
+ <source_model>adminhtml/system_config_source_payment_allspecificcountries</source_model>
184
+ <sort_order>17</sort_order>
185
+ <show_in_default>1</show_in_default>
186
+ <show_in_website>1</show_in_website>
187
+ <show_in_store>1</show_in_store>
188
+ </allowspecific>
189
+ <specificcountry translate="label">
190
+ <label>Payment from Specific Countries</label>
191
+ <frontend_type>multiselect</frontend_type>
192
+ <source_model>adminhtml/system_config_source_country</source_model>
193
+ <sort_order>18</sort_order>
194
+ <show_in_default>1</show_in_default>
195
+ <show_in_website>1</show_in_website>
196
+ <show_in_store>1</show_in_store>
197
+ </specificcountry>
198
  <sendmailorderconfirmation translate="label">
199
  <label>Send Email Order Confirmation. Enabling this setting will result in an email confirmation is send to the cardholder as the payment is made.</label>
200
  <frontend_type>select</frontend_type>
201
  <source_model>adminhtml/system_config_source_yesno</source_model>
202
+ <sort_order>19</sort_order>
203
  <show_in_default>1</show_in_default>
204
  <show_in_website>1</show_in_website>
205
  <show_in_store>1</show_in_store>
208
  <label>Which logos to show</label>
209
  <frontend_type>multiselect</frontend_type>
210
  <source_model>dibspw/system_config_source_dibslogos</source_model>
211
+ <sort_order>20</sort_order>
212
  <show_in_default>1</show_in_default>
213
  <show_in_website>1</show_in_website>
214
  <show_in_store>1</show_in_store>
217
  <label>Handle stock. The quantity purchased in stock will at first be decremented as the payment is made.</label>
218
  <frontend_type>select</frontend_type>
219
  <source_model>adminhtml/system_config_source_yesno</source_model>
220
+ <sort_order>21</sort_order>
221
  <show_in_default>1</show_in_default>
222
  <show_in_website>1</show_in_website>
223
  <show_in_store>1</show_in_store>
225
  <sort_order translate="label">
226
  <label>Sort Order</label>
227
  <frontend_type>text</frontend_type>
228
+ <sort_order>22</sort_order>
229
  <show_in_default>1</show_in_default>
230
  <show_in_website>1</show_in_website>
231
  <show_in_store>1</show_in_store>
app/code/community/Dibspw/Dibspw/sql/dibspw_setup/{mysql4-install-4.1.1.php → mysql4-install-4.1.2.php} RENAMED
File without changes
app/code/community/Dibspw/Dibspw/sql/dibspw_setup/{mysql4-upgrade-4.1.0-4.1.1.php → mysql4-upgrade-4.1.1-4.1.2.php} RENAMED
File without changes
app/code/community/Dibspw/Sales/Block/Order/Info.php DELETED
@@ -1,49 +0,0 @@
1
- <?php
2
- /**
3
- * Magento
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
- * DISCLAIMER
16
- *
17
- * Do not edit or add to this file if you wish to upgrade Magento to newer
18
- * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
- *
21
- * @category Mage
22
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
23
- * Modifications copyrighted by Dibs A/S, (c) 2010.
24
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
- */
26
-
27
- /**
28
- * Invoice view comments form
29
- *
30
- * @category Mage
31
- * @package Mage_Sale
32
- * @author Magento Core Team <core@magentocommerce.com>
33
- */
34
-
35
- class Dibspw_Sales_Block_Order_Info extends Mage_Sales_Block_Order_Info {
36
-
37
- public function getPaymentInfoHtml() {
38
- $res = $this->getChildHtml('payment_info');
39
- $oOrder = $this->getOrder();
40
- $oPaymentObj = $oOrder->getPayment()->getMethodInstance();
41
- $sPaymentClass = get_class($oPaymentObj);
42
- if($sPaymentClass !== FALSE && (strpos($sPaymentClass, "Dibsfw") !== FALSE ||
43
- strpos($sPaymentClass, "Dibspw") !== FALSE)) {
44
- $res .= $oPaymentObj->cms_dibs_getOrderInfo($oOrder);
45
- }
46
-
47
- return $res;
48
- }
49
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Dibspw/Sales/etc/config.xml DELETED
@@ -1,35 +0,0 @@
1
- <?xml version="1.0"?>
2
- <!--
3
- /**
4
- * Dibs A/S
5
- * Dibs Payment Extension
6
- *
7
- * NOTICE OF LICENSE
8
- *
9
- * This source file is subject to the Open Software License (OSL 3.0)
10
- * that is bundled with this package in the file LICENSE.txt.
11
- * It is also available through the world-wide-web at this URL:
12
- * http://opensource.org/licenses/osl-3.0.php
13
- * If you did not receive a copy of the license and are unable to
14
- * obtain it through the world-wide-web, please send an email
15
- * to license@magentocommerce.com so we can send you a copy immediately.
16
- *
17
- * @category Payments & Gateways Extensions
18
- * @package Dibspw_Dibspw
19
- * @author Dibs A/S
20
- * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
- */
23
- -->
24
- <config>
25
- <global>
26
- <blocks>
27
- <sales>
28
- <rewrite>
29
- <order_info>Dibspw_Sales_Block_Order_Info</order_info>
30
- <order_print>Dibspw_Sales_Block_Order_Print</order_print>
31
- </rewrite>
32
- </sales>
33
- </blocks>
34
- </global>
35
- </config>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/dibspw/dibspw/form.phtml CHANGED
@@ -26,12 +26,12 @@ $_code=$this->getMethodCode();
26
  $sHTML = '<fieldset class="form-list">
27
  <ul id="payment_form_'.$_code. '" style="display:none">
28
  <li>' . $this->__('DIBSPW_LABEL_1');
29
- $logoArray = explode(',', $paymate->getConfigData('dibspwlogos'));
30
  $sTrusted = '';
31
  $sCards = '';
32
  $iCards = 1;
33
  $iTrusted = 1;
34
- foreach($logoArray as $item) {
35
  $mSecured = (boolean)preg_match("/^(DIBS|PCI|.*_SECURE.*)$/s", $item);
36
  if($mSecured === TRUE){
37
  $sTrusted .= $paymate->cms_get_imgHtml($item) . "&nbsp;&nbsp;";
26
  $sHTML = '<fieldset class="form-list">
27
  <ul id="payment_form_'.$_code. '" style="display:none">
28
  <li>' . $this->__('DIBSPW_LABEL_1');
29
+ $aLogoArray = explode(',', $paymate->getConfigData('dibspwlogos'));
30
  $sTrusted = '';
31
  $sCards = '';
32
  $iCards = 1;
33
  $iTrusted = 1;
34
+ foreach($aLogoArray as $item) {
35
  $mSecured = (boolean)preg_match("/^(DIBS|PCI|.*_SECURE.*)$/s", $item);
36
  if($mSecured === TRUE){
37
  $sTrusted .= $paymate->cms_get_imgHtml($item) . "&nbsp;&nbsp;";
app/etc/modules/Dibspw_Adminhtml.xml DELETED
@@ -1,32 +0,0 @@
1
- <?xml version="1.0"?>
2
- <!--
3
- /**
4
- * Dibs A/S
5
- * Dibs Payment Extension
6
- *
7
- * NOTICE OF LICENSE
8
- *
9
- * This source file is subject to the Open Software License (OSL 3.0)
10
- * that is bundled with this package in the file LICENSE.txt.
11
- * It is also available through the world-wide-web at this URL:
12
- * http://opensource.org/licenses/osl-3.0.php
13
- * If you did not receive a copy of the license and are unable to
14
- * obtain it through the world-wide-web, please send an email
15
- * to license@magentocommerce.com so we can send you a copy immediately.
16
- *
17
- * @category Payments & Gateways Extensions
18
- * @package Dibspw_Dibspw
19
- * @author Dibs A/S
20
- * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
- */
23
- -->
24
-
25
- <config>
26
- <modules>
27
- <Dibspw_Adminhtml>
28
- <active>true</active>
29
- <codePool>community</codePool>
30
- </Dibspw_Adminhtml>
31
- </modules>
32
- </config>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/etc/modules/Dibspw_Sales.xml DELETED
@@ -1,32 +0,0 @@
1
- <?xml version="1.0"?>
2
- <!--
3
- /**
4
- * Dibs A/S
5
- * Dibs Payment Extension
6
- *
7
- * NOTICE OF LICENSE
8
- *
9
- * This source file is subject to the Open Software License (OSL 3.0)
10
- * that is bundled with this package in the file LICENSE.txt.
11
- * It is also available through the world-wide-web at this URL:
12
- * http://opensource.org/licenses/osl-3.0.php
13
- * If you did not receive a copy of the license and are unable to
14
- * obtain it through the world-wide-web, please send an email
15
- * to license@magentocommerce.com so we can send you a copy immediately.
16
- *
17
- * @category Payments & Gateways Extensions
18
- * @package Dibspw_Dibspw
19
- * @author Dibs A/S
20
- * @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
21
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
22
- */
23
- -->
24
-
25
- <config>
26
- <modules>
27
- <Dibspw_Sales>
28
- <active>true</active>
29
- <codePool>community</codePool>
30
- </Dibspw_Sales>
31
- </modules>
32
- </config>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/locale/da_DK/Mage_Dibspw.csv CHANGED
@@ -5,30 +5,33 @@
5
  "DIBSPW_LABEL_5","Bel&#248;b"
6
  "DIBSPW_LABEL_6","Du bliver nu viderestillet til betalingssystemet"
7
  "DIBSPW_LABEL_7","DIBS betalings information"
8
- "DIBSPW_LABEL_8","Transaction ID:"
9
- "DIBSPW_LABEL_9","Bel&#248;b:"
10
- "DIBSPW_LABEL_10","Valuta kode:"
11
- "DIBSPW_LABEL_11","Gebyr:"
12
- "DIBSPW_LABEL_12","Betalingstype:"
13
- "DIBSPW_LABEL_13","Kort nummer:"
14
- "DIBSPW_LABEL_14","Udl&#248;b:"
15
- "DIBSPW_LABEL_15","Land:"
16
- "DIBSPW_LABEL_16","Indl&#248;ser:"
17
- "DIBSPW_LABEL_17","3-D Secure:"
18
- "DIBSPW_LABEL_18","G&#229; til DIBS administrationen og gennemf&#248;r betalingen"
19
  "DIBSPW_LABEL_19","Ingen betaling er registreret p&#229; denne ordre"
20
  "DIBSPW_LABEL_20","Kortholder har annulleret betalingsforl&#248;bet"
21
  "DIBSPW_LABEL_21","'Callback' modtaget fra DIBS Payment Services (www.dibs.dk)"
22
  "DIBSPW_LABEL_22","Kortholder returneret til butikken fra DIBS Payment Services (www.dibs.dk)"
23
  "DIBSPW_LABEL_23","Empty or expired order data. Please try to checkout again."
24
  "DIBSPW_LABEL_24","You will be redirected to DIBS in a few seconds..."
25
- "dibspw_txt_err_fatal", "A fatal error has occured."
 
 
 
 
 
 
 
 
 
26
  "dibspw_txt_msg_toshop", "Return to shop"
27
- "dibspw_txt_err_11", "Unknown orderid was returned from DIBS payment gateway."
28
- "dibspw_txt_err_12", "No orderid was returned from DIBS payment gateway."
29
- "dibspw_txt_err_21", "The amount received from DIBS payment gateway differs from original order amount."
30
- "dibspw_txt_err_22", "No amount was returned from DIBS payment gateway."
31
- "dibspw_txt_err_31", "The currency type received from DIBS payment gateway differs from original order currency type."
32
- "dibspw_txt_err_32", "No currency type was returned from DIBS payment gateway."
33
- "dibspw_txt_err_41", "The fingerprint key does not match."
34
- "dibspw_txt_err_def", "Unknown error appeared. Please contact to shop administration to check transaction."
5
  "DIBSPW_LABEL_5","Bel&#248;b"
6
  "DIBSPW_LABEL_6","Du bliver nu viderestillet til betalingssystemet"
7
  "DIBSPW_LABEL_7","DIBS betalings information"
8
+ "DIBSPW_LABEL_8","Transaction ID"
9
+ "DIBSPW_LABEL_9","Bel&#248;b"
10
+ "DIBSPW_LABEL_10","Valuta kode"
11
+ "DIBSPW_LABEL_11","Gebyr"
12
+ "DIBSPW_LABEL_12","Betalingstype"
13
+ "DIBSPW_LABEL_13","Kort nummer"
14
+ "DIBSPW_LABEL_14","Udl&#248;b"
15
+ "DIBSPW_LABEL_15","Land"
16
+ "DIBSPW_LABEL_16","Indl&#248;ser"
17
+ "DIBSPW_LABEL_17","3-D Secure"
18
+ "DIBSPW_LABEL_18","You can go to DIBS administration to manage this payment"
19
  "DIBSPW_LABEL_19","Ingen betaling er registreret p&#229; denne ordre"
20
  "DIBSPW_LABEL_20","Kortholder har annulleret betalingsforl&#248;bet"
21
  "DIBSPW_LABEL_21","'Callback' modtaget fra DIBS Payment Services (www.dibs.dk)"
22
  "DIBSPW_LABEL_22","Kortholder returneret til butikken fra DIBS Payment Services (www.dibs.dk)"
23
  "DIBSPW_LABEL_23","Empty or expired order data. Please try to checkout again."
24
  "DIBSPW_LABEL_24","You will be redirected to DIBS in a few seconds..."
25
+ "DIBSPW_LABEL_25","Notice"
26
+ "DIBSPW_LABEL_26","Manage transaction"
27
+ "dibspw_txt_err_0", "Error has occurred during payment verification"
28
+ "dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
29
+ "dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
30
+ "dibspw_txt_err_3", "No amount was returned from DIBS payment gateway."
31
+ "dibspw_txt_err_4", "The amount received from DIBS payment gateway differs from original order amount."
32
+ "dibspw_txt_err_5", "No currency type was returned from DIBS payment gateway."
33
+ "dibspw_txt_err_6", "The currency type received from DIBS payment gateway differs from original order currency type."
34
+ "dibspw_txt_err_7", "The fingerprint key does not match."
35
  "dibspw_txt_msg_toshop", "Return to shop"
36
+ "dibspw_txt_msg_errcode", "Error code:"
37
+ "dibspw_txt_msg_errmsg", "Error message:"
 
 
 
 
 
 
app/locale/en_US/Mage_Dibspw.csv CHANGED
@@ -5,30 +5,33 @@
5
  "DIBSPW_LABEL_5","Amount"
6
  "DIBSPW_LABEL_6","Your are now being redirected to the payment gateway"
7
  "DIBSPW_LABEL_7","DIBS Payment Information"
8
- "DIBSPW_LABEL_8","Transaction ID:"
9
- "DIBSPW_LABEL_9","Amount:"
10
- "DIBSPW_LABEL_10","Currency Code:"
11
- "DIBSPW_LABEL_11","Fee:"
12
- "DIBSPW_LABEL_12","Pay type:"
13
- "DIBSPW_LABEL_13","Card number:"
14
- "DIBSPW_LABEL_14","Expire:"
15
- "DIBSPW_LABEL_15","Country:"
16
- "DIBSPW_LABEL_16","Acquirer:"
17
- "DIBSPW_LABEL_17","3-D Secure:"
18
- "DIBSPW_LABEL_18","Go to DIBS administration and process the payment"
19
  "DIBSPW_LABEL_19","There is not registered any payment for this order yet!"
20
  "DIBSPW_LABEL_20","Customer has cancelled the payment process - DIBS Payment Services (www.dibspayment.com)"
21
  "DIBSPW_LABEL_21","'Callback' received from DIBS Payment Services (www.dibspayment.com)"
22
  "DIBSPW_LABEL_22","Customer successfully returned back to store from DIBS Payment Services (www.dibspayment.com)"
23
  "DIBSPW_LABEL_23","Empty or expired order data. Please try to checkout again."
24
  "DIBSPW_LABEL_24","You will be redirected to DIBS in a few seconds..."
25
- "dibspw_txt_err_fatal", "A fatal error has occured."
 
 
 
 
 
 
 
 
 
26
  "dibspw_txt_msg_toshop", "Return to shop"
27
- "dibspw_txt_err_11", "Unknown orderid was returned from DIBS payment gateway."
28
- "dibspw_txt_err_12", "No orderid was returned from DIBS payment gateway."
29
- "dibspw_txt_err_21", "The amount received from DIBS payment gateway differs from original order amount."
30
- "dibspw_txt_err_22", "No amount was returned from DIBS payment gateway."
31
- "dibspw_txt_err_31", "The currency type received from DIBS payment gateway differs from original order currency type."
32
- "dibspw_txt_err_32", "No currency type was returned from DIBS payment gateway."
33
- "dibspw_txt_err_41", "The fingerprint key does not match."
34
- "dibspw_txt_err_def", "Unknown error appeared. Please contact to shop administration to check transaction."
5
  "DIBSPW_LABEL_5","Amount"
6
  "DIBSPW_LABEL_6","Your are now being redirected to the payment gateway"
7
  "DIBSPW_LABEL_7","DIBS Payment Information"
8
+ "DIBSPW_LABEL_8","Transaction ID"
9
+ "DIBSPW_LABEL_9","Amount"
10
+ "DIBSPW_LABEL_10","Currency Code"
11
+ "DIBSPW_LABEL_11","Fee"
12
+ "DIBSPW_LABEL_12","Pay type"
13
+ "DIBSPW_LABEL_13","Card number"
14
+ "DIBSPW_LABEL_14","Expire"
15
+ "DIBSPW_LABEL_15","Country"
16
+ "DIBSPW_LABEL_16","Acquirer"
17
+ "DIBSPW_LABEL_17","3-D Secure"
18
+ "DIBSPW_LABEL_18","You can go to DIBS administration to manage this payment"
19
  "DIBSPW_LABEL_19","There is not registered any payment for this order yet!"
20
  "DIBSPW_LABEL_20","Customer has cancelled the payment process - DIBS Payment Services (www.dibspayment.com)"
21
  "DIBSPW_LABEL_21","'Callback' received from DIBS Payment Services (www.dibspayment.com)"
22
  "DIBSPW_LABEL_22","Customer successfully returned back to store from DIBS Payment Services (www.dibspayment.com)"
23
  "DIBSPW_LABEL_23","Empty or expired order data. Please try to checkout again."
24
  "DIBSPW_LABEL_24","You will be redirected to DIBS in a few seconds..."
25
+ "DIBSPW_LABEL_25","Notice"
26
+ "DIBSPW_LABEL_26","Manage transaction"
27
+ "dibspw_txt_err_0", "Error has occurred during payment verification"
28
+ "dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
29
+ "dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
30
+ "dibspw_txt_err_3", "No amount was returned from DIBS payment gateway."
31
+ "dibspw_txt_err_4", "The amount received from DIBS payment gateway differs from original order amount."
32
+ "dibspw_txt_err_5", "No currency type was returned from DIBS payment gateway."
33
+ "dibspw_txt_err_6", "The currency type received from DIBS payment gateway differs from original order currency type."
34
+ "dibspw_txt_err_7", "The fingerprint key does not match."
35
  "dibspw_txt_msg_toshop", "Return to shop"
36
+ "dibspw_txt_msg_errcode", "Error code:"
37
+ "dibspw_txt_msg_errmsg", "Error message:"
 
 
 
 
 
 
app/locale/nb_NO/Mage_Dibspw.csv CHANGED
@@ -6,29 +6,32 @@
6
  "DIBSPW_LABEL_6","Du blir n&#229; videresendt til betalingsleverand&#248;ren"
7
  "DIBSPW_LABEL_7","DIBS Betalingsinformasjon"
8
  "DIBSPW_LABEL_8","Transaksjonsnummer:"
9
- "DIBSPW_LABEL_9","Bel&#248;p:"
10
- "DIBSPW_LABEL_10","Valutakode:"
11
- "DIBSPW_LABEL_11","Gebyr:"
12
- "DIBSPW_LABEL_12","Betalingstype:"
13
- "DIBSPW_LABEL_13","Kortnummer:"
14
- "DIBSPW_LABEL_14","Utl&#248;psdato:"
15
- "DIBSPW_LABEL_15","Land:"
16
- "DIBSPW_LABEL_16","Innl&#248;ser:"
17
- "DIBSPW_LABEL_17","3-D Secure:"
18
- "DIBSPW_LABEL_18","G&#229; til DIBS Administrasjonen og prosesser betalingen"
19
  "DIBSPW_LABEL_19","Det er ikke registrert noen betaling for denne ordren enda!"
20
  "DIBSPW_LABEL_20","Kunden har avbrutt betalingsprosessen - DIBS Payment Services (www.dibs.no)"
21
  "DIBSPW_LABEL_21","'Callback' mottatt fra DIBS Payment Services (www.dibs.no)"
22
  "DIBSPW_LABEL_22","Kunden har returnert vellykket tilbake til butikk fra DIBS Payment Services (www.dibs.no)"
23
  "DIBSPW_LABEL_23","Empty or expired order data. Please try to checkout again."
24
  "DIBSPW_LABEL_24","You will be redirected to DIBS in a few seconds..."
25
- "dibspw_txt_err_fatal", "A fatal error has occured."
 
 
 
 
 
 
 
 
 
26
  "dibspw_txt_msg_toshop", "Return to shop"
27
- "dibspw_txt_err_11", "Unknown orderid was returned from DIBS payment gateway."
28
- "dibspw_txt_err_12", "No orderid was returned from DIBS payment gateway."
29
- "dibspw_txt_err_21", "The amount received from DIBS payment gateway differs from original order amount."
30
- "dibspw_txt_err_22", "No amount was returned from DIBS payment gateway."
31
- "dibspw_txt_err_31", "The currency type received from DIBS payment gateway differs from original order currency type."
32
- "dibspw_txt_err_32", "No currency type was returned from DIBS payment gateway."
33
- "dibspw_txt_err_41", "The fingerprint key does not match."
34
- "dibspw_txt_err_def", "Unknown error appeared. Please contact to shop administration to check transaction."
6
  "DIBSPW_LABEL_6","Du blir n&#229; videresendt til betalingsleverand&#248;ren"
7
  "DIBSPW_LABEL_7","DIBS Betalingsinformasjon"
8
  "DIBSPW_LABEL_8","Transaksjonsnummer:"
9
+ "DIBSPW_LABEL_9","Bel&#248;p"
10
+ "DIBSPW_LABEL_10","Valutakode"
11
+ "DIBSPW_LABEL_11","Gebyr"
12
+ "DIBSPW_LABEL_12","Betalingstype"
13
+ "DIBSPW_LABEL_13","Kortnummer"
14
+ "DIBSPW_LABEL_14","Utl&#248;psdato"
15
+ "DIBSPW_LABEL_15","Land"
16
+ "DIBSPW_LABEL_16","Innl&#248;ser"
17
+ "DIBSPW_LABEL_17","3-D Secure"
18
+ "DIBSPW_LABEL_18","You can go to DIBS administration to manage this payment"
19
  "DIBSPW_LABEL_19","Det er ikke registrert noen betaling for denne ordren enda!"
20
  "DIBSPW_LABEL_20","Kunden har avbrutt betalingsprosessen - DIBS Payment Services (www.dibs.no)"
21
  "DIBSPW_LABEL_21","'Callback' mottatt fra DIBS Payment Services (www.dibs.no)"
22
  "DIBSPW_LABEL_22","Kunden har returnert vellykket tilbake til butikk fra DIBS Payment Services (www.dibs.no)"
23
  "DIBSPW_LABEL_23","Empty or expired order data. Please try to checkout again."
24
  "DIBSPW_LABEL_24","You will be redirected to DIBS in a few seconds..."
25
+ "DIBSPW_LABEL_25","Notice"
26
+ "DIBSPW_LABEL_26","Manage transaction"
27
+ "dibspw_txt_err_0", "Error has occurred during payment verification"
28
+ "dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
29
+ "dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
30
+ "dibspw_txt_err_3", "No amount was returned from DIBS payment gateway."
31
+ "dibspw_txt_err_4", "The amount received from DIBS payment gateway differs from original order amount."
32
+ "dibspw_txt_err_5", "No currency type was returned from DIBS payment gateway."
33
+ "dibspw_txt_err_6", "The currency type received from DIBS payment gateway differs from original order currency type."
34
+ "dibspw_txt_err_7", "The fingerprint key does not match."
35
  "dibspw_txt_msg_toshop", "Return to shop"
36
+ "dibspw_txt_msg_errcode", "Error code:"
37
+ "dibspw_txt_msg_errmsg", "Error message:"
 
 
 
 
 
 
app/locale/nn_NO/Mage_Dibspw.csv CHANGED
@@ -5,30 +5,33 @@
5
  "DIBSPW_LABEL_5","Bel&#248;p"
6
  "DIBSPW_LABEL_6","Du blir n&#229; videresendt til betalingsleverand&#248;ren"
7
  "DIBSPW_LABEL_7","DIBS Betalingsinformasjon"
8
- "DIBSPW_LABEL_8","Transaksjonsnummer:"
9
- "DIBSPW_LABEL_9","Bel&#248;p:"
10
- "DIBSPW_LABEL_10","Valutakode:"
11
- "DIBSPW_LABEL_11","Gebyr:"
12
- "DIBSPW_LABEL_12","Betalingstype:"
13
- "DIBSPW_LABEL_13","Kortnummer:"
14
- "DIBSPW_LABEL_14","Utl&#248;psdato:"
15
- "DIBSPW_LABEL_15","Land:"
16
- "DIBSPW_LABEL_16","Innl&#248;ser:"
17
- "DIBSPW_LABEL_17","3-D Secure:"
18
- "DIBSPW_LABEL_18","G&#229; til DIBS Administrasjonen og prosesser betalingen"
19
  "DIBSPW_LABEL_19","Det er ikke registrert noen betaling for denne ordren enda!"
20
  "DIBSPW_LABEL_20","Kunden har avbrutt betalingsprosessen - DIBS Payment Services (www.dibs.no)"
21
  "DIBSPW_LABEL_21","'Callback' mottatt fra DIBS Payment Services (www.dibs.no)"
22
  "DIBSPW_LABEL_22","Kunden har returnert vellykket tilbake til butikk fra DIBS Payment Services (www.dibs.no)"
23
  "DIBSPW_LABEL_23","Empty or expired order data. Please try to checkout again."
24
  "DIBSPW_LABEL_24","You will be redirected to DIBS in a few seconds..."
25
- "dibspw_txt_err_fatal", "A fatal error has occured."
 
 
 
 
 
 
 
 
 
26
  "dibspw_txt_msg_toshop", "Return to shop"
27
- "dibspw_txt_err_11", "Unknown orderid was returned from DIBS payment gateway."
28
- "dibspw_txt_err_12", "No orderid was returned from DIBS payment gateway."
29
- "dibspw_txt_err_21", "The amount received from DIBS payment gateway differs from original order amount."
30
- "dibspw_txt_err_22", "No amount was returned from DIBS payment gateway."
31
- "dibspw_txt_err_31", "The currency type received from DIBS payment gateway differs from original order currency type."
32
- "dibspw_txt_err_32", "No currency type was returned from DIBS payment gateway."
33
- "dibspw_txt_err_41", "The fingerprint key does not match."
34
- "dibspw_txt_err_def", "Unknown error appeared. Please contact to shop administration to check transaction."
5
  "DIBSPW_LABEL_5","Bel&#248;p"
6
  "DIBSPW_LABEL_6","Du blir n&#229; videresendt til betalingsleverand&#248;ren"
7
  "DIBSPW_LABEL_7","DIBS Betalingsinformasjon"
8
+ "DIBSPW_LABEL_8","Transaksjonsnummer"
9
+ "DIBSPW_LABEL_9","Bel&#248;p"
10
+ "DIBSPW_LABEL_10","Valutakode"
11
+ "DIBSPW_LABEL_11","Gebyr"
12
+ "DIBSPW_LABEL_12","Betalingstype"
13
+ "DIBSPW_LABEL_13","Kortnummer"
14
+ "DIBSPW_LABEL_14","Utl&#248;psdato"
15
+ "DIBSPW_LABEL_15","Land"
16
+ "DIBSPW_LABEL_16","Innl&#248;ser"
17
+ "DIBSPW_LABEL_17","3-D Secure"
18
+ "DIBSPW_LABEL_18","You can go to DIBS administration to manage this payment"
19
  "DIBSPW_LABEL_19","Det er ikke registrert noen betaling for denne ordren enda!"
20
  "DIBSPW_LABEL_20","Kunden har avbrutt betalingsprosessen - DIBS Payment Services (www.dibs.no)"
21
  "DIBSPW_LABEL_21","'Callback' mottatt fra DIBS Payment Services (www.dibs.no)"
22
  "DIBSPW_LABEL_22","Kunden har returnert vellykket tilbake til butikk fra DIBS Payment Services (www.dibs.no)"
23
  "DIBSPW_LABEL_23","Empty or expired order data. Please try to checkout again."
24
  "DIBSPW_LABEL_24","You will be redirected to DIBS in a few seconds..."
25
+ "DIBSPW_LABEL_25","Notice"
26
+ "DIBSPW_LABEL_26","Manage transaction"
27
+ "dibspw_txt_err_0", "Error has occurred during payment verification"
28
+ "dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
29
+ "dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
30
+ "dibspw_txt_err_3", "No amount was returned from DIBS payment gateway."
31
+ "dibspw_txt_err_4", "The amount received from DIBS payment gateway differs from original order amount."
32
+ "dibspw_txt_err_5", "No currency type was returned from DIBS payment gateway."
33
+ "dibspw_txt_err_6", "The currency type received from DIBS payment gateway differs from original order currency type."
34
+ "dibspw_txt_err_7", "The fingerprint key does not match."
35
  "dibspw_txt_msg_toshop", "Return to shop"
36
+ "dibspw_txt_msg_errcode", "Error code:"
37
+ "dibspw_txt_msg_errmsg", "Error message:"
 
 
 
 
 
 
app/locale/sv_SE/Mage_Dibspw.csv CHANGED
@@ -5,30 +5,33 @@
5
  "DIBSPW_LABEL_5","Belopp"
6
  "DIBSPW_LABEL_6","Du kommer nu att skickas till betalningssystemet"
7
  "DIBSPW_LABEL_7","DIBS Betalningsinformation"
8
- "DIBSPW_LABEL_8","TransaktionsID:"
9
- "DIBSPW_LABEL_9","Belopp:"
10
- "DIBSPW_LABEL_10","Valutakod:"
11
- "DIBSPW_LABEL_11","Avgift:"
12
- "DIBSPW_LABEL_12","Betals&#228;tt:"
13
- "DIBSPW_LABEL_13","Kortnummer:"
14
- "DIBSPW_LABEL_14","Utg&#229;ngsdatum:"
15
- "DIBSPW_LABEL_15","Land:"
16
- "DIBSPW_LABEL_16","Inl&#246;sare:"
17
- "DIBSPW_LABEL_17","3-D Secure:"
18
- "DIBSPW_LABEL_18","G&#229; till DIBS administrationsgr&#228;nssnitt och behandla betalningen"
19
  "DIBSPW_LABEL_19","Det finns ingen registrerad betalning f&#246;r denna order &#228;nnu"
20
  "DIBSPW_LABEL_20","Kunden har avbrutit betalningsprocessen - DIBS Payment Services (www.dibs.se)"
21
  "DIBSPW_LABEL_21","'Callback' mottagen fr&#229;n DIBS Payment Services (www.dibs.se)"
22
  "DIBSPW_LABEL_22","Kunden har kommit tillbaka till butiken fr&#229;n DIBS Payment Services (www.dibs.se)"
23
  "DIBSPW_LABEL_23","Empty or expired order data. Please try to checkout again."
24
  "DIBSPW_LABEL_24","You will be redirected to DIBS in a few seconds..."
25
- "dibspw_txt_err_fatal", "A fatal error has occured."
 
 
 
 
 
 
 
 
 
26
  "dibspw_txt_msg_toshop", "Return to shop"
27
- "dibspw_txt_err_11", "Unknown orderid was returned from DIBS payment gateway."
28
- "dibspw_txt_err_12", "No orderid was returned from DIBS payment gateway."
29
- "dibspw_txt_err_21", "The amount received from DIBS payment gateway differs from original order amount."
30
- "dibspw_txt_err_22", "No amount was returned from DIBS payment gateway."
31
- "dibspw_txt_err_31", "The currency type received from DIBS payment gateway differs from original order currency type."
32
- "dibspw_txt_err_32", "No currency type was returned from DIBS payment gateway."
33
- "dibspw_txt_err_41", "The fingerprint key does not match."
34
- "dibspw_txt_err_def", "Unknown error appeared. Please contact to shop administration to check transaction."
5
  "DIBSPW_LABEL_5","Belopp"
6
  "DIBSPW_LABEL_6","Du kommer nu att skickas till betalningssystemet"
7
  "DIBSPW_LABEL_7","DIBS Betalningsinformation"
8
+ "DIBSPW_LABEL_8","TransaktionsID"
9
+ "DIBSPW_LABEL_9","Belopp"
10
+ "DIBSPW_LABEL_10","Valutakod"
11
+ "DIBSPW_LABEL_11","Avgift"
12
+ "DIBSPW_LABEL_12","Betals&#228;tt"
13
+ "DIBSPW_LABEL_13","Kortnummer"
14
+ "DIBSPW_LABEL_14","Utg&#229;ngsdatum"
15
+ "DIBSPW_LABEL_15","Land"
16
+ "DIBSPW_LABEL_16","Inl&#246;sare"
17
+ "DIBSPW_LABEL_17","3-D Secure"
18
+ "DIBSPW_LABEL_18","You can go to DIBS administration to manage this payment"
19
  "DIBSPW_LABEL_19","Det finns ingen registrerad betalning f&#246;r denna order &#228;nnu"
20
  "DIBSPW_LABEL_20","Kunden har avbrutit betalningsprocessen - DIBS Payment Services (www.dibs.se)"
21
  "DIBSPW_LABEL_21","'Callback' mottagen fr&#229;n DIBS Payment Services (www.dibs.se)"
22
  "DIBSPW_LABEL_22","Kunden har kommit tillbaka till butiken fr&#229;n DIBS Payment Services (www.dibs.se)"
23
  "DIBSPW_LABEL_23","Empty or expired order data. Please try to checkout again."
24
  "DIBSPW_LABEL_24","You will be redirected to DIBS in a few seconds..."
25
+ "DIBSPW_LABEL_25","Notice"
26
+ "DIBSPW_LABEL_26","Manage transaction"
27
+ "dibspw_txt_err_0", "Error has occurred during payment verification"
28
+ "dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
29
+ "dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
30
+ "dibspw_txt_err_3", "No amount was returned from DIBS payment gateway."
31
+ "dibspw_txt_err_4", "The amount received from DIBS payment gateway differs from original order amount."
32
+ "dibspw_txt_err_5", "No currency type was returned from DIBS payment gateway."
33
+ "dibspw_txt_err_6", "The currency type received from DIBS payment gateway differs from original order currency type."
34
+ "dibspw_txt_err_7", "The fingerprint key does not match."
35
  "dibspw_txt_msg_toshop", "Return to shop"
36
+ "dibspw_txt_msg_errcode", "Error code:"
37
+ "dibspw_txt_msg_errmsg", "Error message:"
 
 
 
 
 
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Dibspw</name>
4
- <version>4.1.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -33,7 +33,14 @@ Card types accepted by the DIBS payment gateway:&#xD;
33
  - Nordea e-betaling&#xD;
34
  &#xD;
35
  A complete list can be found at http://www.dibspayment.com/</description>
36
- <notes>4.1.1&#xD;
 
 
 
 
 
 
 
37
  - Fixed error on redirect with expired session&#xD;
38
  - Improved compatibility with DIBS FlexWin Magento extension&#xD;
39
  - Fixed order statuses bug&#xD;
@@ -48,9 +55,9 @@ A complete list can be found at http://www.dibspayment.com/</description>
48
  4.1.0&#xD;
49
  - New module for DIBS Payment Window and Mobile Payment Window integration methods.</notes>
50
  <authors><author><name>DIBS A/S</name><user>niso</user><email>info@dibs.dk</email></author><author><name>DIBS A/S</name><user>dibs</user><email>vlya@dibs.dk</email></author></authors>
51
- <date>2012-04-24</date>
52
- <time>11:42:54</time>
53
- <contents><target name="magecommunity"><dir name="Dibspw"><dir name="Adminhtml"><dir name="Block"><dir name="Sales"><dir name="Order"><dir name="View"><dir name="Tab"><file name="Info.php" hash="22bec7d1777605cc423407471916f0eb"/></dir></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="594dbf5043a234d9a78013e8b810b5e4"/></dir></dir><dir name="Dibspw"><dir name="Block"><file name="Failure.php" hash="17e6a66c34637fac033d3e04c9e6a45e"/><file name="Form.php" hash="ac2155fe9ed943a258118dfb127ea30f"/><file name="Redirect.php" hash="b67600699025f99eaadb6cc7f27b42b1"/></dir><dir name="Helper"><file name="Data.php" hash="3ac20dd79b0d2e0cc1609f6b65d330c5"/></dir><dir name="Model"><file name="Dibspw.php" hash="5a14f9b555a35a86e34d0a2b3fa544e6"/><dir name="Mysql4"><file name="Setup.php" hash="1c135886bc8a0794310ec7cb70e04e64"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Dibslogos.php" hash="11144f7fbfd82c6e4f54cc2e0d204525"/><file name="Dibspaytypes.php" hash="09b971321fc63ef845236f8087dc45c6"/><file name="Dibsyesno.php" hash="5f576ff3909cec6d880409c40b86f91a"/><file name="Lang.php" hash="1ea6118edd5624bc1f750a178ccb44ea"/><file name="Orderstatusafter.php" hash="4be3d3a1b7990b4f9f5f65e933266ce4"/><file name="Orderstatusbefore.php" hash="79ba55f79c39736971ea7650c959b3d6"/><file name="PBBdistribution.php" hash="9d4d91386c1d4f848a2357666af473f1"/><file name="Paymentwindow.php" hash="6568402efdbef3d2820353730d876f3e"/></dir></dir></dir><dir name="dibs_api"><dir name="pw"><file name="dibs_pw_api.php" hash="276b73c6df9fea8cc3913799acfc329c"/><file name="dibs_pw_helpers.php" hash="e3324beecab4c8af8b3835f7ae413185"/><file name="dibs_pw_helpers_cms.php" hash="84b9a3be13845f80715475f9505d9044"/><file name="dibs_pw_helpers_interface.php" hash="17a79ee1e27fdd1c6590c07133ba8c04"/></dir></dir></dir><dir name="controllers"><file name="DibspwController.php" hash="635f0688d0f9c1fea2658d289a170f29"/></dir><dir name="etc"><file name="config.xml" hash="6492c01a95913e32acf14964f216e33a"/><file name="system.xml" hash="f4d105f73d41de936496115024b0f6cf"/></dir><dir name="sql"><dir name="dibspw_setup"><file name="mysql4-install-4.1.1.php" hash="0bbcb740b5a1d9d23a5293490224bf70"/><file name="mysql4-upgrade-4.1.0-4.1.1.php" hash="0bbcb740b5a1d9d23a5293490224bf70"/></dir></dir></dir><dir name="Sales"><dir name="Block"><dir name="Order"><file name="Info.php" hash="5d72806c0cdebc487ae770ed24d97113"/><file name="Print.php" hash="7e49bf2f625fc04254c0a9afbcef906e"/></dir></dir><dir name="etc"><file name="config.xml" hash="bc9fda3461591b51b4d9e1daacc7324f"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Dibspw_Dibspw.xml" hash="7c82595e6638c292f71a0ad5be4ecaf0"/><file name="Dibspw_Sales.xml" hash="8b5f3d89fb38cc873dd0f5d95267059c"/><file name="Dibspw_Adminhtml.xml" hash="615925971da5c5c48e755c330205d709"/></dir></target><target name="magelocale"><dir name="da_DK"><file name="Mage_Dibspw.csv" hash="17ebd5341700138ea3083b3c4ddd8c3c"/></dir><dir name="en_US"><file name="Mage_Dibspw.csv" hash="87ff9cf9325ad9b593fd8403efa31e03"/></dir><dir name="nb_NO"><file name="Mage_Dibspw.csv" hash="7b4f9d8cc755bd350bb254898142c318"/></dir><dir name="nn_NO"><file name="Mage_Dibspw.csv" hash="7b4f9d8cc755bd350bb254898142c318"/></dir><dir name="sv_SE"><file name="Mage_Dibspw.csv" hash="b7afba709f90fb3e3bf5a7455b2068a3"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="dibspw"><dir name="dibspw"><file name="failure.phtml" hash="f5a7ed44946651f7ad4b1beeca7499be"/><file name="form.phtml" hash="12136fc3a935e00ec77dc7658b7c9288"/><file name="redirect.phtml" hash="b85fe4f98a059d3048738678299281c6"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="images"><dir name="Dibspw"><dir name="Dibspw"><file name="aktia.gif" hash="7afe00b19b4194fa4ffbdf20cdd469c1"/><file name="amex.gif" hash="f35f89ccdcb954e02a07f6c0a29c7b43"/><file name="bax.gif" hash="c315574fd839dae52a1316b6d8b836b6"/><file name="dibs.gif" hash="8b308757472fc5aaaedfefd5c79a2d54"/><file name="din.gif" hash="fabce04659a94993a230285b9a4651e9"/><file name="dk.gif" hash="daa5d5d2c0d541579b0e13aa3cd9d65b"/><file name="dnb.gif" hash="1f616c382b72248334f6aa1ca910003b"/><file name="edk.gif" hash="4485910a0fb40512233c1a59ddd31015"/><file name="elec.gif" hash="e5371ba0da9bb14990d1b8163cedd066"/><file name="elv.gif" hash="3bd20355343bd250a6a704fdbaf9ba62"/><file name="ew.gif" hash="b50385f7d878be6a3834310d1fbc3a1d"/><file name="ffk.gif" hash="d9cd7fa26230a850114b2dc99aea3b22"/><file name="fsb.gif" hash="d6da3e67f8096811c2ad0135b2aad80a"/><file name="git.gif" hash="b70e244f36e7aec94fe3f6373e1ae8d7"/><file name="ing.gif" hash="40f07b266bcd5953bb6c079f7eeaae67"/><file name="jcb.gif" hash="aea8c54e043a75b26887fa1307ad4312"/><file name="jcbsecure.gif" hash="1c687214f79b73d7e99f5011c9c22bce"/><file name="loading.gif" hash="7e99e1159a3686f6aa4f90043c554483"/><file name="mc.gif" hash="2680e078159e5aedb561c3a705801a44"/><file name="mcsecure.gif" hash="730735c1e2d36d9fa3bd6468fa0b1a7d"/><file name="moca.gif" hash="befd2f10976c0ab40333f01fc6db4743"/><file name="mtro.gif" hash="d5df5f7986a21bf5a78b9c7a3656facd"/><file name="oko.gif" hash="1cde3c12036ebd74a643aee2ffb0513a"/><file name="pbb.gif" hash="fff306c0ea2e7568eef562ec3dc6edd8"/><file name="pbbtest.gif" hash="fff306c0ea2e7568eef562ec3dc6edd8"/><file name="pci.gif" hash="b55a87df550ea6789c17e389604e28e1"/><file name="seb.gif" hash="502b1dbeb81bce51abd1ea149d4dde14"/><file name="shb.gif" hash="0aa7c7fab4133ff4843c0ae73cabe9de"/><file name="solo.gif" hash="17b9be1a06125dcc7d1a6be8fea38dd6"/><file name="val.gif" hash="e62b75eb172934e118a70366baac51ee"/><file name="visa.gif" hash="b61251f8c428aa5dca017c9f374957ef"/><file name="visasecure.gif" hash="517118742fce249485c8eaf6df174764"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="Dibspw"><dir name="Dibspw"><file name="aktia.gif" hash="7afe00b19b4194fa4ffbdf20cdd469c1"/><file name="amex.gif" hash="f35f89ccdcb954e02a07f6c0a29c7b43"/><file name="bax.gif" hash="c315574fd839dae52a1316b6d8b836b6"/><file name="dibs.gif" hash="8b308757472fc5aaaedfefd5c79a2d54"/><file name="din.gif" hash="fabce04659a94993a230285b9a4651e9"/><file name="dk.gif" hash="daa5d5d2c0d541579b0e13aa3cd9d65b"/><file name="dnb.gif" hash="1f616c382b72248334f6aa1ca910003b"/><file name="edk.gif" hash="4485910a0fb40512233c1a59ddd31015"/><file name="elec.gif" hash="e5371ba0da9bb14990d1b8163cedd066"/><file name="elv.gif" hash="3bd20355343bd250a6a704fdbaf9ba62"/><file name="ew.gif" hash="b50385f7d878be6a3834310d1fbc3a1d"/><file name="ffk.gif" hash="d9cd7fa26230a850114b2dc99aea3b22"/><file name="fsb.gif" hash="d6da3e67f8096811c2ad0135b2aad80a"/><file name="git.gif" hash="b70e244f36e7aec94fe3f6373e1ae8d7"/><file name="ing.gif" hash="40f07b266bcd5953bb6c079f7eeaae67"/><file name="jcb.gif" hash="aea8c54e043a75b26887fa1307ad4312"/><file name="jcbsecure.gif" hash="1c687214f79b73d7e99f5011c9c22bce"/><file name="loading.gif" hash="7e99e1159a3686f6aa4f90043c554483"/><file name="mc.gif" hash="2680e078159e5aedb561c3a705801a44"/><file name="mcsecure.gif" hash="730735c1e2d36d9fa3bd6468fa0b1a7d"/><file name="moca.gif" hash="befd2f10976c0ab40333f01fc6db4743"/><file name="mtro.gif" hash="d5df5f7986a21bf5a78b9c7a3656facd"/><file name="oko.gif" hash="1cde3c12036ebd74a643aee2ffb0513a"/><file name="pbb.gif" hash="fff306c0ea2e7568eef562ec3dc6edd8"/><file name="pbbtest.gif" hash="fff306c0ea2e7568eef562ec3dc6edd8"/><file name="pci.gif" hash="b55a87df550ea6789c17e389604e28e1"/><file name="seb.gif" hash="502b1dbeb81bce51abd1ea149d4dde14"/><file name="shb.gif" hash="0aa7c7fab4133ff4843c0ae73cabe9de"/><file name="solo.gif" hash="17b9be1a06125dcc7d1a6be8fea38dd6"/><file name="val.gif" hash="e62b75eb172934e118a70366baac51ee"/><file name="visa.gif" hash="b61251f8c428aa5dca017c9f374957ef"/><file name="visasecure.gif" hash="517118742fce249485c8eaf6df174764"/></dir></dir></dir></dir></dir></dir></target></contents>
54
  <compatible/>
55
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
56
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Dibspw</name>
4
+ <version>4.1.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
33
  - Nordea e-betaling&#xD;
34
  &#xD;
35
  A complete list can be found at http://www.dibspayment.com/</description>
36
+ <notes>4.1.2&#xD;
37
+ - Confirmed compatibility with Magento 1.7.*&#xD;
38
+ - Improved stability by using more low-level Magento API integration&#xD;
39
+ - Improved compatibility with DIBS invoice payments&#xD;
40
+ - Added option to limit payment method usage by countries&#xD;
41
+ - Added Transaction ID to order confirmation mail&#xD;
42
+ &#xD;
43
+ 4.1.1&#xD;
44
  - Fixed error on redirect with expired session&#xD;
45
  - Improved compatibility with DIBS FlexWin Magento extension&#xD;
46
  - Fixed order statuses bug&#xD;
55
  4.1.0&#xD;
56
  - New module for DIBS Payment Window and Mobile Payment Window integration methods.</notes>
57
  <authors><author><name>DIBS A/S</name><user>niso</user><email>info@dibs.dk</email></author><author><name>DIBS A/S</name><user>dibs</user><email>vlya@dibs.dk</email></author></authors>
58
+ <date>2012-05-23</date>
59
+ <time>10:31:42</time>
60
+ <contents><target name="magecommunity"><dir name="Dibspw"><dir name="Dibspw"><dir name="Block"><file name="Failure.php" hash="17e6a66c34637fac033d3e04c9e6a45e"/><file name="Form.php" hash="ac2155fe9ed943a258118dfb127ea30f"/><file name="Info.php" hash="aac79075c0ac7a5e40951066d905dd81"/><file name="Redirect.php" hash="b67600699025f99eaadb6cc7f27b42b1"/></dir><dir name="Helper"><file name="Data.php" hash="3ac20dd79b0d2e0cc1609f6b65d330c5"/></dir><dir name="Model"><file name="Dibspw.php" hash="a6f0f9f1881fb08a2bb121d10a251164"/><dir name="Mysql4"><file name="Setup.php" hash="1c135886bc8a0794310ec7cb70e04e64"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Dibslogos.php" hash="d6cb9db1bd11f8cb40f79fc20fa9c44d"/><file name="Dibspaytypes.php" hash="7efbab315ad0cbdad7149f38c4a155d5"/><file name="Dibsyesno.php" hash="bd2708b2993a928f07215f09ba500094"/><file name="Lang.php" hash="80bf6fdae3628913d10b46f60608c517"/><file name="Orderstatusafter.php" hash="5eee0f6b02260a8ee1e696e1db266bd1"/><file name="Orderstatusbefore.php" hash="92f5f197b3c40d0f08703816c0b06066"/><file name="PBBdistribution.php" hash="670ced20a731d657081ab720ad9bbc7a"/><file name="Paymentwindow.php" hash="80f8f2fe024830e81c418b930bca544c"/></dir></dir></dir><dir name="dibs_api"><dir name="pw"><file name="dibs_pw_api.php" hash="0d64d872a9e70527a57ae2930506eca7"/><file name="dibs_pw_error.tmpl" hash="c609f6bd83ad67b2618a23866e26b545"/><file name="dibs_pw_helpers.php" hash="06e22bfbcdeaef0280e8228d36fc99fc"/><file name="dibs_pw_helpers_cms.php" hash="2b667d228533d5eac669301e47fff2a8"/><file name="dibs_pw_helpers_interface.php" hash="17a79ee1e27fdd1c6590c07133ba8c04"/></dir></dir></dir><dir name="controllers"><file name="DibspwController.php" hash="d23c9c0f390ad8d6dc2bfcfce00709eb"/></dir><dir name="etc"><file name="config.xml" hash="1bc286086f8358eda36efdb198108128"/><file name="system.xml" hash="5ed505376ffa018db94d117c888dbe2b"/></dir><dir name="sql"><dir name="dibspw_setup"><file name="mysql4-install-4.1.2.php" hash="0bbcb740b5a1d9d23a5293490224bf70"/><file name="mysql4-upgrade-4.1.1-4.1.2.php" hash="0bbcb740b5a1d9d23a5293490224bf70"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Dibspw_Dibspw.xml" hash="7c82595e6638c292f71a0ad5be4ecaf0"/></dir></target><target name="magelocale"><dir name="da_DK"><file name="Mage_Dibspw.csv" hash="0b55bcb08d4458f3632b3a412fb2ddd0"/></dir><dir name="en_US"><file name="Mage_Dibspw.csv" hash="3e594e54c13359360c83654fedb95ca3"/></dir><dir name="nb_NO"><file name="Mage_Dibspw.csv" hash="9f6d270cc121b8d8dcc37f90d8d1f239"/></dir><dir name="nn_NO"><file name="Mage_Dibspw.csv" hash="0cc0358a2be76cbfeac641fc2c87139c"/></dir><dir name="sv_SE"><file name="Mage_Dibspw.csv" hash="193932d6d644cec94d2bd0116cacd3b7"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="dibspw"><dir name="dibspw"><file name="failure.phtml" hash="f5a7ed44946651f7ad4b1beeca7499be"/><file name="form.phtml" hash="c101fa3c34271f92a8276e76310dd98f"/><file name="redirect.phtml" hash="b85fe4f98a059d3048738678299281c6"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="base"><dir name="default"><dir name="images"><dir name="Dibspw"><dir name="Dibspw"><file name="aktia.gif" hash="7afe00b19b4194fa4ffbdf20cdd469c1"/><file name="amex.gif" hash="f35f89ccdcb954e02a07f6c0a29c7b43"/><file name="bax.gif" hash="c315574fd839dae52a1316b6d8b836b6"/><file name="dibs.gif" hash="8b308757472fc5aaaedfefd5c79a2d54"/><file name="din.gif" hash="fabce04659a94993a230285b9a4651e9"/><file name="dk.gif" hash="daa5d5d2c0d541579b0e13aa3cd9d65b"/><file name="dnb.gif" hash="1f616c382b72248334f6aa1ca910003b"/><file name="edk.gif" hash="4485910a0fb40512233c1a59ddd31015"/><file name="elec.gif" hash="e5371ba0da9bb14990d1b8163cedd066"/><file name="elv.gif" hash="3bd20355343bd250a6a704fdbaf9ba62"/><file name="ew.gif" hash="b50385f7d878be6a3834310d1fbc3a1d"/><file name="ffk.gif" hash="d9cd7fa26230a850114b2dc99aea3b22"/><file name="fsb.gif" hash="d6da3e67f8096811c2ad0135b2aad80a"/><file name="git.gif" hash="b70e244f36e7aec94fe3f6373e1ae8d7"/><file name="ing.gif" hash="40f07b266bcd5953bb6c079f7eeaae67"/><file name="jcb.gif" hash="aea8c54e043a75b26887fa1307ad4312"/><file name="jcbsecure.gif" hash="1c687214f79b73d7e99f5011c9c22bce"/><file name="loading.gif" hash="7e99e1159a3686f6aa4f90043c554483"/><file name="mc.gif" hash="2680e078159e5aedb561c3a705801a44"/><file name="mcsecure.gif" hash="730735c1e2d36d9fa3bd6468fa0b1a7d"/><file name="moca.gif" hash="befd2f10976c0ab40333f01fc6db4743"/><file name="mtro.gif" hash="d5df5f7986a21bf5a78b9c7a3656facd"/><file name="oko.gif" hash="1cde3c12036ebd74a643aee2ffb0513a"/><file name="pbb.gif" hash="fff306c0ea2e7568eef562ec3dc6edd8"/><file name="pbbtest.gif" hash="fff306c0ea2e7568eef562ec3dc6edd8"/><file name="pci.gif" hash="b55a87df550ea6789c17e389604e28e1"/><file name="seb.gif" hash="502b1dbeb81bce51abd1ea149d4dde14"/><file name="shb.gif" hash="0aa7c7fab4133ff4843c0ae73cabe9de"/><file name="solo.gif" hash="17b9be1a06125dcc7d1a6be8fea38dd6"/><file name="val.gif" hash="e62b75eb172934e118a70366baac51ee"/><file name="visa.gif" hash="b61251f8c428aa5dca017c9f374957ef"/><file name="visasecure.gif" hash="517118742fce249485c8eaf6df174764"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="Dibspw"><dir name="Dibspw"><file name="aktia.gif" hash="7afe00b19b4194fa4ffbdf20cdd469c1"/><file name="amex.gif" hash="f35f89ccdcb954e02a07f6c0a29c7b43"/><file name="bax.gif" hash="c315574fd839dae52a1316b6d8b836b6"/><file name="dibs.gif" hash="8b308757472fc5aaaedfefd5c79a2d54"/><file name="din.gif" hash="fabce04659a94993a230285b9a4651e9"/><file name="dk.gif" hash="daa5d5d2c0d541579b0e13aa3cd9d65b"/><file name="dnb.gif" hash="1f616c382b72248334f6aa1ca910003b"/><file name="edk.gif" hash="4485910a0fb40512233c1a59ddd31015"/><file name="elec.gif" hash="e5371ba0da9bb14990d1b8163cedd066"/><file name="elv.gif" hash="3bd20355343bd250a6a704fdbaf9ba62"/><file name="ew.gif" hash="b50385f7d878be6a3834310d1fbc3a1d"/><file name="ffk.gif" hash="d9cd7fa26230a850114b2dc99aea3b22"/><file name="fsb.gif" hash="d6da3e67f8096811c2ad0135b2aad80a"/><file name="git.gif" hash="b70e244f36e7aec94fe3f6373e1ae8d7"/><file name="ing.gif" hash="40f07b266bcd5953bb6c079f7eeaae67"/><file name="jcb.gif" hash="aea8c54e043a75b26887fa1307ad4312"/><file name="jcbsecure.gif" hash="1c687214f79b73d7e99f5011c9c22bce"/><file name="loading.gif" hash="7e99e1159a3686f6aa4f90043c554483"/><file name="mc.gif" hash="2680e078159e5aedb561c3a705801a44"/><file name="mcsecure.gif" hash="730735c1e2d36d9fa3bd6468fa0b1a7d"/><file name="moca.gif" hash="befd2f10976c0ab40333f01fc6db4743"/><file name="mtro.gif" hash="d5df5f7986a21bf5a78b9c7a3656facd"/><file name="oko.gif" hash="1cde3c12036ebd74a643aee2ffb0513a"/><file name="pbb.gif" hash="fff306c0ea2e7568eef562ec3dc6edd8"/><file name="pbbtest.gif" hash="fff306c0ea2e7568eef562ec3dc6edd8"/><file name="pci.gif" hash="b55a87df550ea6789c17e389604e28e1"/><file name="seb.gif" hash="502b1dbeb81bce51abd1ea149d4dde14"/><file name="shb.gif" hash="0aa7c7fab4133ff4843c0ae73cabe9de"/><file name="solo.gif" hash="17b9be1a06125dcc7d1a6be8fea38dd6"/><file name="val.gif" hash="e62b75eb172934e118a70366baac51ee"/><file name="visa.gif" hash="b61251f8c428aa5dca017c9f374957ef"/><file name="visasecure.gif" hash="517118742fce249485c8eaf6df174764"/></dir></dir></dir></dir></dir></dir></target></contents>
61
  <compatible/>
62
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
63
  </package>