Version Notes
4.1.3
- Removed protected Magento statuses from module configuration page (Closed, Completed)
- Fixed possible problems running extension on Windows-hosted Magento
- Page after cancel operation changed to orders list (instead of empty cart)
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.
Release Info
| Developer | DIBS A/S |
| Extension | Dibspw |
| Version | 4.1.3 |
| Comparing to | |
| See all releases | |
Code changes from version 4.1.2 to 4.1.3
- app/code/community/Dibspw/Dibspw/Model/Dibspw.php +1 -1
- app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Orderstatusafter.php +6 -1
- app/code/community/Dibspw/Dibspw/Model/System/Config/Source/Orderstatusbefore.php +6 -1
- app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_api.php +50 -51
- app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_error.tmpl +0 -15
- app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_helpers.php +1 -1
- app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_helpers_cms.php +1 -1
- app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/tmpl/dibs_pw_error +15 -0
- app/code/community/Dibspw/Dibspw/controllers/DibspwController.php +3 -4
- app/code/community/Dibspw/Dibspw/etc/config.xml +1 -1
- app/code/community/Dibspw/Dibspw/sql/dibspw_setup/{mysql4-install-4.1.2.php → mysql4-install-4.1.3.php} +0 -0
- app/code/community/Dibspw/Dibspw/sql/dibspw_setup/{mysql4-upgrade-4.1.1-4.1.2.php → mysql4-upgrade-4.1.2-4.1.3.php} +0 -0
- package.xml +10 -5
|
@@ -20,7 +20,7 @@
|
|
| 20 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 21 |
*/
|
| 22 |
|
| 23 |
-
require_once dirname(__FILE__) . '/dibs_api/pw/dibs_pw_api.php';
|
| 24 |
|
| 25 |
class Dibspw_Dibspw_Model_Dibspw extends dibs_pw_api {
|
| 26 |
|
| 20 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 21 |
*/
|
| 22 |
|
| 23 |
+
require_once str_replace("\\", "/", dirname(__FILE__)) . '/dibs_api/pw/dibs_pw_api.php';
|
| 24 |
|
| 25 |
class Dibspw_Dibspw_Model_Dibspw extends dibs_pw_api {
|
| 26 |
|
|
@@ -26,7 +26,12 @@ class Dibspw_Dibspw_Model_System_Config_Source_Orderstatusafter {
|
|
| 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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
|
| 31 |
return $aOpts;
|
| 32 |
}
|
| 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) {
|
| 30 |
+
if($sCode != Mage_Sales_Model_Order::STATE_COMPLETE &&
|
| 31 |
+
$sCode != Mage_Sales_Model_Order::STATE_CLOSED) {
|
| 32 |
+
$aOpts[] = array('value' => $sCode, 'label' => $sLabel);
|
| 33 |
+
}
|
| 34 |
+
}
|
| 35 |
|
| 36 |
return $aOpts;
|
| 37 |
}
|
|
@@ -26,7 +26,12 @@ class Dibspw_Dibspw_Model_System_Config_Source_Orderstatusbefore {
|
|
| 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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
|
| 31 |
return $aOpts;
|
| 32 |
}
|
| 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) {
|
| 30 |
+
if($sCode != Mage_Sales_Model_Order::STATE_COMPLETE &&
|
| 31 |
+
$sCode != Mage_Sales_Model_Order::STATE_CLOSED) {
|
| 32 |
+
$aOpts[] = array('value' => $sCode, 'label' => $sLabel);
|
| 33 |
+
}
|
| 34 |
+
}
|
| 35 |
|
| 36 |
return $aOpts;
|
| 37 |
}
|
|
@@ -1,15 +1,16 @@
|
|
| 1 |
<?php
|
| 2 |
-
require_once dirname(__FILE__) . '/dibs_pw_helpers_interface.php';
|
| 3 |
-
require_once dirname(__FILE__) . '/dibs_pw_helpers_cms.php';
|
| 4 |
-
require_once dirname(__FILE__) . '/dibs_pw_helpers.php';
|
| 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 $
|
|
|
|
|
|
|
|
|
|
| 13 |
|
| 14 |
private static $sDefaultCurr = array(0 => 'EUR', 1 => '978');
|
| 15 |
|
|
@@ -205,7 +206,7 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 205 |
self::api_dibs_utf8Fix(str_replace(";","\;",$oItem->id)) . ";" .
|
| 206 |
self::api_dibs_round($oItem->tax);
|
| 207 |
}
|
| 208 |
-
unset($iTmpPrice
|
| 209 |
}
|
| 210 |
}
|
| 211 |
if(!empty($aData['orderid'])) $aData['yourRef'] = $aData['orderid'];
|
|
@@ -256,11 +257,11 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 256 |
self::api_dibs_get_tableName() . "` (
|
| 257 |
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
| 258 |
`orderid` varchar(100) NOT NULL DEFAULT '',
|
| 259 |
-
`status` varchar(10) NOT NULL DEFAULT '
|
| 260 |
`testmode` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
| 261 |
`transaction` varchar(100) NOT NULL DEFAULT '',
|
| 262 |
`amount` int(10) unsigned NOT NULL DEFAULT '0',
|
| 263 |
-
`currency`
|
| 264 |
`fee` int(10) unsigned NOT NULL DEFAULT '0',
|
| 265 |
`paytype` varchar(32) NOT NULL DEFAULT '',
|
| 266 |
`voucheramount` int(10) unsigned NOT NULL DEFAULT '0',
|
|
@@ -317,39 +318,21 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 317 |
* @return string
|
| 318 |
*/
|
| 319 |
public function api_dibs_getFatalErrorPage($iCode) {
|
| 320 |
-
return self::api_dibs_renderTemplate(self::$
|
| 321 |
-
array('
|
| 322 |
-
'
|
| 323 |
'errcode' => $iCode,
|
| 324 |
-
'
|
| 325 |
-
'
|
| 326 |
'link_toshop' => $this->helper_dibs_obj_urls()->carturl,
|
| 327 |
-
'
|
| 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 |
/**
|
| 350 |
* Processes success redirect from payment gateway.
|
| 351 |
*
|
| 352 |
-
* @param mixed $mOrder
|
|
|
|
| 353 |
*/
|
| 354 |
final public function api_dibs_action_success($mOrder) {
|
| 355 |
$iErr = $this->api_dibs_checkMainFields($mOrder);
|
|
@@ -358,7 +341,7 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 358 |
'success_error' => $iErr));
|
| 359 |
}
|
| 360 |
|
| 361 |
-
return $iErr;
|
| 362 |
}
|
| 363 |
|
| 364 |
/**
|
|
@@ -384,11 +367,11 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 384 |
exit((string)$iErr);
|
| 385 |
}
|
| 386 |
|
| 387 |
-
$
|
| 388 |
-
|
| 389 |
-
WHERE `orderid` = '" . self::api_dibs_sqlEncode($_POST['orderid']) .
|
| 390 |
-
LIMIT 1;";
|
| 391 |
-
if(
|
| 392 |
$aFields = array('callback_action' => 1);
|
| 393 |
$aResponse = $_POST;
|
| 394 |
$iPayMethod = $this->api_dibs_get_method(TRUE);
|
|
@@ -405,7 +388,7 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 405 |
}
|
| 406 |
}
|
| 407 |
$aFields['ext_info'] = serialize($aResponse);
|
| 408 |
-
unset($aResponse
|
| 409 |
$this->api_dibs_updateResultRow($aFields);
|
| 410 |
|
| 411 |
if(method_exists($this, 'helper_dibs_hook_callback') &&
|
|
@@ -438,6 +421,31 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 438 |
}
|
| 439 |
}
|
| 440 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 441 |
/** DIBS API TOOLS START **/
|
| 442 |
/**
|
| 443 |
* Calculates MAC for given array of data.
|
|
@@ -553,15 +561,6 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 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 |
*
|
| 1 |
<?php
|
| 2 |
+
require_once str_replace("\\", "/", dirname(__FILE__)) . '/dibs_pw_helpers_interface.php';
|
| 3 |
+
require_once str_replace("\\", "/", dirname(__FILE__)) . '/dibs_pw_helpers_cms.php';
|
| 4 |
+
require_once str_replace("\\", "/", dirname(__FILE__)) . '/dibs_pw_helpers.php';
|
| 5 |
|
| 6 |
class dibs_pw_api extends dibs_pw_helpers {
|
| 7 |
|
| 8 |
private static $sDibsTable = 'dibs_pw_results';
|
|
|
|
|
|
|
| 9 |
|
| 10 |
+
private static $aTemplates = array('folder' => 'tmpl',
|
| 11 |
+
'marker' => '#',
|
| 12 |
+
'autotranslate' => array('lbl','msg', 'sts', 'err'),
|
| 13 |
+
'tmpls' => array('error' => 'dibs_pw_error'));
|
| 14 |
|
| 15 |
private static $sDefaultCurr = array(0 => 'EUR', 1 => '978');
|
| 16 |
|
| 206 |
self::api_dibs_utf8Fix(str_replace(";","\;",$oItem->id)) . ";" .
|
| 207 |
self::api_dibs_round($oItem->tax);
|
| 208 |
}
|
| 209 |
+
unset($iTmpPrice);
|
| 210 |
}
|
| 211 |
}
|
| 212 |
if(!empty($aData['orderid'])) $aData['yourRef'] = $aData['orderid'];
|
| 257 |
self::api_dibs_get_tableName() . "` (
|
| 258 |
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
| 259 |
`orderid` varchar(100) NOT NULL DEFAULT '',
|
| 260 |
+
`status` varchar(10) NOT NULL DEFAULT '',
|
| 261 |
`testmode` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
| 262 |
`transaction` varchar(100) NOT NULL DEFAULT '',
|
| 263 |
`amount` int(10) unsigned NOT NULL DEFAULT '0',
|
| 264 |
+
`currency` varchar(3) NOT NULL DEFAULT '',
|
| 265 |
`fee` int(10) unsigned NOT NULL DEFAULT '0',
|
| 266 |
`paytype` varchar(32) NOT NULL DEFAULT '',
|
| 267 |
`voucheramount` int(10) unsigned NOT NULL DEFAULT '0',
|
| 318 |
* @return string
|
| 319 |
*/
|
| 320 |
public function api_dibs_getFatalErrorPage($iCode) {
|
| 321 |
+
return self::api_dibs_renderTemplate(self::$aTemplates['tmpls']['error'],
|
| 322 |
+
array('errname_err' => 0,
|
| 323 |
+
'errcode_msg' => 'errcode',
|
| 324 |
'errcode' => $iCode,
|
| 325 |
+
'errmsg_msg' => 'errmsg',
|
| 326 |
+
'errmsg_err' => $iCode,
|
| 327 |
'link_toshop' => $this->helper_dibs_obj_urls()->carturl,
|
| 328 |
+
'toshop_msg' => toshop));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 329 |
}
|
| 330 |
|
| 331 |
/**
|
| 332 |
* Processes success redirect from payment gateway.
|
| 333 |
*
|
| 334 |
+
* @param mixed $mOrder
|
| 335 |
+
* @return int
|
| 336 |
*/
|
| 337 |
final public function api_dibs_action_success($mOrder) {
|
| 338 |
$iErr = $this->api_dibs_checkMainFields($mOrder);
|
| 341 |
'success_error' => $iErr));
|
| 342 |
}
|
| 343 |
|
| 344 |
+
return (int)$iErr;
|
| 345 |
}
|
| 346 |
|
| 347 |
/**
|
| 367 |
exit((string)$iErr);
|
| 368 |
}
|
| 369 |
|
| 370 |
+
$sResult = $this->helper_dibs_db_read_single("SELECT `status` FROM `" .
|
| 371 |
+
$this->helper_dibs_tools_prefix() . self::api_dibs_get_tableName() .
|
| 372 |
+
"` WHERE `orderid` = '" . self::api_dibs_sqlEncode($_POST['orderid']) .
|
| 373 |
+
"' LIMIT 1;", 'status');
|
| 374 |
+
if(empty($sResult)) {
|
| 375 |
$aFields = array('callback_action' => 1);
|
| 376 |
$aResponse = $_POST;
|
| 377 |
$iPayMethod = $this->api_dibs_get_method(TRUE);
|
| 388 |
}
|
| 389 |
}
|
| 390 |
$aFields['ext_info'] = serialize($aResponse);
|
| 391 |
+
unset($aResponse);
|
| 392 |
$this->api_dibs_updateResultRow($aFields);
|
| 393 |
|
| 394 |
if(method_exists($this, 'helper_dibs_hook_callback') &&
|
| 421 |
}
|
| 422 |
}
|
| 423 |
|
| 424 |
+
/**
|
| 425 |
+
* Simple template loader and renderer. Used to load fallback error template.
|
| 426 |
+
*
|
| 427 |
+
* @param string $sTmplName
|
| 428 |
+
* @param array $sParams
|
| 429 |
+
* @return string
|
| 430 |
+
*/
|
| 431 |
+
private function api_dibs_renderTemplate($sTmplName, $sParams = array()) {
|
| 432 |
+
$sTmpl = file_get_contents(str_replace("\\", "/", dirname(__FILE__)) . "/" .
|
| 433 |
+
self::$aTemplates['folder'] . "/" . $sTmplName);
|
| 434 |
+
if($sTmpl !== FALSE) {
|
| 435 |
+
foreach($sParams as $sKey => $sVal) {
|
| 436 |
+
$sValueType = substr($sKey, -3);
|
| 437 |
+
if(in_array($sValueType, self::$aTemplates['autotranslate'])) {
|
| 438 |
+
$sVal = $this->helper_dibs_tools_lang($sVal, $sValueType);
|
| 439 |
+
}
|
| 440 |
+
$sTmpl = str_replace(self::$aTemplates['marker'] . $sKey . self::$aTemplates['marker'],
|
| 441 |
+
$sVal, $sTmpl);
|
| 442 |
+
}
|
| 443 |
+
}
|
| 444 |
+
else $sTmpl = "";
|
| 445 |
+
|
| 446 |
+
return $sTmpl;
|
| 447 |
+
}
|
| 448 |
+
|
| 449 |
/** DIBS API TOOLS START **/
|
| 450 |
/**
|
| 451 |
* Calculates MAC for given array of data.
|
| 561 |
$sText : utf8_encode($sText);
|
| 562 |
}
|
| 563 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 564 |
/**
|
| 565 |
* Detects mobile device by user-agent and received headers.
|
| 566 |
*
|
|
@@ -1,15 +0,0 @@
|
|
| 1 |
-
<!doctype html>
|
| 2 |
-
<html>
|
| 3 |
-
<head>
|
| 4 |
-
<title>#errname#</title>
|
| 5 |
-
</head>
|
| 6 |
-
<body>
|
| 7 |
-
<h3>#errname#</h3>
|
| 8 |
-
<p>
|
| 9 |
-
#msg_errcode# #errcode#
|
| 10 |
-
<br />
|
| 11 |
-
#msg_errmsg# #err_errmsg#
|
| 12 |
-
</p>
|
| 13 |
-
<button type="submit" formaction="#link_toshop#">#msg_toshop#</button>
|
| 14 |
-
</body>
|
| 15 |
-
</html>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -185,7 +185,7 @@ class dibs_pw_helpers extends dibs_pw_helpers_cms implements dibs_pw_helpers_int
|
|
| 185 |
*/
|
| 186 |
function helper_dibs_obj_etc($mOrderInfo) {
|
| 187 |
return (object)array(
|
| 188 |
-
'sysmod' => '
|
| 189 |
'callbackfix' => $this->helper_dibs_tools_url("Dibspw/Dibspw/callback")
|
| 190 |
);
|
| 191 |
}
|
| 185 |
*/
|
| 186 |
function helper_dibs_obj_etc($mOrderInfo) {
|
| 187 |
return (object)array(
|
| 188 |
+
'sysmod' => 'mgn1_4_1_3',
|
| 189 |
'callbackfix' => $this->helper_dibs_tools_url("Dibspw/Dibspw/callback")
|
| 190 |
);
|
| 191 |
}
|
|
@@ -118,7 +118,7 @@ class dibs_pw_helpers_cms extends Mage_Payment_Model_Method_Abstract {
|
|
| 118 |
|
| 119 |
public function setOrderStatusAfterPayment(){
|
| 120 |
$order = Mage::getModel('sales/order');
|
| 121 |
-
$order->loadByIncrementId($
|
| 122 |
$order->setState($this->getConfigData('order_status_after_payment'),
|
| 123 |
true,
|
| 124 |
Mage::helper('dibspw')->__('DIBSPW_LABEL_22'));
|
| 118 |
|
| 119 |
public function setOrderStatusAfterPayment(){
|
| 120 |
$order = Mage::getModel('sales/order');
|
| 121 |
+
$order->loadByIncrementId($_POST['orderid']);
|
| 122 |
$order->setState($this->getConfigData('order_status_after_payment'),
|
| 123 |
true,
|
| 124 |
Mage::helper('dibspw')->__('DIBSPW_LABEL_22'));
|
|
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<!doctype html>
|
| 2 |
+
<html>
|
| 3 |
+
<head>
|
| 4 |
+
<title>#errname_err#</title>
|
| 5 |
+
</head>
|
| 6 |
+
<body>
|
| 7 |
+
<h3>#errname_err#</h3>
|
| 8 |
+
<p>
|
| 9 |
+
#errcode_msg# #errcode#
|
| 10 |
+
<br />
|
| 11 |
+
#errmsg_msg# #errmsg_err#
|
| 12 |
+
</p>
|
| 13 |
+
<button type="submit" formaction="#link_toshop#">#toshop_msg#</button>
|
| 14 |
+
</body>
|
| 15 |
+
</html>
|
|
@@ -97,18 +97,17 @@ class Dibspw_Dibspw_DibspwController extends Mage_Core_Controller_Front_Action {
|
|
| 97 |
$oOrder = Mage::getModel('sales/order');
|
| 98 |
|
| 99 |
if (isset($_POST['orderid'])) {
|
| 100 |
-
$oOrder->loadByIncrementId((int)$
|
| 101 |
$oOrder->registerCancellation($this->__('DIBSPW_LABEL_20'));
|
| 102 |
$oOrder->save();
|
| 103 |
|
| 104 |
// Add items back on stock (if used)
|
| 105 |
$this->oDibsModel->removeFromStock();
|
| 106 |
$this->oDibsModel->api_dibs_action_cancel();
|
| 107 |
-
|
| 108 |
-
}
|
| 109 |
// Give back cart to customer for new attempt to buy
|
| 110 |
Mage::app()->getFrontController()->getResponse()->setRedirect(
|
| 111 |
-
$this->oDibsModel->helper_dibs_tools_url('
|
| 112 |
);
|
| 113 |
}
|
| 114 |
|
| 97 |
$oOrder = Mage::getModel('sales/order');
|
| 98 |
|
| 99 |
if (isset($_POST['orderid'])) {
|
| 100 |
+
$oOrder->loadByIncrementId((int)$_POST['orderid']);
|
| 101 |
$oOrder->registerCancellation($this->__('DIBSPW_LABEL_20'));
|
| 102 |
$oOrder->save();
|
| 103 |
|
| 104 |
// Add items back on stock (if used)
|
| 105 |
$this->oDibsModel->removeFromStock();
|
| 106 |
$this->oDibsModel->api_dibs_action_cancel();
|
| 107 |
+
}
|
|
|
|
| 108 |
// Give back cart to customer for new attempt to buy
|
| 109 |
Mage::app()->getFrontController()->getResponse()->setRedirect(
|
| 110 |
+
$this->oDibsModel->helper_dibs_tools_url('sales/order/history')
|
| 111 |
);
|
| 112 |
}
|
| 113 |
|
|
@@ -24,7 +24,7 @@
|
|
| 24 |
<config>
|
| 25 |
<modules>
|
| 26 |
<Dibspw_Dibspw>
|
| 27 |
-
<version>4.1.
|
| 28 |
<depends>
|
| 29 |
<Mage_Paygate />
|
| 30 |
</depends>
|
| 24 |
<config>
|
| 25 |
<modules>
|
| 26 |
<Dibspw_Dibspw>
|
| 27 |
+
<version>4.1.3</version>
|
| 28 |
<depends>
|
| 29 |
<Mage_Paygate />
|
| 30 |
</depends>
|
|
File without changes
|
|
File without changes
|
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Dibspw</name>
|
| 4 |
-
<version>4.1.
|
| 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,12 @@ Card types accepted by the DIBS payment gateway:
|
|
| 33 |
- Nordea e-betaling
|
| 34 |

|
| 35 |
A complete list can be found at http://www.dibspayment.com/</description>
|
| 36 |
-
<notes>4.1.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 37 |
- Confirmed compatibility with Magento 1.7.*
|
| 38 |
- Improved stability by using more low-level Magento API integration
|
| 39 |
- Improved compatibility with DIBS invoice payments
|
|
@@ -55,9 +60,9 @@ A complete list can be found at http://www.dibspayment.com/</description>
|
|
| 55 |
4.1.0
|
| 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-
|
| 59 |
-
<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="
|
| 61 |
<compatible/>
|
| 62 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 63 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Dibspw</name>
|
| 4 |
+
<version>4.1.3</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
|
| 34 |

|
| 35 |
A complete list can be found at http://www.dibspayment.com/</description>
|
| 36 |
+
<notes>4.1.3
|
| 37 |
+
- Removed protected Magento statuses from module configuration page (Closed, Completed)
|
| 38 |
+
- Fixed possible problems running extension on Windows-hosted Magento
|
| 39 |
+
- Page after cancel operation changed to orders list (instead of empty cart)
|
| 40 |
+

|
| 41 |
+
4.1.2
|
| 42 |
- Confirmed compatibility with Magento 1.7.*
|
| 43 |
- Improved stability by using more low-level Magento API integration
|
| 44 |
- Improved compatibility with DIBS invoice payments
|
| 60 |
4.1.0
|
| 61 |
- New module for DIBS Payment Window and Mobile Payment Window integration methods.</notes>
|
| 62 |
<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>
|
| 63 |
+
<date>2012-05-29</date>
|
| 64 |
+
<time>09:12:05</time>
|
| 65 |
+
<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="0898bd3d28ed17af8ba814db99270369"/><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="b2f27bddca028be1769051c5b191f1cc"/><file name="Orderstatusbefore.php" hash="e5ff243f2f310609465310c3719327d3"/><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="e49aac73131e92567e6c60323a6daad5"/><file name="dibs_pw_helpers.php" hash="3129cd863c5598a1780351825e82a851"/><file name="dibs_pw_helpers_cms.php" hash="8cf27737fbb3411c89219f9c6be0b43e"/><file name="dibs_pw_helpers_interface.php" hash="17a79ee1e27fdd1c6590c07133ba8c04"/><dir name="tmpl"><file name="dibs_pw_error" hash="7f82ad3b9f30425d21cc8991d7c90bf5"/></dir></dir></dir></dir><dir name="controllers"><file name="DibspwController.php" hash="56f56627a159bf4b02031906d6cee932"/></dir><dir name="etc"><file name="config.xml" hash="591b2e5136ef3de2c254a661726972e7"/><file name="system.xml" hash="5ed505376ffa018db94d117c888dbe2b"/></dir><dir name="sql"><dir name="dibspw_setup"><file name="mysql4-install-4.1.3.php" hash="0bbcb740b5a1d9d23a5293490224bf70"/><file name="mysql4-upgrade-4.1.2-4.1.3.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>
|
| 66 |
<compatible/>
|
| 67 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 68 |
</package>
|
