Version Notes
4.2.9.2
- Added possibility to use DIBS logos markup
4.2.9.1
- Fixed problem with HMAC when usin SID on frontend
- Small bugfixes.
4.2.9
- added new fields for invoice
- added partnerid
4.2.8
- Fixed problems with PENDING statuses
4.2.7
- Fixed bug with creating internal order.
- Fixed bug with fatal error on reorder transactions created with Dibs PW
- Fixed problem with PENDING statuses
4.2.6
- Small improvements and bugfixing
- When capturing return PENDING it handles like ACCEPT
4.2.5
- fixed bug with online
cancelling transaction
4.2.4
- fixed bugs in previous release 4.2.3
4.2.3
- Added capture, refund, cancel online
- small bugfixing
- cart is not empty on cancel
4.2.2
- Fixed problem with wrong rounding
4.2.1
- Removed language that not support
- Fixed problem with mobile numbers with dash
4.2.0
- added fee amount to order
4.1.9
- bugfixing release
4.1.8
- added support of Bundle Products
4.1.7
- utf encoding fixed
4.1.6
- Fixed bug with double quoted items names
- Fixed bug with HMAC code
- Added compatibility with compilation mode
- Added instruction for resolving problem with MAC code error
4.1.5
-Development
4.1.4
- Added Magento coupons support
- Fixed possible rounding issues;
- Removed Mobile Payment Window, now DIBS Payment Window can automatically scale to different screen sizes.
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
Download this release
Release Info
| Developer | DIBS A/S |
| Extension | Dibspw |
| Version | 4.2.9.2 |
| Comparing to | |
| See all releases | |
Code changes from version 4.2.8 to 4.2.9.2
- app/code/community/Dibspw/Dibspw/Model/Dibspw.php +172 -172
- app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_api.php +41 -31
- app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_helpers.php +5 -5
- app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_helpers_cms.php +214 -179
- app/code/community/Dibspw/Dibspw/etc/config.xml +1 -1
- app/code/community/Dibspw/Dibspw/etc/system.xml +57 -11
- app/code/community/Dibspw/Dibspw/sql/dibspw_setup/mysql4-upgrade-4.2.8-4.2.9.php +13 -0
- app/design/frontend/base/default/template/dibspw/dibspw/form.phtml +24 -5
- app/design/frontend/base/default/template/dibspw/dibspw/redirect.phtml +1 -1
- app/locale/da_DK/Mage_Dibspw.csv +7 -1
- app/locale/en_US/Mage_Dibspw.csv +14 -0
- app/locale/nb_NO/Mage_Dibspw.csv +7 -0
- app/locale/nn_NO/Mage_Dibspw.csv +7 -0
- app/locale/sv_SE/Mage_Dibspw.csv +7 -0
- package.xml +13 -6
app/code/community/Dibspw/Dibspw/Model/Dibspw.php
CHANGED
|
@@ -1,173 +1,173 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
/**
|
| 3 |
-
* Dibs A/S
|
| 4 |
-
* Dibs Payment Extension
|
| 5 |
-
*
|
| 6 |
-
* NOTICE OF LICENSE
|
| 7 |
-
*
|
| 8 |
-
* This source file is subject to the Open Software License (OSL 3.0)
|
| 9 |
-
* that is bundled with this package in the file LICENSE.txt.
|
| 10 |
-
* It is also available through the world-wide-web at this URL:
|
| 11 |
-
* http://opensource.org/licenses/osl-3.0.php
|
| 12 |
-
* If you did not receive a copy of the license and are unable to
|
| 13 |
-
* obtain it through the world-wide-web, please send an email
|
| 14 |
-
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
-
*
|
| 16 |
-
* @category Payments & Gateways Extensions
|
| 17 |
-
* @package Dibspw_Dibspw
|
| 18 |
-
* @author Dibs A/S
|
| 19 |
-
* @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
|
| 20 |
-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 21 |
-
*/
|
| 22 |
-
|
| 23 |
-
require_once Mage::getBaseDir('code').'/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_api.php';
|
| 24 |
-
|
| 25 |
-
class Dibspw_Dibspw_Model_Dibspw extends dibs_pw_api {
|
| 26 |
-
|
| 27 |
-
protected $_canReviewPayment = true;
|
| 28 |
-
protected $_isGateway = true;
|
| 29 |
-
protected $_canAuthorize = true;
|
| 30 |
-
protected $_canCapture = true;
|
| 31 |
-
protected $_canCapturePartial = true;
|
| 32 |
-
protected $_canRefund = true;
|
| 33 |
-
protected $_canRefundInvoicePartial = true;
|
| 34 |
-
protected $_canVoid = true;
|
| 35 |
-
protected $_canUseInternal = true;
|
| 36 |
-
protected $_canUseCheckout = true;
|
| 37 |
-
protected $_canUseForMultishipping = false;
|
| 38 |
-
protected $_canSaveCc = false;
|
| 39 |
-
protected $_isInitializeNeeded = true;
|
| 40 |
-
|
| 41 |
-
/**
|
| 42 |
-
* Payment method code
|
| 43 |
-
*
|
| 44 |
-
* @var string
|
| 45 |
-
*/
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
public function authorize(Varien_Object $payment, $amount) {
|
| 49 |
-
return $this;
|
| 50 |
-
}
|
| 51 |
-
|
| 52 |
-
|
| 53 |
-
|
| 54 |
-
|
| 55 |
-
/*
|
| 56 |
-
* Validate the currency code is avaialable to use for dibs or not
|
| 57 |
-
*/
|
| 58 |
-
public function validate() {
|
| 59 |
-
parent::validate();
|
| 60 |
-
return $this;
|
| 61 |
-
}
|
| 62 |
-
|
| 63 |
-
public function getCheckoutFormFields() {
|
| 64 |
-
$oOrder = Mage::getModel('sales/order');
|
| 65 |
-
$oOrder->loadByIncrementId(Mage::getSingleton('checkout/session')->getLastRealOrderId());
|
| 66 |
-
$aFields = $this->api_dibs_get_requestFields($oOrder);
|
| 67 |
-
|
| 68 |
-
return $aFields;
|
| 69 |
-
}
|
| 70 |
-
|
| 71 |
-
public function getOrderPlaceRedirectUrl() {
|
| 72 |
-
return Mage::getUrl('Dibspw/Dibspw/redirect', array('_secure' => true));
|
| 73 |
-
}
|
| 74 |
-
|
| 75 |
-
/** For capture **/
|
| 76 |
-
public function capture(Varien_Object $payment, $amount)
|
| 77 |
-
{
|
| 78 |
-
$result
|
| 79 |
-
|
| 80 |
-
switch ($result['status']) {
|
| 81 |
-
case 'ACCEPT':
|
| 82 |
-
$payment->setTransactionId($result['transaction_id']);
|
| 83 |
-
$payment->setIsTransactionClosed(false);
|
| 84 |
-
$payment->setStatus(Mage_Payment_Model_Method_Abstract::STATUS_APPROVED);
|
| 85 |
-
break;
|
| 86 |
-
case 'DECLINE':
|
| 87 |
-
$errorMsg = $this->_getHelper()->__("DEBS returned DECLINE check your payment in DIBS admin. Error msg: ".$result['message']);
|
| 88 |
-
$this->log("Capture DECLINE. Error message:".$result['message']);
|
| 89 |
-
break;
|
| 90 |
-
case 'ERROR':
|
| 91 |
-
$errorMsg = $this->_getHelper()->__("DIBS returned ERROR check your payment in DIBS admin. Error msg: ".$result['message']);
|
| 92 |
-
$this->log("Capture ERROR. Error message:".$result['message'], $result['transaction_id']);
|
| 93 |
-
break;
|
| 94 |
-
case 'PENDING':
|
| 95 |
-
$noticeMsg = "Transaction has been successfully added for a batch capture.
|
| 96 |
-
The result of the capture can be found in the administration.";
|
| 97 |
-
$this->log("Capture PENDING. Error message:".$result['message'], $result['transaction_id']);
|
| 98 |
-
Mage::getSingleton('core/session')->addNotice($noticeMsg);
|
| 99 |
-
break;
|
| 100 |
-
default:
|
| 101 |
-
$errorMsg = $this->_getHelper()->__("Error due online capture" . $result['message']);
|
| 102 |
-
$this->log("Capture uncnown error. Error message:".$result['message'], $result['transaction_id']);
|
| 103 |
-
break;
|
| 104 |
-
}
|
| 105 |
-
if($errorMsg){
|
| 106 |
-
Mage::throwException($errorMsg);
|
| 107 |
-
}
|
| 108 |
-
|
| 109 |
-
return $this;
|
| 110 |
-
}
|
| 111 |
-
|
| 112 |
-
public function refund(Varien_Object $payment, $amount)
|
| 113 |
-
{
|
| 114 |
-
$result = $this->callDibsApi($payment,$amount,'RefundTransaction');
|
| 115 |
-
switch ($result['status']) {
|
| 116 |
-
case 'ACCEPT':
|
| 117 |
-
$payment->setStatus(Mage_Payment_Model_Method_Abstract::STATUS_APPROVED);
|
| 118 |
-
break;
|
| 119 |
-
|
| 120 |
-
case 'ERROR' :
|
| 121 |
-
$errorMsg = $this->_getHelper()->__("Error due online refund" . $result['message']);
|
| 122 |
-
$this->log("Refund ERROR. Error message:".$result['message'], $result['transaction_id']);
|
| 123 |
-
break;
|
| 124 |
-
|
| 125 |
-
case 'DECLINE' :
|
| 126 |
-
$errorMsg = $this->_getHelper()->__("Refund attempt was DECLINED" . $result['message']);
|
| 127 |
-
$this->log("Refund DECLINE. Error message:".$result['message'], $result['transaction_id']);
|
| 128 |
-
break;
|
| 129 |
-
}
|
| 130 |
-
if($errorMsg){
|
| 131 |
-
Mage::throwException($errorMsg);
|
| 132 |
-
}
|
| 133 |
-
return $this;
|
| 134 |
-
}
|
| 135 |
-
|
| 136 |
-
|
| 137 |
-
public function cancel(Varien_Object $payment) {
|
| 138 |
-
|
| 139 |
-
$result = $this->callDibsApi($payment,$amount,'CancelTransaction');
|
| 140 |
-
switch ($result['status']) {
|
| 141 |
-
case 'ACCEPT':
|
| 142 |
-
$payment->setStatus(Mage_Payment_Model_Method_Abstract::STATUS_VOID);
|
| 143 |
-
break;
|
| 144 |
-
|
| 145 |
-
case 'ERROR' :
|
| 146 |
-
$errorMsg = $this->_getHelper()->__("Error due online cancel. Use DIBS Admin panel to manually cancel this transaction" . $result['message']);
|
| 147 |
-
$this->log("Cancel ERROR. Error message:".$result['message'], $result['transaction_id']);
|
| 148 |
-
break;
|
| 149 |
-
|
| 150 |
-
case 'DECLINE' :
|
| 151 |
-
$errorMsg = $this->_getHelper()->__("Cancel was DECLINED. Use DIBS Admin panel to manually cancel this transaction" . $result['message']);
|
| 152 |
-
$this->log("Cancel DECLINE. Error message:".$result['message'], $result['transaction_id']);
|
| 153 |
-
break;
|
| 154 |
-
|
| 155 |
-
default:
|
| 156 |
-
$errorMsg = $this->_getHelper()->__("Uncnown error was occured. Use DIBS Admin panel to manually cancel this transaction" . $result['message']);
|
| 157 |
-
$this->log("Cancel uncnown error. Error message:".$result['message'], $result['transaction_id']);
|
| 158 |
-
break;
|
| 159 |
-
}
|
| 160 |
-
|
| 161 |
-
if($errorMsg){
|
| 162 |
-
Mage::throwException($errorMsg);
|
| 163 |
-
}
|
| 164 |
-
return $this;
|
| 165 |
-
}
|
| 166 |
-
|
| 167 |
-
|
| 168 |
-
private function log($msg, $transaction) {
|
| 169 |
-
$msg = array('message' => $msg, 'transaction' => $transaction);
|
| 170 |
-
Mage::log($msg, null, 'dibs_pw.log');
|
| 171 |
-
}
|
| 172 |
-
|
| 173 |
}
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Dibs A/S
|
| 4 |
+
* Dibs Payment Extension
|
| 5 |
+
*
|
| 6 |
+
* NOTICE OF LICENSE
|
| 7 |
+
*
|
| 8 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 9 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 10 |
+
* It is also available through the world-wide-web at this URL:
|
| 11 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 12 |
+
* If you did not receive a copy of the license and are unable to
|
| 13 |
+
* obtain it through the world-wide-web, please send an email
|
| 14 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
+
*
|
| 16 |
+
* @category Payments & Gateways Extensions
|
| 17 |
+
* @package Dibspw_Dibspw
|
| 18 |
+
* @author Dibs A/S
|
| 19 |
+
* @copyright Copyright (c) 2010 Dibs A/S. (http://www.dibs.dk/)
|
| 20 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 21 |
+
*/
|
| 22 |
+
|
| 23 |
+
require_once Mage::getBaseDir('code').'/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_api.php';
|
| 24 |
+
|
| 25 |
+
class Dibspw_Dibspw_Model_Dibspw extends dibs_pw_api {
|
| 26 |
+
|
| 27 |
+
protected $_canReviewPayment = true;
|
| 28 |
+
protected $_isGateway = true;
|
| 29 |
+
protected $_canAuthorize = true;
|
| 30 |
+
protected $_canCapture = true;
|
| 31 |
+
protected $_canCapturePartial = true;
|
| 32 |
+
protected $_canRefund = true;
|
| 33 |
+
protected $_canRefundInvoicePartial = true;
|
| 34 |
+
protected $_canVoid = true;
|
| 35 |
+
protected $_canUseInternal = true;
|
| 36 |
+
protected $_canUseCheckout = true;
|
| 37 |
+
protected $_canUseForMultishipping = false;
|
| 38 |
+
protected $_canSaveCc = false;
|
| 39 |
+
protected $_isInitializeNeeded = true;
|
| 40 |
+
|
| 41 |
+
/**
|
| 42 |
+
* Payment method code
|
| 43 |
+
*
|
| 44 |
+
* @var string
|
| 45 |
+
*/
|
| 46 |
+
|
| 47 |
+
|
| 48 |
+
public function authorize(Varien_Object $payment, $amount) {
|
| 49 |
+
return $this;
|
| 50 |
+
}
|
| 51 |
+
|
| 52 |
+
|
| 53 |
+
|
| 54 |
+
|
| 55 |
+
/*
|
| 56 |
+
* Validate the currency code is avaialable to use for dibs or not
|
| 57 |
+
*/
|
| 58 |
+
public function validate() {
|
| 59 |
+
parent::validate();
|
| 60 |
+
return $this;
|
| 61 |
+
}
|
| 62 |
+
|
| 63 |
+
public function getCheckoutFormFields() {
|
| 64 |
+
$oOrder = Mage::getModel('sales/order');
|
| 65 |
+
$oOrder->loadByIncrementId(Mage::getSingleton('checkout/session')->getLastRealOrderId());
|
| 66 |
+
$aFields = $this->api_dibs_get_requestFields($oOrder);
|
| 67 |
+
|
| 68 |
+
return $aFields;
|
| 69 |
+
}
|
| 70 |
+
|
| 71 |
+
public function getOrderPlaceRedirectUrl() {
|
| 72 |
+
return Mage::getUrl('Dibspw/Dibspw/redirect', array('_secure' => true));
|
| 73 |
+
}
|
| 74 |
+
|
| 75 |
+
/** For capture **/
|
| 76 |
+
public function capture(Varien_Object $payment, $amount)
|
| 77 |
+
{
|
| 78 |
+
$result = $this->callDibsApi($payment, $amount, 'CaptureTransaction');
|
| 79 |
+
$errorMsg = '';
|
| 80 |
+
switch ($result['status']) {
|
| 81 |
+
case 'ACCEPT':
|
| 82 |
+
$payment->setTransactionId($result['transaction_id']);
|
| 83 |
+
$payment->setIsTransactionClosed(false);
|
| 84 |
+
$payment->setStatus(Mage_Payment_Model_Method_Abstract::STATUS_APPROVED);
|
| 85 |
+
break;
|
| 86 |
+
case 'DECLINE':
|
| 87 |
+
$errorMsg = $this->_getHelper()->__("DEBS returned DECLINE check your payment in DIBS admin. Error msg: ".$result['message']);
|
| 88 |
+
$this->log("Capture DECLINE. Error message:".$result['message']);
|
| 89 |
+
break;
|
| 90 |
+
case 'ERROR':
|
| 91 |
+
$errorMsg = $this->_getHelper()->__("DIBS returned ERROR check your payment in DIBS admin. Error msg: ".$result['message']);
|
| 92 |
+
$this->log("Capture ERROR. Error message:".$result['message'], $result['transaction_id']);
|
| 93 |
+
break;
|
| 94 |
+
case 'PENDING':
|
| 95 |
+
$noticeMsg = "Transaction has been successfully added for a batch capture.
|
| 96 |
+
The result of the capture can be found in the administration.";
|
| 97 |
+
$this->log("Capture PENDING. Error message:".$result['message'], $result['transaction_id']);
|
| 98 |
+
Mage::getSingleton('core/session')->addNotice($noticeMsg);
|
| 99 |
+
break;
|
| 100 |
+
default:
|
| 101 |
+
$errorMsg = $this->_getHelper()->__("Error due online capture" . $result['message']);
|
| 102 |
+
$this->log("Capture uncnown error. Error message:".$result['message'], $result['transaction_id']);
|
| 103 |
+
break;
|
| 104 |
+
}
|
| 105 |
+
if($errorMsg){
|
| 106 |
+
Mage::throwException($errorMsg);
|
| 107 |
+
}
|
| 108 |
+
|
| 109 |
+
return $this;
|
| 110 |
+
}
|
| 111 |
+
|
| 112 |
+
public function refund(Varien_Object $payment, $amount)
|
| 113 |
+
{
|
| 114 |
+
$result = $this->callDibsApi($payment,$amount,'RefundTransaction');
|
| 115 |
+
switch ($result['status']) {
|
| 116 |
+
case 'ACCEPT':
|
| 117 |
+
$payment->setStatus(Mage_Payment_Model_Method_Abstract::STATUS_APPROVED);
|
| 118 |
+
break;
|
| 119 |
+
|
| 120 |
+
case 'ERROR' :
|
| 121 |
+
$errorMsg = $this->_getHelper()->__("Error due online refund" . $result['message']);
|
| 122 |
+
$this->log("Refund ERROR. Error message:".$result['message'], $result['transaction_id']);
|
| 123 |
+
break;
|
| 124 |
+
|
| 125 |
+
case 'DECLINE' :
|
| 126 |
+
$errorMsg = $this->_getHelper()->__("Refund attempt was DECLINED" . $result['message']);
|
| 127 |
+
$this->log("Refund DECLINE. Error message:".$result['message'], $result['transaction_id']);
|
| 128 |
+
break;
|
| 129 |
+
}
|
| 130 |
+
if($errorMsg){
|
| 131 |
+
Mage::throwException($errorMsg);
|
| 132 |
+
}
|
| 133 |
+
return $this;
|
| 134 |
+
}
|
| 135 |
+
|
| 136 |
+
|
| 137 |
+
public function cancel(Varien_Object $payment) {
|
| 138 |
+
|
| 139 |
+
$result = $this->callDibsApi($payment,$amount,'CancelTransaction');
|
| 140 |
+
switch ($result['status']) {
|
| 141 |
+
case 'ACCEPT':
|
| 142 |
+
$payment->setStatus(Mage_Payment_Model_Method_Abstract::STATUS_VOID);
|
| 143 |
+
break;
|
| 144 |
+
|
| 145 |
+
case 'ERROR' :
|
| 146 |
+
$errorMsg = $this->_getHelper()->__("Error due online cancel. Use DIBS Admin panel to manually cancel this transaction" . $result['message']);
|
| 147 |
+
$this->log("Cancel ERROR. Error message:".$result['message'], $result['transaction_id']);
|
| 148 |
+
break;
|
| 149 |
+
|
| 150 |
+
case 'DECLINE' :
|
| 151 |
+
$errorMsg = $this->_getHelper()->__("Cancel was DECLINED. Use DIBS Admin panel to manually cancel this transaction" . $result['message']);
|
| 152 |
+
$this->log("Cancel DECLINE. Error message:".$result['message'], $result['transaction_id']);
|
| 153 |
+
break;
|
| 154 |
+
|
| 155 |
+
default:
|
| 156 |
+
$errorMsg = $this->_getHelper()->__("Uncnown error was occured. Use DIBS Admin panel to manually cancel this transaction" . $result['message']);
|
| 157 |
+
$this->log("Cancel uncnown error. Error message:".$result['message'], $result['transaction_id']);
|
| 158 |
+
break;
|
| 159 |
+
}
|
| 160 |
+
|
| 161 |
+
if($errorMsg){
|
| 162 |
+
Mage::throwException($errorMsg);
|
| 163 |
+
}
|
| 164 |
+
return $this;
|
| 165 |
+
}
|
| 166 |
+
|
| 167 |
+
|
| 168 |
+
private function log($msg, $transaction) {
|
| 169 |
+
$msg = array('message' => $msg, 'transaction' => $transaction);
|
| 170 |
+
Mage::log($msg, null, 'dibs_pw.log');
|
| 171 |
+
}
|
| 172 |
+
|
| 173 |
}
|
app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_api.php
CHANGED
|
@@ -54,7 +54,13 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 54 |
'paytype' => 'cardTypeName', 'actioncode' => 'actionCode',
|
| 55 |
'amountoriginal'=>'amountOriginal', 'sysmod' => 's_sysmod',
|
| 56 |
'validationerrors'=>'validationErrors',
|
| 57 |
-
'capturestatus' => 'captureStatus'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 58 |
|
| 59 |
/**
|
| 60 |
* Array of currency's two ISO formats relations.
|
|
@@ -179,7 +185,7 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 179 |
if(strpos($aData['callbackurl'], '/5c65f1600b8_dcbf.php') === FALSE) {
|
| 180 |
$aData['callbackurl'] = $this->helper_dibs_tools_url($aData['callbackurl']);
|
| 181 |
}
|
| 182 |
-
|
| 183 |
|
| 184 |
/**
|
| 185 |
* Adds Invoice API parameters specific for SAT PW.
|
|
@@ -214,7 +220,7 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 214 |
$aData['oiRow' . $i++] =
|
| 215 |
self::api_dibs_round($oItem->qty, 3) / 1000 . ';' .
|
| 216 |
'pcs;' .
|
| 217 |
-
self::api_dibs_utf8Fix(str_replace(
|
| 218 |
$iTmpPrice . ';' .
|
| 219 |
self::api_dibs_utf8Fix(str_replace(';','\;',$oItem->id)) .
|
| 220 |
(isset($oItem->tax) ? ';' . self::api_dibs_round($oItem->tax) : '');
|
|
@@ -252,32 +258,35 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 252 |
$this->helper_dibs_db_write(
|
| 253 |
"CREATE TABLE IF NOT EXISTS `" . $this->helper_dibs_tools_prefix() .
|
| 254 |
self::api_dibs_get_tableName() . "` (
|
| 255 |
-
|
| 256 |
-
|
| 257 |
-
|
| 258 |
-
|
| 259 |
-
|
| 260 |
-
|
| 261 |
-
|
| 262 |
-
|
| 263 |
-
|
| 264 |
-
|
| 265 |
-
|
| 266 |
-
|
| 267 |
-
|
| 268 |
-
|
| 269 |
-
|
| 270 |
-
|
| 271 |
-
|
| 272 |
-
|
| 273 |
-
|
| 274 |
-
|
| 275 |
-
|
| 276 |
-
|
| 277 |
-
|
| 278 |
-
|
| 279 |
-
|
| 280 |
-
|
|
|
|
|
|
|
|
|
|
| 281 |
) ENGINE=MyISAM DEFAULT CHARSET=utf8;"
|
| 282 |
);
|
| 283 |
}
|
|
@@ -300,10 +309,10 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 300 |
$iAmount = (isset($_POST['voucherAmount']) && $_POST['voucherAmount'] > 0) ?
|
| 301 |
$_POST['amountOriginal'] : $_POST['amount'];
|
| 302 |
if(abs((int)$iAmount - (int)self::api_dibs_round($mOrderInfo->amount)) >= 0.01) return 4;
|
| 303 |
-
|
| 304 |
if((int)$mOrderInfo->currency != (int)$_POST['currency']) return 6;
|
| 305 |
|
| 306 |
-
$sHMAC = $this->helper_dibs_tools_conf('
|
| 307 |
if(!empty($sHMAC) && self::api_dibs_checkMAC($sHMAC, $bUrlDecode) !== TRUE) return 7;
|
| 308 |
|
| 309 |
return 0;
|
|
@@ -412,6 +421,7 @@ class dibs_pw_api extends dibs_pw_helpers {
|
|
| 412 |
WHERE `orderid` = '" . self::api_dibs_sqlEncode($_POST['orderid']) . "'
|
| 413 |
LIMIT 1;"
|
| 414 |
);
|
|
|
|
| 415 |
}
|
| 416 |
}
|
| 417 |
|
| 54 |
'paytype' => 'cardTypeName', 'actioncode' => 'actionCode',
|
| 55 |
'amountoriginal'=>'amountOriginal', 'sysmod' => 's_sysmod',
|
| 56 |
'validationerrors'=>'validationErrors',
|
| 57 |
+
'capturestatus' => 'captureStatus',
|
| 58 |
+
'acquirerDeliveryAddress' => 'acquirerDeliveryAddress',
|
| 59 |
+
'acquirerDeliveryCountryCode' => 'acquirerDeliveryCountryCode',
|
| 60 |
+
'acquirerDeliveryPostalCode' => 'acquirerDeliveryPostalCode',
|
| 61 |
+
'acquirerDeliveryPostalPlace' => 'acquirerDeliveryPostalPlace',
|
| 62 |
+
'acquirerFirstName' => 'acquirerFirstName',
|
| 63 |
+
'acquirerLastName' => 'acquirerLastName');
|
| 64 |
|
| 65 |
/**
|
| 66 |
* Array of currency's two ISO formats relations.
|
| 185 |
if(strpos($aData['callbackurl'], '/5c65f1600b8_dcbf.php') === FALSE) {
|
| 186 |
$aData['callbackurl'] = $this->helper_dibs_tools_url($aData['callbackurl']);
|
| 187 |
}
|
| 188 |
+
}
|
| 189 |
|
| 190 |
/**
|
| 191 |
* Adds Invoice API parameters specific for SAT PW.
|
| 220 |
$aData['oiRow' . $i++] =
|
| 221 |
self::api_dibs_round($oItem->qty, 3) / 1000 . ';' .
|
| 222 |
'pcs;' .
|
| 223 |
+
self::api_dibs_utf8Fix(str_replace(array("\"", "&", ";"),array("'", "", "\;"), $sTmpName)) . ';' .
|
| 224 |
$iTmpPrice . ';' .
|
| 225 |
self::api_dibs_utf8Fix(str_replace(';','\;',$oItem->id)) .
|
| 226 |
(isset($oItem->tax) ? ';' . self::api_dibs_round($oItem->tax) : '');
|
| 258 |
$this->helper_dibs_db_write(
|
| 259 |
"CREATE TABLE IF NOT EXISTS `" . $this->helper_dibs_tools_prefix() .
|
| 260 |
self::api_dibs_get_tableName() . "` (
|
| 261 |
+
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
| 262 |
+
`orderid` varchar(100) NOT NULL DEFAULT '',
|
| 263 |
+
`status` varchar(10) NOT NULL DEFAULT '',
|
| 264 |
+
`testmode` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
| 265 |
+
`transaction` varchar(100) NOT NULL DEFAULT '',
|
| 266 |
+
`amount` int(10) unsigned NOT NULL DEFAULT '0',
|
| 267 |
+
`currency` varchar(3) NOT NULL DEFAULT '',
|
| 268 |
+
`fee` int(10) unsigned NOT NULL DEFAULT '0',
|
| 269 |
+
`paytype` varchar(32) NOT NULL DEFAULT '',
|
| 270 |
+
`voucheramount` int(10) unsigned NOT NULL DEFAULT '0',
|
| 271 |
+
`amountoriginal` int(10) unsigned NOT NULL DEFAULT '0',
|
| 272 |
+
`ext_info` text,
|
| 273 |
+
`validationerrors` text,
|
| 274 |
+
`capturestatus` varchar(10) NOT NULL DEFAULT '0',
|
| 275 |
+
`actioncode` varchar(20) NOT NULL DEFAULT '',
|
| 276 |
+
`success_action` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '0 = NotPerformed, 1 = Performed',
|
| 277 |
+
`cancel_action` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '0 = NotPerformed, 1 = Performed',
|
| 278 |
+
`callback_action` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '0 = NotPerformed, 1 = Performed',
|
| 279 |
+
`success_error` varchar(100) NOT NULL DEFAULT '',
|
| 280 |
+
`callback_error` varchar(100) NOT NULL DEFAULT '',
|
| 281 |
+
`sysmod` varchar(10) NOT NULL DEFAULT '',
|
| 282 |
+
`acquirerDeliveryAddress` varchar(250) NOT NULL,
|
| 283 |
+
`acquirerDeliveryCountryCode` varchar(50) NOT NULL,
|
| 284 |
+
`acquirerDeliveryPostalCode` varchar(50) NOT NULL,
|
| 285 |
+
`acquirerDeliveryPostalPlace` varchar(50) NOT NULL,
|
| 286 |
+
`acquirerFirstName` varchar(50) NOT NULL,
|
| 287 |
+
`acquirerLastName` varchar(50) NOT NULL,
|
| 288 |
+
PRIMARY KEY (`id`),
|
| 289 |
+
KEY `orderid` (`orderid`)
|
| 290 |
) ENGINE=MyISAM DEFAULT CHARSET=utf8;"
|
| 291 |
);
|
| 292 |
}
|
| 309 |
$iAmount = (isset($_POST['voucherAmount']) && $_POST['voucherAmount'] > 0) ?
|
| 310 |
$_POST['amountOriginal'] : $_POST['amount'];
|
| 311 |
if(abs((int)$iAmount - (int)self::api_dibs_round($mOrderInfo->amount)) >= 0.01) return 4;
|
| 312 |
+
|
| 313 |
if((int)$mOrderInfo->currency != (int)$_POST['currency']) return 6;
|
| 314 |
|
| 315 |
+
$sHMAC = $this->helper_dibs_tools_conf('HMAC');
|
| 316 |
if(!empty($sHMAC) && self::api_dibs_checkMAC($sHMAC, $bUrlDecode) !== TRUE) return 7;
|
| 317 |
|
| 318 |
return 0;
|
| 421 |
WHERE `orderid` = '" . self::api_dibs_sqlEncode($_POST['orderid']) . "'
|
| 422 |
LIMIT 1;"
|
| 423 |
);
|
| 424 |
+
|
| 425 |
}
|
| 426 |
}
|
| 427 |
|
app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_helpers.php
CHANGED
|
@@ -70,8 +70,7 @@ class dibs_pw_helpers extends dibs_pw_helpers_cms implements dibs_pw_helpers_int
|
|
| 70 |
* @return string
|
| 71 |
*/
|
| 72 |
function helper_dibs_tools_url($sLink) {
|
| 73 |
-
return Mage::
|
| 74 |
-
|
| 75 |
}
|
| 76 |
|
| 77 |
/**
|
|
@@ -229,8 +228,9 @@ class dibs_pw_helpers extends dibs_pw_helpers_cms implements dibs_pw_helpers_int
|
|
| 229 |
*/
|
| 230 |
function helper_dibs_obj_etc($mOrderInfo) {
|
| 231 |
return (object)array(
|
| 232 |
-
'sysmod' => '
|
| 233 |
-
'callbackfix' => $this->helper_dibs_tools_url("Dibspw/Dibspw/callback")
|
|
|
|
| 234 |
);
|
| 235 |
}
|
| 236 |
|
|
@@ -246,7 +246,7 @@ class dibs_pw_helpers extends dibs_pw_helpers_cms implements dibs_pw_helpers_int
|
|
| 246 |
$oSession->setQuoteId($oSession->getDibspwStandardQuoteId(true));
|
| 247 |
if (((int)$this->helper_dibs_tools_conf('sendmailorderconfirmation', '')) == 1) {
|
| 248 |
// Save fee to Order object if current order has fee
|
| 249 |
-
if( $_POST['fee'] ) {
|
| 250 |
$oOrder->setFeeAmount($_POST['fee']);
|
| 251 |
$oOrder->setData('fee_amount', $_POST['fee']);
|
| 252 |
$oOrder->save();
|
| 70 |
* @return string
|
| 71 |
*/
|
| 72 |
function helper_dibs_tools_url($sLink) {
|
| 73 |
+
return Mage::getModel('core/url')-> getRouteUrl($sLink,null);
|
|
|
|
| 74 |
}
|
| 75 |
|
| 76 |
/**
|
| 228 |
*/
|
| 229 |
function helper_dibs_obj_etc($mOrderInfo) {
|
| 230 |
return (object)array(
|
| 231 |
+
'sysmod' => 'mgn1_4_2_9',
|
| 232 |
+
'callbackfix' => $this->helper_dibs_tools_url("Dibspw/Dibspw/callback"),
|
| 233 |
+
'partnerid' => $this->helper_dibs_tools_conf('partnerid')
|
| 234 |
);
|
| 235 |
}
|
| 236 |
|
| 246 |
$oSession->setQuoteId($oSession->getDibspwStandardQuoteId(true));
|
| 247 |
if (((int)$this->helper_dibs_tools_conf('sendmailorderconfirmation', '')) == 1) {
|
| 248 |
// Save fee to Order object if current order has fee
|
| 249 |
+
if( isset($_POST['fee']) && $_POST['fee']) {
|
| 250 |
$oOrder->setFeeAmount($_POST['fee']);
|
| 251 |
$oOrder->setData('fee_amount', $_POST['fee']);
|
| 252 |
$oOrder->save();
|
app/code/community/Dibspw/Dibspw/Model/dibs_api/pw/dibs_pw_helpers_cms.php
CHANGED
|
@@ -1,180 +1,215 @@
|
|
| 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 |
-
|
| 16 |
-
$
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
|
| 23 |
-
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
-
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
|
| 34 |
-
|
| 35 |
-
|
| 36 |
-
|
| 37 |
-
|
| 38 |
-
|
| 39 |
-
|
| 40 |
-
|
| 41 |
-
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
|
| 45 |
-
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
|
| 51 |
-
|
| 52 |
-
|
| 53 |
-
|
| 54 |
-
|
| 55 |
-
$
|
| 56 |
-
|
| 57 |
-
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
| 62 |
-
|
| 63 |
-
|
| 64 |
-
|
| 65 |
-
|
| 66 |
-
|
| 67 |
-
|
| 68 |
-
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
| 77 |
-
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
|
| 83 |
-
|
| 84 |
-
|
| 85 |
-
|
| 86 |
-
|
| 87 |
-
|
| 88 |
-
|
| 89 |
-
|
| 90 |
-
|
| 91 |
-
|
| 92 |
-
|
| 93 |
-
|
| 94 |
-
|
| 95 |
-
|
| 96 |
-
|
| 97 |
-
|
| 98 |
-
|
| 99 |
-
|
| 100 |
-
|
| 101 |
-
|
| 102 |
-
|
| 103 |
-
|
| 104 |
-
|
| 105 |
-
|
| 106 |
-
|
| 107 |
-
|
| 108 |
-
|
| 109 |
-
|
| 110 |
-
|
| 111 |
-
|
| 112 |
-
|
| 113 |
-
|
| 114 |
-
|
| 115 |
-
|
| 116 |
-
|
| 117 |
-
|
| 118 |
-
|
| 119 |
-
|
| 120 |
-
|
| 121 |
-
|
| 122 |
-
|
| 123 |
-
|
| 124 |
-
|
| 125 |
-
|
| 126 |
-
|
| 127 |
-
|
| 128 |
-
|
| 129 |
-
|
| 130 |
-
|
| 131 |
-
|
| 132 |
-
|
| 133 |
-
|
| 134 |
-
|
| 135 |
-
|
| 136 |
-
|
| 137 |
-
|
| 138 |
-
|
| 139 |
-
|
| 140 |
-
|
| 141 |
-
|
| 142 |
-
|
| 143 |
-
|
| 144 |
-
|
| 145 |
-
|
| 146 |
-
|
| 147 |
-
|
| 148 |
-
|
| 149 |
-
|
| 150 |
-
|
| 151 |
-
|
| 152 |
-
|
| 153 |
-
|
| 154 |
-
|
| 155 |
-
|
| 156 |
-
|
| 157 |
-
|
| 158 |
-
|
| 159 |
-
|
| 160 |
-
|
| 161 |
-
|
| 162 |
-
|
| 163 |
-
|
| 164 |
-
|
| 165 |
-
|
| 166 |
-
|
| 167 |
-
|
| 168 |
-
|
| 169 |
-
|
| 170 |
-
|
| 171 |
-
|
| 172 |
-
|
| 173 |
-
|
| 174 |
-
|
| 175 |
-
|
| 176 |
-
|
| 177 |
-
|
| 178 |
-
|
| 179 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 180 |
?>
|
| 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 |
+
if(isset($_POST['orderid'])) {
|
| 16 |
+
$oOrder = Mage::getModel('sales/order')->loadByIncrementId($_POST['orderid']);
|
| 17 |
+
$bMailing = true;
|
| 18 |
+
}
|
| 19 |
+
}
|
| 20 |
+
if($oOrder !== NULL && is_callable(array($oOrder, 'getIncrementId'))) {
|
| 21 |
+
$iOid = $oOrder->getIncrementId();
|
| 22 |
+
if(!empty($iOid)) {
|
| 23 |
+
$oRead = Mage::getSingleton('core/resource')->getConnection('core_read');
|
| 24 |
+
$aRow = $oRead->fetchRow("SELECT `status`, `transaction`, `paytype`, `fee` FROM `" .
|
| 25 |
+
Mage::getConfig()->getTablePrefix() .
|
| 26 |
+
dibs_pw_api::api_dibs_get_tableName() .
|
| 27 |
+
"` WHERE `orderid` = " . $iOid . " LIMIT 1;");
|
| 28 |
+
if(count($aRow) > 0) {
|
| 29 |
+
if($aRow['status'] == 'ACCEPTED') {
|
| 30 |
+
if($aRow['transaction'] != '0') {
|
| 31 |
+
$aPayInfo[Mage::helper('dibspw')->__('DIBSPW_LABEL_8')] = $aRow['transaction'];
|
| 32 |
+
}
|
| 33 |
+
|
| 34 |
+
if($bMailing === FALSE) {
|
| 35 |
+
if(!empty($aRow['paytype'])) {
|
| 36 |
+
$aPayInfo[Mage::helper('dibspw')->__('DIBSPW_LABEL_12')] = $aRow['paytype'];
|
| 37 |
+
}
|
| 38 |
+
|
| 39 |
+
if(!empty($aRow['fee'])) {
|
| 40 |
+
$aPayInfo[Mage::helper('dibspw')->__('DIBSPW_LABEL_11')] =
|
| 41 |
+
$oOrder->getOrderCurrencyCode() . " " .
|
| 42 |
+
number_format(((int) $aRow['fee']) / 100, 2, ',', ' ');
|
| 43 |
+
}
|
| 44 |
+
}
|
| 45 |
+
}
|
| 46 |
+
else $aPayInfo[Mage::helper('dibspw')->__('DIBSPW_LABEL_25')] = Mage::helper('dibspw')->__('DIBSPW_LABEL_19');
|
| 47 |
+
}
|
| 48 |
+
}
|
| 49 |
+
}
|
| 50 |
+
|
| 51 |
+
return $aPayInfo;
|
| 52 |
+
}
|
| 53 |
+
|
| 54 |
+
public function cms_dibs_getAdminOrderInfo() {
|
| 55 |
+
$res = array();
|
| 56 |
+
$this->api_dibs_checkTable();
|
| 57 |
+
$oOrder = Mage::registry('current_order');
|
| 58 |
+
if($oOrder !== NULL && is_callable(array($oOrder, 'getIncrementId'))) {
|
| 59 |
+
$iOid = $oOrder->getIncrementId();
|
| 60 |
+
if(!empty($iOid)) {
|
| 61 |
+
$read = Mage::getSingleton('core/resource')->getConnection('core_read');
|
| 62 |
+
$row = $read->fetchRow("SELECT `status`, `transaction`, `amount`, `currency`, `fee`,
|
| 63 |
+
`paytype`, `acquirerFirstName`,`acquirerLastName`, `acquirerDeliveryAddress`,
|
| 64 |
+
`acquirerDeliveryPostalCode`, `acquirerDeliveryCountryCode`, `acquirerDeliveryPostalPlace` ,`ext_info` FROM " . Mage::getConfig()->getTablePrefix() .
|
| 65 |
+
dibs_pw_api::api_dibs_get_tableName() . "
|
| 66 |
+
WHERE orderid = " . $iOid . " LIMIT 1;");
|
| 67 |
+
|
| 68 |
+
if(count($row) > 0) {
|
| 69 |
+
if($row['status'] == 'ACCEPTED') {
|
| 70 |
+
$row['ext'] = (isset($row['ext_info']) && $row['ext_info'] != NULL) ?
|
| 71 |
+
unserialize($row['ext_info']) : array();
|
| 72 |
+
|
| 73 |
+
if(!empty($row['transaction'])) {
|
| 74 |
+
$res[Mage::helper('dibspw')->__('DIBSPW_LABEL_8')] = $row['transaction'];
|
| 75 |
+
}
|
| 76 |
+
|
| 77 |
+
if(!empty($row['amount'])) {
|
| 78 |
+
$res[Mage::helper('dibspw')->__('DIBSPW_LABEL_9')] = $oOrder->getOrderCurrencyCode() .
|
| 79 |
+
" " . number_format(((int) $row['amount']) / 100, 2, ',', ' ');
|
| 80 |
+
}
|
| 81 |
+
|
| 82 |
+
if(!empty($row['currency'])) {
|
| 83 |
+
$res[Mage::helper('dibspw')->__('DIBSPW_LABEL_10')] = $row['currency'];
|
| 84 |
+
}
|
| 85 |
+
|
| 86 |
+
if(!empty($row['fee'])) {
|
| 87 |
+
$res[Mage::helper('dibspw')->__('DIBSPW_LABEL_11')] = $oOrder->getOrderCurrencyCode() .
|
| 88 |
+
" " . number_format(((int) $row['fee']) / 100, 2, ',', ' ');
|
| 89 |
+
}
|
| 90 |
+
|
| 91 |
+
if(!empty($row['paytype'])) {
|
| 92 |
+
$res[Mage::helper('dibspw')->__('DIBSPW_LABEL_12')] = $row['paytype'];
|
| 93 |
+
}
|
| 94 |
+
|
| 95 |
+
if($row['ext']['acquirer'] != '0') {
|
| 96 |
+
$res[Mage::helper('dibspw')->__('DIBSPW_LABEL_16')] = $row['ext']['acquirer'];
|
| 97 |
+
}
|
| 98 |
+
|
| 99 |
+
if( isset($row['ext']['enrolled']) && $row['ext']['enrolled'] != '0') {
|
| 100 |
+
$res[Mage::helper('dibspw')->__('DIBSPW_LABEL_17')] = $row['ext']['enrolled'];
|
| 101 |
+
}
|
| 102 |
+
|
| 103 |
+
$res[Mage::helper('dibspw')->__('DIBSPW_LABEL_25')] = Mage::helper('dibspw')->__('DIBSPW_LABEL_18') .
|
| 104 |
+
': <a href="https://payment.architrade.com/admin/">https://payment.architrade.com/admin/</a>';
|
| 105 |
+
|
| 106 |
+
|
| 107 |
+
if(!empty($row['acquirerFirstName'])) {
|
| 108 |
+
$res[Mage::helper('dibspw')->__("DIBSPW_LABEL_31")] = $row['acquirerFirstName'];
|
| 109 |
+
}
|
| 110 |
+
|
| 111 |
+
|
| 112 |
+
if(!empty($row['acquirerLastName'])) {
|
| 113 |
+
$res[Mage::helper('dibspw')->__("DIBSPW_LABEL_30")] = $row['acquirerLastName'];
|
| 114 |
+
}
|
| 115 |
+
|
| 116 |
+
|
| 117 |
+
if(!empty($row['acquirerDeliveryAddress'])) {
|
| 118 |
+
$res[Mage::helper('dibspw')->__("DIBSPW_LABEL_32")] = $row['acquirerDeliveryAddress'];
|
| 119 |
+
}
|
| 120 |
+
|
| 121 |
+
|
| 122 |
+
if(!empty($row['acquirerDeliveryCountryCode'])) {
|
| 123 |
+
$res[Mage::helper('dibspw')->__("DIBSPW_LABEL_36")] = $row['acquirerDeliveryCountryCode'];
|
| 124 |
+
}
|
| 125 |
+
|
| 126 |
+
|
| 127 |
+
if(!empty($row['acquirerDeliveryPostalCode'])) {
|
| 128 |
+
$res[Mage::helper('dibspw')->__("DIBSPW_LABEL_33")] = $row['acquirerDeliveryPostalCode'];
|
| 129 |
+
}
|
| 130 |
+
|
| 131 |
+
|
| 132 |
+
if(!empty($row['acquirerDeliveryPostalPlace'])) {
|
| 133 |
+
$res[Mage::helper('dibspw')->__("DIBSPW_LABEL_34")] = $row['acquirerDeliveryPostalPlace'];
|
| 134 |
+
}
|
| 135 |
+
|
| 136 |
+
|
| 137 |
+
}
|
| 138 |
+
else $res[Mage::helper('dibspw')->__('DIBSPW_LABEL_25')] = Mage::helper('dibspw')->__('DIBSPW_LABEL_19');
|
| 139 |
+
}
|
| 140 |
+
}
|
| 141 |
+
}
|
| 142 |
+
// $res = array();
|
| 143 |
+
return $res;
|
| 144 |
+
}
|
| 145 |
+
|
| 146 |
+
public function cms_get_imgHtml($sLogo) {
|
| 147 |
+
$sImgUrl = Mage::getDesign()->getSkinUrl('images/Dibspw/Dibspw/' .
|
| 148 |
+
preg_replace("/(\(|\)|_)/s", "",
|
| 149 |
+
strtolower($sLogo)) . '.gif');
|
| 150 |
+
return (file_exists("." . strstr($sImgUrl, "/skin/"))) ?
|
| 151 |
+
'<img src="' . $sImgUrl . '" alt="' . htmlentities($sLogo) . '" />' : "";
|
| 152 |
+
}
|
| 153 |
+
|
| 154 |
+
public function setOrderStatusAfterPayment(){
|
| 155 |
+
$status = $_POST['status'];
|
| 156 |
+
$infoMessage = "";
|
| 157 |
+
switch($status) {
|
| 158 |
+
case "ACCEPTED":
|
| 159 |
+
$infoMessage = 'DIBSPW_LABEL_28';
|
| 160 |
+
break;
|
| 161 |
+
case "PENDING":
|
| 162 |
+
$infoMessage = 'DIBSPW_LABEL_27';
|
| 163 |
+
break;
|
| 164 |
+
case "DECLINED":
|
| 165 |
+
$infoMessage = 'DIBSPW_LABEL_29';
|
| 166 |
+
break;
|
| 167 |
+
}
|
| 168 |
+
|
| 169 |
+
$infoMessage = Mage::helper('dibspw')->__($infoMessage);
|
| 170 |
+
$order = Mage::getModel('sales/order');
|
| 171 |
+
$order->loadByIncrementId($_POST['orderid']);
|
| 172 |
+
|
| 173 |
+
if($status == "ACCEPTED") {
|
| 174 |
+
$order->setState($this->getConfigData('order_status_after_payment'),
|
| 175 |
+
true,
|
| 176 |
+
$infoMessage);
|
| 177 |
+
// Add fee to sales_order_table, if order has fee
|
| 178 |
+
if( isset($_POST['fee']) && $_POST['fee']) {
|
| 179 |
+
$order->setData('fee_amount', $_POST['fee']);
|
| 180 |
+
}
|
| 181 |
+
} else {
|
| 182 |
+
$order->addStatusHistoryComment($infoMessage);
|
| 183 |
+
}
|
| 184 |
+
$order->save();
|
| 185 |
+
|
| 186 |
+
}
|
| 187 |
+
|
| 188 |
+
/**
|
| 189 |
+
* Removes items from stock, depends on 'handlestock' module configuration option
|
| 190 |
+
* (used for successful payments)
|
| 191 |
+
*
|
| 192 |
+
* http://www.magentocommerce.com/wiki/groups/132/protx_form_-_subtracting_stock_on_successful_payment
|
| 193 |
+
*/
|
| 194 |
+
public function removeFromStock($iOrderId) {
|
| 195 |
+
$oSession = Mage::getSingleton('checkout/session');
|
| 196 |
+
$oSession->setDibspwStandardQuoteId($oSession->getQuoteId());
|
| 197 |
+
|
| 198 |
+
$oOrder = Mage::getModel('sales/order');
|
| 199 |
+
$oOrder->loadByIncrementId($iOrderId);
|
| 200 |
+
|
| 201 |
+
if (((int)$this->getConfigData('handlestock')) == 1) {
|
| 202 |
+
$oItems = $oOrder->getAllItems();
|
| 203 |
+
if ($oItems) {
|
| 204 |
+
foreach($oItems as $oItem) {
|
| 205 |
+
$oStock = Mage::getModel('cataloginventory/stock_item')
|
| 206 |
+
->loadByProduct($oItem->getProductId());
|
| 207 |
+
$oStock->setQty($oStock->getQty() - $oItem->getQtyOrdered());
|
| 208 |
+
$oStock->save();
|
| 209 |
+
continue;
|
| 210 |
+
}
|
| 211 |
+
}
|
| 212 |
+
}
|
| 213 |
+
}
|
| 214 |
+
}
|
| 215 |
?>
|
app/code/community/Dibspw/Dibspw/etc/config.xml
CHANGED
|
@@ -24,7 +24,7 @@
|
|
| 24 |
<config>
|
| 25 |
<modules>
|
| 26 |
<Dibspw_Dibspw>
|
| 27 |
-
<version>4.2.
|
| 28 |
<depends>
|
| 29 |
<Mage_Paygate />
|
| 30 |
</depends>
|
| 24 |
<config>
|
| 25 |
<modules>
|
| 26 |
<Dibspw_Dibspw>
|
| 27 |
+
<version>4.2.9.2</version>
|
| 28 |
<depends>
|
| 29 |
<Mage_Paygate />
|
| 30 |
</depends>
|
app/code/community/Dibspw/Dibspw/etc/system.xml
CHANGED
|
@@ -55,8 +55,17 @@
|
|
| 55 |
<show_in_website>1</show_in_website>
|
| 56 |
<show_in_store>1</show_in_store>
|
| 57 |
</title>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 58 |
<DIBSPW_mid translate="label">
|
| 59 |
-
<label>DIBS
|
| 60 |
<frontend_type>text</frontend_type>
|
| 61 |
<sort_order>3</sort_order>
|
| 62 |
<show_in_default>1</show_in_default>
|
|
@@ -193,15 +202,6 @@
|
|
| 193 |
<show_in_website>1</show_in_website>
|
| 194 |
<show_in_store>1</show_in_store>
|
| 195 |
</sendmailorderconfirmation>
|
| 196 |
-
<dibspwlogos translate="label">
|
| 197 |
-
<label>Which logos to show</label>
|
| 198 |
-
<frontend_type>multiselect</frontend_type>
|
| 199 |
-
<source_model>dibspw/system_config_source_dibslogos</source_model>
|
| 200 |
-
<sort_order>22</sort_order>
|
| 201 |
-
<show_in_default>1</show_in_default>
|
| 202 |
-
<show_in_website>1</show_in_website>
|
| 203 |
-
<show_in_store>1</show_in_store>
|
| 204 |
-
</dibspwlogos>
|
| 205 |
<handlestock translate="label">
|
| 206 |
<label>Handle stock. The quantity purchased in stock will at first be decremented as the payment is made.</label>
|
| 207 |
<frontend_type>select</frontend_type>
|
|
@@ -211,6 +211,52 @@
|
|
| 211 |
<show_in_website>1</show_in_website>
|
| 212 |
<show_in_store>1</show_in_store>
|
| 213 |
</handlestock>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 214 |
<sort_order translate="label">
|
| 215 |
<label>Sort Order</label>
|
| 216 |
<frontend_type>text</frontend_type>
|
|
@@ -218,7 +264,7 @@
|
|
| 218 |
<show_in_default>1</show_in_default>
|
| 219 |
<show_in_website>1</show_in_website>
|
| 220 |
<show_in_store>1</show_in_store>
|
| 221 |
-
</sort_order>
|
| 222 |
</fields>
|
| 223 |
</Dibspw>
|
| 224 |
</groups>
|
| 55 |
<show_in_website>1</show_in_website>
|
| 56 |
<show_in_store>1</show_in_store>
|
| 57 |
</title>
|
| 58 |
+
<DIBSPW_partnerid translate="label">
|
| 59 |
+
<label>Partner Id</label>
|
| 60 |
+
<frontend_type>text</frontend_type>
|
| 61 |
+
<sort_order>3</sort_order>
|
| 62 |
+
<show_in_default>1</show_in_default>
|
| 63 |
+
<show_in_website>1</show_in_website>
|
| 64 |
+
<show_in_store>1</show_in_store>
|
| 65 |
+
</DIBSPW_partnerid>
|
| 66 |
+
|
| 67 |
<DIBSPW_mid translate="label">
|
| 68 |
+
<label>DIBS Integration ID</label>
|
| 69 |
<frontend_type>text</frontend_type>
|
| 70 |
<sort_order>3</sort_order>
|
| 71 |
<show_in_default>1</show_in_default>
|
| 202 |
<show_in_website>1</show_in_website>
|
| 203 |
<show_in_store>1</show_in_store>
|
| 204 |
</sendmailorderconfirmation>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 205 |
<handlestock translate="label">
|
| 206 |
<label>Handle stock. The quantity purchased in stock will at first be decremented as the payment is made.</label>
|
| 207 |
<frontend_type>select</frontend_type>
|
| 211 |
<show_in_website>1</show_in_website>
|
| 212 |
<show_in_store>1</show_in_store>
|
| 213 |
</handlestock>
|
| 214 |
+
<cardlogos translate="label">
|
| 215 |
+
<label>Card logos:</label>
|
| 216 |
+
<frontend_type>textarea</frontend_type>
|
| 217 |
+
<sort_order>25</sort_order>
|
| 218 |
+
<show_in_default>1</show_in_default>
|
| 219 |
+
<show_in_website>1</show_in_website>
|
| 220 |
+
<show_in_store>1</show_in_store>
|
| 221 |
+
<comment>
|
| 222 |
+
<![CDATA[
|
| 223 |
+
You can use DIBS logos form our tech site on checkout form:
|
| 224 |
+
<a href="http://tech.dibspayment.com/logos#check-out-logos">http://tech.dibspayment.com/logos#check-out-logos</a>.
|
| 225 |
+
Choose logo, configure it and press "Copy" button. Then paste html markup for Cards, Netbank or Invoice.
|
| 226 |
+
]]>
|
| 227 |
+
</comment>
|
| 228 |
+
</cardlogos>
|
| 229 |
+
<netbanklogos translate="label">
|
| 230 |
+
<label>Netbank logos:</label>
|
| 231 |
+
<frontend_type>textarea</frontend_type>
|
| 232 |
+
<sort_order>26</sort_order>
|
| 233 |
+
<show_in_default>1</show_in_default>
|
| 234 |
+
<show_in_website>1</show_in_website>
|
| 235 |
+
<show_in_store>1</show_in_store>
|
| 236 |
+
<comment>
|
| 237 |
+
<![CDATA[
|
| 238 |
+
You can use DIBS logos form our tech site on checkout form:
|
| 239 |
+
<a href="http://tech.dibspayment.com/logos#check-out-logos">http://tech.dibspayment.com/logos#check-out-logos</a>.
|
| 240 |
+
Choose logo, configure it and press "Copy" button. Then paste html markup for Cards, Netbank or Invoice.
|
| 241 |
+
]]>
|
| 242 |
+
</comment>
|
| 243 |
+
</netbanklogos>
|
| 244 |
+
<invoicelogos translate="label">
|
| 245 |
+
<label>Invoice logos:</label>
|
| 246 |
+
<frontend_type>textarea</frontend_type>
|
| 247 |
+
<sort_order>27</sort_order>
|
| 248 |
+
<show_in_default>1</show_in_default>
|
| 249 |
+
<show_in_website>1</show_in_website>
|
| 250 |
+
<show_in_store>1</show_in_store>
|
| 251 |
+
<comment>
|
| 252 |
+
<![CDATA[
|
| 253 |
+
You can use DIBS logos form our tech site on checkout form:
|
| 254 |
+
<a href="http://tech.dibspayment.com/logos#check-out-logos">http://tech.dibspayment.com/logos#check-out-logos</a>.
|
| 255 |
+
Choose logo, configure it and press "Copy" button. Then paste html markup for Cards, Netbank or Invoice.
|
| 256 |
+
]]>
|
| 257 |
+
</comment>
|
| 258 |
+
</invoicelogos>
|
| 259 |
+
|
| 260 |
<sort_order translate="label">
|
| 261 |
<label>Sort Order</label>
|
| 262 |
<frontend_type>text</frontend_type>
|
| 264 |
<show_in_default>1</show_in_default>
|
| 265 |
<show_in_website>1</show_in_website>
|
| 266 |
<show_in_store>1</show_in_store>
|
| 267 |
+
</sort_order>
|
| 268 |
</fields>
|
| 269 |
</Dibspw>
|
| 270 |
</groups>
|
app/code/community/Dibspw/Dibspw/sql/dibspw_setup/mysql4-upgrade-4.2.8-4.2.9.php
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
$installer = $this;
|
| 3 |
+
$sTablePrefix = Mage::getConfig()->getTablePrefix();
|
| 4 |
+
$tableName = $sTablePrefix . "dibs_pw_results";
|
| 5 |
+
if ($installer->getConnection()->isTableExists($tableName)) {
|
| 6 |
+
$this->startSetup()
|
| 7 |
+
->run("ALTER TABLE `".$tableName."` ADD `acquirerDeliveryAddress` VARCHAR( 250 ) NOT NULL ,
|
| 8 |
+
ADD `acquirerDeliveryCountryCode` VARCHAR( 50 ) NOT NULL ,
|
| 9 |
+
ADD `acquirerDeliveryPostalCode` VARCHAR( 50 ) NOT NULL ,
|
| 10 |
+
ADD `acquirerDeliveryPostalPlace` VARCHAR( 50 ) NOT NULL ,
|
| 11 |
+
ADD `acquirerFirstName` VARCHAR( 50 ) NOT NULL ,
|
| 12 |
+
ADD `acquirerLastName` VARCHAR( 50 ) NOT NULL;")->endSetup();
|
| 13 |
+
}
|
app/design/frontend/base/default/template/dibspw/dibspw/form.phtml
CHANGED
|
@@ -1,5 +1,4 @@
|
|
| 1 |
<?php
|
| 2 |
-
|
| 3 |
/**
|
| 4 |
* Dibs A/S
|
| 5 |
* Dibs Payment Extension
|
|
@@ -26,7 +25,8 @@ $_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 |
-
$aLogoArray =
|
|
|
|
| 30 |
$sTrusted = '';
|
| 31 |
$sCards = '';
|
| 32 |
$iCards = 1;
|
|
@@ -48,7 +48,26 @@ foreach($aLogoArray as $item) {
|
|
| 48 |
if(!empty($sTrusted)) $sHTML .= '<br /><br />' . $sTrusted;
|
| 49 |
if(!empty($sCards)) $sHTML .= '<br /><br />' . $this->__('DIBSPW_LABEL_2') . '<br />' . $sCards;
|
| 50 |
|
| 51 |
-
$sHTML .= '
|
| 52 |
-
|
| 53 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 54 |
?>
|
| 1 |
<?php
|
|
|
|
| 2 |
/**
|
| 3 |
* Dibs A/S
|
| 4 |
* Dibs Payment Extension
|
| 25 |
$sHTML = '<fieldset class="form-list">
|
| 26 |
<ul id="payment_form_'.$_code. '" style="display:none">
|
| 27 |
<li>' . $this->__('DIBSPW_LABEL_1');
|
| 28 |
+
$aLogoArray = array();
|
| 29 |
+
explode(',', $paymate->getConfigData('dibspwlogos'));
|
| 30 |
$sTrusted = '';
|
| 31 |
$sCards = '';
|
| 32 |
$iCards = 1;
|
| 48 |
if(!empty($sTrusted)) $sHTML .= '<br /><br />' . $sTrusted;
|
| 49 |
if(!empty($sCards)) $sHTML .= '<br /><br />' . $this->__('DIBSPW_LABEL_2') . '<br />' . $sCards;
|
| 50 |
|
| 51 |
+
$sHTML .= $paymate->getConfigData('cardlogos');
|
| 52 |
+
$sHTML .= $paymate->getConfigData('netbanklogos');
|
| 53 |
+
$html = $paymate->getConfigData('invoicelogos');
|
| 54 |
+
$html = preg_replace('/class="dibs_brand_assets"/', "class=\"dibs_brand_assets\" id=\"dibs_invoice_container\"", $html);
|
| 55 |
+
$scriptPattern = '/(<script.*"(.*)".*"(.*)".*"(.*)".*>)/';
|
| 56 |
+
preg_match($scriptPattern, $html, $matches);
|
| 57 |
+
if( isset($matches[0]) && $matches[0] ) {
|
| 58 |
+
$src = $matches[2];
|
| 59 |
+
$data_dibs_terms_filename = $matches[3];
|
| 60 |
+
$data_terms_container_id = $matches[4];
|
| 61 |
+
$replacement = "<script type=\"text/javascript\">
|
| 62 |
+
var js = document.createElement(\"script\"); js.src = '". $src ."';
|
| 63 |
+
js.setAttribute('data-terms-container-id','".$data_terms_container_id."');
|
| 64 |
+
js.setAttribute('data-dibs-terms-filename','".$data_dibs_terms_filename."');
|
| 65 |
+
var container = document.getElementById(\"dibs_invoice_container\");
|
| 66 |
+
container.appendChild(js);
|
| 67 |
+
</script>";
|
| 68 |
+
$html = preg_replace('/< *script.*><\/script>/', $replacement, $html);
|
| 69 |
+
}
|
| 70 |
+
$sHTML .= $html;
|
| 71 |
+
$sHTML .= '</li></ul></fieldset>';
|
| 72 |
+
echo $sHTML;
|
| 73 |
?>
|
app/design/frontend/base/default/template/dibspw/dibspw/redirect.phtml
CHANGED
|
@@ -25,7 +25,7 @@ $oPaymate = Mage::getModel('dibspw/Dibspw');
|
|
| 25 |
$aDibsparmeter = $oPaymate->getCheckoutFormFields();
|
| 26 |
?>
|
| 27 |
<h2><?php echo $this->__('DIBSPW_LABEL_24') ?></h2>
|
| 28 |
-
<form method="post" id="dibspw-payment" action ="<?php echo
|
| 29 |
<div>
|
| 30 |
<?php foreach($aDibsparmeter as $sField => $sVal) {?>
|
| 31 |
<input type="hidden" name="<?php echo $sField; ?>" value="<?php echo htmlentities($sVal, ENT_QUOTES, 'UTF-8'); ?>" />
|
| 25 |
$aDibsparmeter = $oPaymate->getCheckoutFormFields();
|
| 26 |
?>
|
| 27 |
<h2><?php echo $this->__('DIBSPW_LABEL_24') ?></h2>
|
| 28 |
+
<form method="post" id="dibspw-payment" action ="<?php $dibs_api = new dibs_pw_api(); echo $dibs_api->api_dibs_get_formAction(); ?>">
|
| 29 |
<div>
|
| 30 |
<?php foreach($aDibsparmeter as $sField => $sVal) {?>
|
| 31 |
<input type="hidden" name="<?php echo $sField; ?>" value="<?php echo htmlentities($sVal, ENT_QUOTES, 'UTF-8'); ?>" />
|
app/locale/da_DK/Mage_Dibspw.csv
CHANGED
|
@@ -27,7 +27,13 @@
|
|
| 27 |
"DIBSPW_LABEL_27","'Callback' received from DIBS Payment Services with status 'PENDING'"
|
| 28 |
"DIBSPW_LABEL_28","'Callback' received from DIBS Payment Services with status 'ACCEPTED'"
|
| 29 |
"DIBSPW_LABEL_29","'Callback' received from DIBS Payment Services with status 'DECLINED'"
|
| 30 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 31 |
"dibspw_txt_err_0", "Error has occurred during payment verification"
|
| 32 |
"dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
|
| 33 |
"dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
|
| 27 |
"DIBSPW_LABEL_27","'Callback' received from DIBS Payment Services with status 'PENDING'"
|
| 28 |
"DIBSPW_LABEL_28","'Callback' received from DIBS Payment Services with status 'ACCEPTED'"
|
| 29 |
"DIBSPW_LABEL_29","'Callback' received from DIBS Payment Services with status 'DECLINED'"
|
| 30 |
+
"DIBSPW_LABEL_30","Acquirer Last Name"
|
| 31 |
+
"DIBSPW_LABEL_31","Acquirer First Name"
|
| 32 |
+
"DIBSPW_LABEL_32","Acquirer Delivery Address"
|
| 33 |
+
"DIBSPW_LABEL_33","Acquirer Delivery Postal Code"
|
| 34 |
+
"DIBSPW_LABEL_34","Acquirer Delivery Postal Place"
|
| 35 |
+
"DIBSPW_LABEL_35","Acquirer Delivery Address"
|
| 36 |
+
"DIBSPW_LABEL_36","Acquirer Delivery Country Code"
|
| 37 |
"dibspw_txt_err_0", "Error has occurred during payment verification"
|
| 38 |
"dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
|
| 39 |
"dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
|
app/locale/en_US/Mage_Dibspw.csv
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
"DIBSPW_LABEL_1","You have chosen to pay for the order online. Once you've completed your order, you will be transferred to the DIBS payment system. Here you need to process your payment. Once payment is completed, you will automatically be returned to our shop."
|
| 2 |
"DIBSPW_LABEL_2","You can pay with the following payment cards:"
|
| 3 |
"DIBSPW_LABEL_3","The order is now placed and payment must now be made in DIBS Payment Solution (www.dibspayment.com)"
|
|
@@ -27,6 +34,13 @@
|
|
| 27 |
"DIBSPW_LABEL_27","'Callback' received from DIBS Payment Services with status 'PENDING'"
|
| 28 |
"DIBSPW_LABEL_28","'Callback' received from DIBS Payment Services with status 'ACCEPTED'"
|
| 29 |
"DIBSPW_LABEL_29","'Callback' received from DIBS Payment Services with status 'DECLINED'"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
"dibspw_txt_err_0", "Error has occurred during payment verification"
|
| 31 |
"dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
|
| 32 |
"dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
|
| 1 |
+
BSPW_LABEL_30","Acquirer Last Name"
|
| 2 |
+
"DIBSPW_LABEL_31","Acquirer First Name"
|
| 3 |
+
"DIBSPW_LABEL_32","Acquirer Delivery Address"
|
| 4 |
+
"DIBSPW_LABEL_33","Acquirer Delivery Postal Code"
|
| 5 |
+
"DIBSPW_LABEL_34","Acquirer Delivery Postal Place"
|
| 6 |
+
"DIBSPW_LABEL_35","Acquirer Delivery Address"
|
| 7 |
+
"DIBSPW_LABEL_36","Acquirer Delivery Country Code"
|
| 8 |
"DIBSPW_LABEL_1","You have chosen to pay for the order online. Once you've completed your order, you will be transferred to the DIBS payment system. Here you need to process your payment. Once payment is completed, you will automatically be returned to our shop."
|
| 9 |
"DIBSPW_LABEL_2","You can pay with the following payment cards:"
|
| 10 |
"DIBSPW_LABEL_3","The order is now placed and payment must now be made in DIBS Payment Solution (www.dibspayment.com)"
|
| 34 |
"DIBSPW_LABEL_27","'Callback' received from DIBS Payment Services with status 'PENDING'"
|
| 35 |
"DIBSPW_LABEL_28","'Callback' received from DIBS Payment Services with status 'ACCEPTED'"
|
| 36 |
"DIBSPW_LABEL_29","'Callback' received from DIBS Payment Services with status 'DECLINED'"
|
| 37 |
+
"DIBSPW_LABEL_30","Acquirer Last Name"
|
| 38 |
+
"DIBSPW_LABEL_31","Acquirer First Name"
|
| 39 |
+
"DIBSPW_LABEL_32","Acquirer Delivery Address"
|
| 40 |
+
"DIBSPW_LABEL_33","Acquirer Delivery Postal Code"
|
| 41 |
+
"DIBSPW_LABEL_34","Acquirer Delivery Postal Place"
|
| 42 |
+
"DIBSPW_LABEL_35","Acquirer Delivery Address"
|
| 43 |
+
"DIBSPW_LABEL_36","Acquirer Delivery Country Code"
|
| 44 |
"dibspw_txt_err_0", "Error has occurred during payment verification"
|
| 45 |
"dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
|
| 46 |
"dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
|
app/locale/nb_NO/Mage_Dibspw.csv
CHANGED
|
@@ -27,6 +27,13 @@
|
|
| 27 |
"DIBSPW_LABEL_27","'Callback' received from DIBS Payment Services with status 'PENDING'"
|
| 28 |
"DIBSPW_LABEL_28","'Callback' received from DIBS Payment Services with status 'ACCEPTED'"
|
| 29 |
"DIBSPW_LABEL_29","'Callback' received from DIBS Payment Services with status 'DECLINED'"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
"dibspw_txt_err_0", "Error has occurred during payment verification"
|
| 31 |
"dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
|
| 32 |
"dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
|
| 27 |
"DIBSPW_LABEL_27","'Callback' received from DIBS Payment Services with status 'PENDING'"
|
| 28 |
"DIBSPW_LABEL_28","'Callback' received from DIBS Payment Services with status 'ACCEPTED'"
|
| 29 |
"DIBSPW_LABEL_29","'Callback' received from DIBS Payment Services with status 'DECLINED'"
|
| 30 |
+
"DIBSPW_LABEL_30","Acquirer Last Name"
|
| 31 |
+
"DIBSPW_LABEL_31","Acquirer First Name"
|
| 32 |
+
"DIBSPW_LABEL_32","Acquirer Delivery Address"
|
| 33 |
+
"DIBSPW_LABEL_33","Acquirer Delivery Postal Code"
|
| 34 |
+
"DIBSPW_LABEL_34","Acquirer Delivery Postal Place"
|
| 35 |
+
"DIBSPW_LABEL_35","Acquirer Delivery Address"
|
| 36 |
+
"DIBSPW_LABEL_36","Acquirer Delivery Country Code"
|
| 37 |
"dibspw_txt_err_0", "Error has occurred during payment verification"
|
| 38 |
"dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
|
| 39 |
"dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
|
app/locale/nn_NO/Mage_Dibspw.csv
CHANGED
|
@@ -27,6 +27,13 @@
|
|
| 27 |
"DIBSPW_LABEL_27","'Callback' received from DIBS Payment Services with status 'PENDING'"
|
| 28 |
"DIBSPW_LABEL_28","'Callback' received from DIBS Payment Services with status 'ACCEPTED'"
|
| 29 |
"DIBSPW_LABEL_29","'Callback' received from DIBS Payment Services with status 'DECLINED'"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
"dibspw_txt_err_0", "Error has occurred during payment verification"
|
| 31 |
"dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
|
| 32 |
"dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
|
| 27 |
"DIBSPW_LABEL_27","'Callback' received from DIBS Payment Services with status 'PENDING'"
|
| 28 |
"DIBSPW_LABEL_28","'Callback' received from DIBS Payment Services with status 'ACCEPTED'"
|
| 29 |
"DIBSPW_LABEL_29","'Callback' received from DIBS Payment Services with status 'DECLINED'"
|
| 30 |
+
"DIBSPW_LABEL_30","Acquirer Last Name"
|
| 31 |
+
"DIBSPW_LABEL_31","Acquirer First Name"
|
| 32 |
+
"DIBSPW_LABEL_32","Acquirer Delivery Address"
|
| 33 |
+
"DIBSPW_LABEL_33","Acquirer Delivery Postal Code"
|
| 34 |
+
"DIBSPW_LABEL_34","Acquirer Delivery Postal Place"
|
| 35 |
+
"DIBSPW_LABEL_35","Acquirer Delivery Address"
|
| 36 |
+
"DIBSPW_LABEL_36","Acquirer Delivery Country Code"
|
| 37 |
"dibspw_txt_err_0", "Error has occurred during payment verification"
|
| 38 |
"dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
|
| 39 |
"dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
|
app/locale/sv_SE/Mage_Dibspw.csv
CHANGED
|
@@ -27,6 +27,13 @@
|
|
| 27 |
"DIBSPW_LABEL_27","'Callback' received from DIBS Payment Services with status 'PENDING'"
|
| 28 |
"DIBSPW_LABEL_28","'Callback' received from DIBS Payment Services with status 'ACCEPTED'"
|
| 29 |
"DIBSPW_LABEL_29","'Callback' received from DIBS Payment Services with status 'DECLINED'"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
"dibspw_txt_err_0", "Error has occurred during payment verification"
|
| 31 |
"dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
|
| 32 |
"dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
|
| 27 |
"DIBSPW_LABEL_27","'Callback' received from DIBS Payment Services with status 'PENDING'"
|
| 28 |
"DIBSPW_LABEL_28","'Callback' received from DIBS Payment Services with status 'ACCEPTED'"
|
| 29 |
"DIBSPW_LABEL_29","'Callback' received from DIBS Payment Services with status 'DECLINED'"
|
| 30 |
+
"DIBSPW_LABEL_30","Acquirer Last Name"
|
| 31 |
+
"DIBSPW_LABEL_31","Acquirer First Name"
|
| 32 |
+
"DIBSPW_LABEL_32","Acquirer Delivery Address"
|
| 33 |
+
"DIBSPW_LABEL_33","Acquirer Delivery Postal Code"
|
| 34 |
+
"DIBSPW_LABEL_34","Acquirer Delivery Postal Place"
|
| 35 |
+
"DIBSPW_LABEL_35","Acquirer Delivery Address"
|
| 36 |
+
"DIBSPW_LABEL_36","Acquirer Delivery Country Code"
|
| 37 |
"dibspw_txt_err_0", "Error has occurred during payment verification"
|
| 38 |
"dibspw_txt_err_1", "No orderid was returned from DIBS payment gateway."
|
| 39 |
"dibspw_txt_err_2", "Unknown orderid was returned from DIBS payment gateway."
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Dibspw</name>
|
| 4 |
-
<version>4.2.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software License (OSL)</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -29,9 +29,16 @@ Card types accepted by the DIBS payment gateway: 
|
|
| 29 |
- Danske Bank e-betaling 
|
| 30 |
- Nordea e-betaling 
|
| 31 |
A complete list can be found at http://www.dibspayment.com/</description>
|
| 32 |
-
<notes>4.2.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 33 |
- Fixed problems with PENDING statuses
|
| 34 |
-

|
| 35 |
4.2.7
|
| 36 |
- Fixed bug with creating internal order.
|
| 37 |
- Fixed bug with fatal error on reorder transactions created with Dibs PW
|
|
@@ -96,9 +103,9 @@ cancelling transaction
|
|
| 96 |
4.1.0 
|
| 97 |
- New module for DIBS Payment Window and Mobile Payment Window integration methods </notes>
|
| 98 |
<authors><author><name>DIBS A/S</name><user>niso</user><email>info@dibs.dk</email></author></authors>
|
| 99 |
-
<date>2014-
|
| 100 |
-
<time>
|
| 101 |
-
<contents><target name="magecommunity"><dir name="Dibspw"><dir name="Dibspw"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><file name="Totals.php" hash="d94792c5d13cf9ee3b3fba51655989f8"/></dir><dir name="Invoice"><file name="Totals.php" hash="1294d0a40d42cafdb39d205953ec948c"/></dir><file name="Totals.php" hash="81ead413ddaf2030011fa57fbb485ab7"/></dir></dir></dir><file name="Failure.php" hash="17e6a66c34637fac033d3e04c9e6a45e"/><file name="Form.php" hash="ac2155fe9ed943a258118dfb127ea30f"/><file name="Info.php" hash="aab0d56dbc869c0af8c213b5adb8885b"/><file name="Redirect.php" hash="b67600699025f99eaadb6cc7f27b42b1"/></dir><dir name="Helper"><file name="Data.php" hash="fab1cad4db70b6928b0ac87c466f04af"/></dir><dir name="Model"><file name="Dibspw.php" hash="
|
| 102 |
<compatible/>
|
| 103 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 104 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Dibspw</name>
|
| 4 |
+
<version>4.2.9.2</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Open Software License (OSL)</license>
|
| 7 |
<channel>community</channel>
|
| 29 |
- Danske Bank e-betaling 
|
| 30 |
- Nordea e-betaling 
|
| 31 |
A complete list can be found at http://www.dibspayment.com/</description>
|
| 32 |
+
<notes>4.2.9.2
|
| 33 |
+
- Added possibility to use DIBS logos markup
|
| 34 |
+
4.2.9.1
|
| 35 |
+
- Fixed problem with HMAC when usin SID on frontend
|
| 36 |
+
- Small bugfixes.
|
| 37 |
+
4.2.9
|
| 38 |
+
- added new fields for invoice
|
| 39 |
+
- added partnerid
|
| 40 |
+
4.2.8
|
| 41 |
- Fixed problems with PENDING statuses
|
|
|
|
| 42 |
4.2.7
|
| 43 |
- Fixed bug with creating internal order.
|
| 44 |
- Fixed bug with fatal error on reorder transactions created with Dibs PW
|
| 103 |
4.1.0 
|
| 104 |
- New module for DIBS Payment Window and Mobile Payment Window integration methods </notes>
|
| 105 |
<authors><author><name>DIBS A/S</name><user>niso</user><email>info@dibs.dk</email></author></authors>
|
| 106 |
+
<date>2014-10-15</date>
|
| 107 |
+
<time>11:21:34</time>
|
| 108 |
+
<contents><target name="magecommunity"><dir name="Dibspw"><dir name="Dibspw"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><file name="Totals.php" hash="d94792c5d13cf9ee3b3fba51655989f8"/></dir><dir name="Invoice"><file name="Totals.php" hash="1294d0a40d42cafdb39d205953ec948c"/></dir><file name="Totals.php" hash="81ead413ddaf2030011fa57fbb485ab7"/></dir></dir></dir><file name="Failure.php" hash="17e6a66c34637fac033d3e04c9e6a45e"/><file name="Form.php" hash="ac2155fe9ed943a258118dfb127ea30f"/><file name="Info.php" hash="aab0d56dbc869c0af8c213b5adb8885b"/><file name="Redirect.php" hash="b67600699025f99eaadb6cc7f27b42b1"/></dir><dir name="Helper"><file name="Data.php" hash="fab1cad4db70b6928b0ac87c466f04af"/></dir><dir name="Model"><file name="Dibspw.php" hash="1a9e8bc96976eb42f11d2f3aef3875a9"/><dir name="Mysql4"><file name="Setup.php" hash="1c135886bc8a0794310ec7cb70e04e64"/></dir><file name="Observer.php" hash="8da24eeac1cc008206674667179b6287"/><dir name="Sales"><dir name="Order"><file name="Fee.php" hash="81e7ffa06e95d77600948df8b9580be6"/><dir name="Total"><dir name="Creditmemo"><file name="Fee.php" hash="9843ad38862dcb0eb3c188f4b087bcdb"/></dir><dir name="Invoice"><file name="Fee.php" hash="d07f43c019739fcc60cdb41e4d778d08"/></dir><dir name="Order"><file name="Fee.php" hash="f7058003197c940c7092889f756f48ec"/></dir></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Fee.php" hash="80faf1d3922ca905efeaacee82215af5"/></dir></dir></dir></dir><dir name="Service"><file name="Quote.php" hash="4c40330512775bded9a446c593118ee5"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Bundle.php" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="Dibslogos.php" hash="d6cb9db1bd11f8cb40f79fc20fa9c44d"/><file name="Dibspaytypes.php" hash="7efbab315ad0cbdad7149f38c4a155d5"/><file name="Dibsyesno.php" hash="bd2708b2993a928f07215f09ba500094"/><file name="Lang.php" hash="0e3de6f18a689e3bfde21a90a9fa179e"/><file name="Orderstatusafter.php" hash="b2f27bddca028be1769051c5b191f1cc"/><file name="Orderstatusbefore.php" hash="e5ff243f2f310609465310c3719327d3"/><file name="PBBdistribution.php" hash="670ced20a731d657081ab720ad9bbc7a"/></dir></dir></dir><dir name="dibs_api"><dir name="pw"><file name="dibs_pw_api.php" hash="1a0f193d42654ecdd8c56797e06ded93"/><file name="dibs_pw_helpers.php" hash="fcd969a9a36652c82fef9ec3354280e1"/><file name="dibs_pw_helpers_cms.php" hash="5d69de1ba2246a08fc1b45a6fd72fee2"/><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="f32aa3f39c570de36fe77570055d4464"/></dir><dir name="etc"><file name="config.xml" hash="55b9b9b9ba810ca05cda776bd822fb29"/><file name="system.xml" hash="f04ad9b209bcb9f555ddd40e0961ab86"/></dir><dir name="sql"><dir name="dibspw_setup"><file name="mysql4-install-4.2.7.php" hash="befcb176eb030b2a8e831c413e30c7b0"/><file name="mysql4-upgrade-4.2.8-4.2.9.php" hash="367888380e865556e98acdbe6e82ef56"/></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="nb_NO"><file name="Mage_Dibspw.csv" hash="ea9230be6b0639730ed1b0a2216058e5"/></dir><dir name="en_US"><file name="Mage_Dibspw.csv" hash="45a7092d4de73b1a97be480b9893e6eb"/></dir><dir name="sv_SE"><file name="Mage_Dibspw.csv" hash="51016f8447ab78bb1bc61a48aca5b0df"/></dir><dir name="nn_NO"><file name="Mage_Dibspw.csv" hash="0e47a4f66a02cb0322374c81138373eb"/></dir><dir name="da_DK"><file name="Mage_Dibspw.csv" hash="3bca7fb95c54b0854e97494680635652"/></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="d63eb6553dd1403f833a55640fd9e45f"/><dir name="order"><dir name="creditmemo"><file name="totals.phtml" hash="f0c4d178bc7f5b6d93d1a8c42833e0be"/></dir><dir name="invoice"><file name="totals.phtml" hash="8fd636f8685a44ed936daca2c7ff63aa"/></dir><file name="totals.phtml" hash="87db23cb809f5164cd898c1ffa5d36b4"/></dir><file name="redirect.phtml" hash="af36b7df90bd2a2c620e90f051172cd3"/></dir></dir></dir><dir name="layout"><file name="dibspw.xml" hash="53204bb9885269745c0fe234a629d429"/></dir></dir></dir></dir></target><target name="mageskin"><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>
|
| 109 |
<compatible/>
|
| 110 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 111 |
</package>
|
