Version Notes
1.0.0.6
- Fixed currency bug
- Added order information to DIBS payment process
1.0.0.5
- Added extra complete status for order
1.0.0.3
- Added order information to DIBS payment process
1.0.0.2
- Minor language update
1.0.0.1
- Added languages:
Danish, Norwegian, Swedish
- Added support for "Skip accept page"
First release 1.0.0.0
Download this release
Release Info
Developer | Magento Core Team |
Extension | Dibs |
Version | 1.0.0.6 |
Comparing to | |
See all releases |
Code changes from version 1.0.0.5 to 1.0.0.6
- app/code/local/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php +311 -0
- app/code/local/Mage/Dibs/Model/Standard.php +1 -1
- app/code/local/Mage/Sales/Block/Order/Info.php +250 -0
- app/code/local/Mage/Sales/Block/Order/Print.php +207 -0
- app/design/frontend/default/default/template/dibs/standard/redirect_flexwin.phtml +1 -1
- app/design/frontend/default/default/template/dibs/standard/redirect_paymentwindow.phtml +1 -1
- package.xml +9 -5
app/code/local/Mage/Adminhtml/Block/Sales/Order/View/Tab/Info.php
ADDED
@@ -0,0 +1,311 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category Mage
|
22 |
+
* @package Mage_Adminhtml
|
23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
|
27 |
+
/**
|
28 |
+
* Order information tab
|
29 |
+
*
|
30 |
+
* @category Mage
|
31 |
+
* @package Mage_Adminhtml
|
32 |
+
* @author Magento Core Team <core@magentocommerce.com>
|
33 |
+
*/
|
34 |
+
class Mage_Adminhtml_Block_Sales_Order_View_Tab_Info
|
35 |
+
extends Mage_Adminhtml_Block_Sales_Order_Abstract
|
36 |
+
implements Mage_Adminhtml_Block_Widget_Tab_Interface
|
37 |
+
{
|
38 |
+
/**
|
39 |
+
* Retrieve order model instance
|
40 |
+
*
|
41 |
+
* @return Mage_Sales_Model_Order
|
42 |
+
*/
|
43 |
+
public function getOrder()
|
44 |
+
{
|
45 |
+
return Mage::registry('current_order');
|
46 |
+
}
|
47 |
+
|
48 |
+
/**
|
49 |
+
* Retrieve source model instance
|
50 |
+
*
|
51 |
+
* @return Mage_Sales_Model_Order
|
52 |
+
*/
|
53 |
+
public function getSource()
|
54 |
+
{
|
55 |
+
return $this->getOrder();
|
56 |
+
}
|
57 |
+
|
58 |
+
/**
|
59 |
+
* Retrieve order totals block settings
|
60 |
+
*
|
61 |
+
* @return array
|
62 |
+
*/
|
63 |
+
public function getOrderTotalData()
|
64 |
+
{
|
65 |
+
return array(
|
66 |
+
'can_display_total_due' => true,
|
67 |
+
'can_display_total_paid' => true,
|
68 |
+
'can_display_total_refunded' => true,
|
69 |
+
);
|
70 |
+
}
|
71 |
+
|
72 |
+
public function getOrderInfoData()
|
73 |
+
{
|
74 |
+
return array(
|
75 |
+
'no_use_order_link' => true,
|
76 |
+
);
|
77 |
+
}
|
78 |
+
|
79 |
+
public function getTrackingHtml()
|
80 |
+
{
|
81 |
+
return $this->getChildHtml('order_tracking');
|
82 |
+
}
|
83 |
+
|
84 |
+
public function getItemsHtml()
|
85 |
+
{
|
86 |
+
return $this->getChildHtml('order_items');
|
87 |
+
}
|
88 |
+
|
89 |
+
/**
|
90 |
+
* Retrive giftmessage block html
|
91 |
+
*
|
92 |
+
* @return string
|
93 |
+
*/
|
94 |
+
public function getGiftmessageHtml()
|
95 |
+
{
|
96 |
+
return $this->getChildHtml('order_giftmessage');
|
97 |
+
}
|
98 |
+
|
99 |
+
public function getPaymentHtml()
|
100 |
+
{
|
101 |
+
$res = $this->getChildHtml('order_payment');
|
102 |
+
|
103 |
+
//
|
104 |
+
// Read info directly from the database
|
105 |
+
$read = Mage::getSingleton('core/resource')->getConnection('core_read');
|
106 |
+
$row = $read->fetchRow("select * from dibs_order_status where orderid = " . $this->getOrder()->getIncrementId());
|
107 |
+
|
108 |
+
$standard = Mage::getModel('dibs/standard');
|
109 |
+
if ($row['status'] == '1') {
|
110 |
+
//
|
111 |
+
// Payment has been made to this order
|
112 |
+
$res .= "<br><br>" . "<table border='0' width='100%'>";
|
113 |
+
$res .= "<tr><td colspan='2'><b>" . Mage::helper('dibs')->__('DIBS_LABEL_7') . "</b></td></tr>";
|
114 |
+
if ($row['transact'] != '0') {
|
115 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_8') . "</td>";
|
116 |
+
$res .= "<td>" . $row['transact'] . "</td></tr>";
|
117 |
+
}
|
118 |
+
if ($row['amount'] != '0') {
|
119 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_9') . "</td>";
|
120 |
+
$res .= "<td>" . $this->getOrder()->getOrderCurrencyCode() . " " . number_format(((int)$row['amount']) / 100, 2, ',', ' ') . "</td></tr>";
|
121 |
+
}
|
122 |
+
if ($row['currency'] != '0') {
|
123 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_10') . "</td>";
|
124 |
+
$res .= "<td>" . $row['currency'] . "</td></tr>";
|
125 |
+
}
|
126 |
+
if ($row['fee'] != '0') {
|
127 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_11') . "</td>";
|
128 |
+
$res .= "<td>" . $this->getOrder()->getOrderCurrencyCode() . " " . number_format(((int)$row['fee']) / 100, 2, ',', ' ') . "</td></tr>";
|
129 |
+
}
|
130 |
+
if ($row['paytype'] != '0') {
|
131 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_12') . "</td>";
|
132 |
+
$res .= "<td>" . $this->printLogo($row['paytype']) . "</td></tr>";
|
133 |
+
}
|
134 |
+
if ($row['cardnomask'] != '0' && $row['cardprefix'] == '0') {
|
135 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_13') . "</td>";
|
136 |
+
$res .= "<td>............" . trim($row['cardnomask'],'X') . "</td></tr>";
|
137 |
+
}
|
138 |
+
if ($row['cardprefix'] != '0' && $row['cardnomask'] == '0') {
|
139 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_13') . "</td>";
|
140 |
+
$res .= "<td>" . $row['cardprefix'] . "..........</td></tr>";
|
141 |
+
}
|
142 |
+
if ($row['cardprefix'] != '0' && $row['cardnomask'] != '0') {
|
143 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_13') . "</td>";
|
144 |
+
$res .= "<td>" . $row['cardprefix'] . '......' . trim($row['cardnomask'],'X') . "</td></tr>";
|
145 |
+
}
|
146 |
+
if ($row['cardexpdate'] != '0') {
|
147 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_14') . "</td>";
|
148 |
+
$res .= "<td>" . substr($row['cardexpdate'],2,2) . " / " . substr($row['cardexpdate'],0,2) . "</td></tr>";
|
149 |
+
}
|
150 |
+
if ($row['cardcountry'] != '0') {
|
151 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_15') . "</td>";
|
152 |
+
$res .= "<td>" . $row['cardcountry'] . "</td></tr>";
|
153 |
+
}
|
154 |
+
if ($row['acquirer'] != '0') {
|
155 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_16') . "</td>";
|
156 |
+
$res .= "<td>" . $row['acquirer'] . "</td></tr>";
|
157 |
+
}
|
158 |
+
if ($row['enrolled'] != '0') {
|
159 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_17') . "</td>";
|
160 |
+
$res .= "<td>" . $row['enrolled'] . "</td></tr>";
|
161 |
+
}
|
162 |
+
$res .= "</table><br>";
|
163 |
+
|
164 |
+
$res .= "<a href='https://payment.architrade.com/admin/' target='_blank'>" . Mage::helper('dibs')->__('DIBS_LABEL_18') . "</a>";
|
165 |
+
$res .= "<br><br>";
|
166 |
+
|
167 |
+
} else {
|
168 |
+
$res .= "<br>" . Mage::helper('dibs')->__('DIBS_LABEL_19') . "<br>";
|
169 |
+
}
|
170 |
+
|
171 |
+
return $res;
|
172 |
+
}
|
173 |
+
|
174 |
+
public function printLogo($paytype) {
|
175 |
+
|
176 |
+
switch($paytype) {
|
177 |
+
case 'AMEX': {
|
178 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/amex.gif') . '" border="0" />'; break;
|
179 |
+
}
|
180 |
+
case 'AMEX(DK)': {
|
181 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/amex.gif') . '" border="0" />'; break;
|
182 |
+
}
|
183 |
+
case 'BAX': {
|
184 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/bax.gif') . '" border="0" />'; break;
|
185 |
+
}
|
186 |
+
case 'DIN': {
|
187 |
+
$res = $this->getSkinUrl('images/dibs/diners.gif') . '" border="0" />'; break;
|
188 |
+
}
|
189 |
+
case 'DIN(DK)': {
|
190 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/diners.gif') . '" border="0" />'; break;
|
191 |
+
}
|
192 |
+
case 'DK': {
|
193 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/dankort.gif') . '" border="0" />'; break;
|
194 |
+
}
|
195 |
+
case 'FFK': {
|
196 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/forbrugforeningen.gif') . '" border="0" />'; break;
|
197 |
+
}
|
198 |
+
case 'JCB': {
|
199 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/jcb.gif') . '" border="0" />'; break;
|
200 |
+
}
|
201 |
+
case 'MC': {
|
202 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mastercard.gif') . '" border="0" />'; break;
|
203 |
+
}
|
204 |
+
case 'MC(DK)': {
|
205 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mastercard.gif') . '" border="0" />'; break;
|
206 |
+
}
|
207 |
+
case 'MC(SE)': {
|
208 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mastercard.gif') . '" border="0" />'; break;
|
209 |
+
}
|
210 |
+
case 'MTRO': {
|
211 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/maestro.gif') . '" border="0" />'; break;
|
212 |
+
}
|
213 |
+
case 'MTRO(DK)': {
|
214 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/maestro.gif') . '" border="0" />'; break;
|
215 |
+
}
|
216 |
+
case 'MTRO(SE)': {
|
217 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/maestro.gif') . '" border="0" />'; break;
|
218 |
+
}
|
219 |
+
case 'MOCA': {
|
220 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mobilcash.gif') . '" border="0" />'; break;
|
221 |
+
}
|
222 |
+
case 'V-DK': {
|
223 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
224 |
+
}
|
225 |
+
case 'VISA': {
|
226 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
227 |
+
}
|
228 |
+
case 'VISA(DK)': {
|
229 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
230 |
+
}
|
231 |
+
case 'VISA(SE)': {
|
232 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
233 |
+
}
|
234 |
+
case 'ELEC': {
|
235 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visaelectron.gif') . '" border="0" />'; break;
|
236 |
+
}
|
237 |
+
case 'AKTIA': {
|
238 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/aktia.gif') . '" border="0" />'; break;
|
239 |
+
}
|
240 |
+
case 'DNB': {
|
241 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/danskenetbetaling.gif') . '" border="0" />'; break;
|
242 |
+
}
|
243 |
+
case 'EDK': {
|
244 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/edankort.gif') . '" border="0" />'; break;
|
245 |
+
}
|
246 |
+
case 'ELV': {
|
247 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/bankeinzug.gif') . '" border="0" />'; break;
|
248 |
+
}
|
249 |
+
case 'EW': {
|
250 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/ewire.gif') . '" border="0" />'; break;
|
251 |
+
}
|
252 |
+
case 'FSB': {
|
253 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/swedbankdirektbetaling.gif') . '" border="0" />'; break;
|
254 |
+
}
|
255 |
+
case 'GIT': {
|
256 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/getitcard.gif') . '" border="0" />'; break;
|
257 |
+
}
|
258 |
+
case 'ING': {
|
259 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/ideal.gif') . '" border="0" />'; break;
|
260 |
+
}
|
261 |
+
case 'NDB': {
|
262 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/nordea.gif') . '" border="0" />'; break;
|
263 |
+
}
|
264 |
+
case 'SEB': {
|
265 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/seb.gif') . '" border="0" />'; break;
|
266 |
+
}
|
267 |
+
case 'SHB': {
|
268 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/shbdirektbetaling.gif') . '" border="0" />'; break;
|
269 |
+
}
|
270 |
+
case 'SOLO': {
|
271 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/nordea.gif') . '" border="0" />'; break;
|
272 |
+
}
|
273 |
+
case 'VAL': {
|
274 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/valus.gif') . '" border="0" />'; break;
|
275 |
+
}
|
276 |
+
default: {
|
277 |
+
$res = '<img src="' . $paytype;
|
278 |
+
}
|
279 |
+
|
280 |
+
}
|
281 |
+
return $res;
|
282 |
+
}
|
283 |
+
|
284 |
+
public function getViewUrl($orderId)
|
285 |
+
{
|
286 |
+
return $this->getUrl('*/*/*', array('order_id'=>$orderId));
|
287 |
+
}
|
288 |
+
|
289 |
+
/**
|
290 |
+
* ######################## TAB settings #################################
|
291 |
+
*/
|
292 |
+
public function getTabLabel()
|
293 |
+
{
|
294 |
+
return Mage::helper('sales')->__('Information');
|
295 |
+
}
|
296 |
+
|
297 |
+
public function getTabTitle()
|
298 |
+
{
|
299 |
+
return Mage::helper('sales')->__('Order Information');
|
300 |
+
}
|
301 |
+
|
302 |
+
public function canShowTab()
|
303 |
+
{
|
304 |
+
return true;
|
305 |
+
}
|
306 |
+
|
307 |
+
public function isHidden()
|
308 |
+
{
|
309 |
+
return false;
|
310 |
+
}
|
311 |
+
}
|
app/code/local/Mage/Dibs/Model/Standard.php
CHANGED
@@ -126,7 +126,7 @@ class Mage_Dibs_Model_Standard extends Mage_Payment_Model_Method_Abstract
|
|
126 |
//
|
127 |
public function convertToDibsCurrency($cur)
|
128 |
{
|
129 |
-
switch ($cur)
|
130 |
{
|
131 |
case "ADP": return "020";
|
132 |
case "AED": return "784";
|
126 |
//
|
127 |
public function convertToDibsCurrency($cur)
|
128 |
{
|
129 |
+
switch ($cur->getCode())
|
130 |
{
|
131 |
case "ADP": return "020";
|
132 |
case "AED": return "784";
|
app/code/local/Mage/Sales/Block/Order/Info.php
ADDED
@@ -0,0 +1,250 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category Mage
|
22 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
23 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
24 |
+
*/
|
25 |
+
|
26 |
+
/**
|
27 |
+
* Invoice view comments form
|
28 |
+
*
|
29 |
+
* @category Mage
|
30 |
+
* @package Mage_Sale
|
31 |
+
* @author Magento Core Team <core@magentocommerce.com>
|
32 |
+
*/
|
33 |
+
class Mage_Sales_Block_Order_Info extends Mage_Core_Block_Template
|
34 |
+
{
|
35 |
+
protected $_links = array();
|
36 |
+
|
37 |
+
protected function _construct()
|
38 |
+
{
|
39 |
+
parent::_construct();
|
40 |
+
$this->setTemplate('sales/order/info.phtml');
|
41 |
+
}
|
42 |
+
|
43 |
+
protected function _prepareLayout()
|
44 |
+
{
|
45 |
+
if ($headBlock = $this->getLayout()->getBlock('head')) {
|
46 |
+
$headBlock->setTitle($this->__('Order # %s', $this->getOrder()->getRealOrderId()));
|
47 |
+
}
|
48 |
+
$this->setChild(
|
49 |
+
'payment_info',
|
50 |
+
$this->helper('payment')->getInfoBlock($this->getOrder()->getPayment())
|
51 |
+
);
|
52 |
+
}
|
53 |
+
|
54 |
+
public function getPaymentInfoHtml()
|
55 |
+
{
|
56 |
+
|
57 |
+
$res = $this->getChildHtml('payment_info');
|
58 |
+
|
59 |
+
//
|
60 |
+
// Read info directly from the database
|
61 |
+
$read = Mage::getSingleton('core/resource')->getConnection('core_read');
|
62 |
+
$row = $read->fetchRow("select * from dibs_order_status where orderid = " . $this->getOrder()->getIncrementId());
|
63 |
+
$standard = Mage::getModel('dibs/standard');
|
64 |
+
|
65 |
+
$standard = Mage::getModel('dibs/standard');
|
66 |
+
if ($row['status'] == '1') {
|
67 |
+
//
|
68 |
+
// Payment has been made to this order
|
69 |
+
$res .= "<table border='0' width='100%'>";
|
70 |
+
if ($row['transact'] != '0') {
|
71 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_8') . "</td>";
|
72 |
+
$res .= "<td>" . $row['transact'] . "</td></tr>";
|
73 |
+
}
|
74 |
+
if ($row['paytype'] != '0') {
|
75 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_12') . "</td>";
|
76 |
+
$res .= "<td>" . $this->printLogo($row['paytype']) . "</td></tr>";
|
77 |
+
}
|
78 |
+
if ($row['fee'] != '0') {
|
79 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_11') . "</td>";
|
80 |
+
$res .= "<td>" . $this->getOrder()->getOrderCurrencyCode() . " " . number_format(((int)$row['fee']) / 100, 2, ',', ' ') . "</td></tr>";
|
81 |
+
}
|
82 |
+
$res .= "</table><br>";
|
83 |
+
|
84 |
+
} else {
|
85 |
+
$res .= "<br>" . Mage::helper('dibs')->__('DIBS_LABEL_19') . "<br>";
|
86 |
+
}
|
87 |
+
|
88 |
+
return $res;
|
89 |
+
}
|
90 |
+
|
91 |
+
public function printLogo($paytype) {
|
92 |
+
|
93 |
+
switch($paytype) {
|
94 |
+
case 'AMEX': {
|
95 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/amex.gif') . '" border="0" />'; break;
|
96 |
+
}
|
97 |
+
case 'AMEX(DK)': {
|
98 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/amex.gif') . '" border="0" />'; break;
|
99 |
+
}
|
100 |
+
case 'BAX': {
|
101 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/bax.gif') . '" border="0" />'; break;
|
102 |
+
}
|
103 |
+
case 'DIN': {
|
104 |
+
$res = $this->getSkinUrl('images/dibs/diners.gif') . '" border="0" />'; break;
|
105 |
+
}
|
106 |
+
case 'DIN(DK)': {
|
107 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/diners.gif') . '" border="0" />'; break;
|
108 |
+
}
|
109 |
+
case 'DK': {
|
110 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/dankort.gif') . '" border="0" />'; break;
|
111 |
+
}
|
112 |
+
case 'FFK': {
|
113 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/forbrugforeningen.gif') . '" border="0" />'; break;
|
114 |
+
}
|
115 |
+
case 'JCB': {
|
116 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/jcb.gif') . '" border="0" />'; break;
|
117 |
+
}
|
118 |
+
case 'MC': {
|
119 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mastercard.gif') . '" border="0" />'; break;
|
120 |
+
}
|
121 |
+
case 'MC(DK)': {
|
122 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mastercard.gif') . '" border="0" />'; break;
|
123 |
+
}
|
124 |
+
case 'MC(SE)': {
|
125 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mastercard.gif') . '" border="0" />'; break;
|
126 |
+
}
|
127 |
+
case 'MTRO': {
|
128 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/maestro.gif') . '" border="0" />'; break;
|
129 |
+
}
|
130 |
+
case 'MTRO(DK)': {
|
131 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/maestro.gif') . '" border="0" />'; break;
|
132 |
+
}
|
133 |
+
case 'MTRO(SE)': {
|
134 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/maestro.gif') . '" border="0" />'; break;
|
135 |
+
}
|
136 |
+
case 'MOCA': {
|
137 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mobilcash.gif') . '" border="0" />'; break;
|
138 |
+
}
|
139 |
+
case 'V-DK': {
|
140 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
141 |
+
}
|
142 |
+
case 'VISA': {
|
143 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
144 |
+
}
|
145 |
+
case 'VISA(DK)': {
|
146 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
147 |
+
}
|
148 |
+
case 'VISA(SE)': {
|
149 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
150 |
+
}
|
151 |
+
case 'ELEC': {
|
152 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visaelectron.gif') . '" border="0" />'; break;
|
153 |
+
}
|
154 |
+
case 'AKTIA': {
|
155 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/aktia.gif') . '" border="0" />'; break;
|
156 |
+
}
|
157 |
+
case 'DNB': {
|
158 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/danskenetbetaling.gif') . '" border="0" />'; break;
|
159 |
+
}
|
160 |
+
case 'EDK': {
|
161 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/edankort.gif') . '" border="0" />'; break;
|
162 |
+
}
|
163 |
+
case 'ELV': {
|
164 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/bankeinzug.gif') . '" border="0" />'; break;
|
165 |
+
}
|
166 |
+
case 'EW': {
|
167 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/ewire.gif') . '" border="0" />'; break;
|
168 |
+
}
|
169 |
+
case 'FSB': {
|
170 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/swedbankdirektbetaling.gif') . '" border="0" />'; break;
|
171 |
+
}
|
172 |
+
case 'GIT': {
|
173 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/getitcard.gif') . '" border="0" />'; break;
|
174 |
+
}
|
175 |
+
case 'ING': {
|
176 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/ideal.gif') . '" border="0" />'; break;
|
177 |
+
}
|
178 |
+
case 'NDB': {
|
179 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/nordea.gif') . '" border="0" />'; break;
|
180 |
+
}
|
181 |
+
case 'SEB': {
|
182 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/seb.gif') . '" border="0" />'; break;
|
183 |
+
}
|
184 |
+
case 'SHB': {
|
185 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/shbdirektbetaling.gif') . '" border="0" />'; break;
|
186 |
+
}
|
187 |
+
case 'SOLO': {
|
188 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/nordea.gif') . '" border="0" />'; break;
|
189 |
+
}
|
190 |
+
case 'VAL': {
|
191 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/valus.gif') . '" border="0" />'; break;
|
192 |
+
}
|
193 |
+
default: {
|
194 |
+
$res = '<img src="' . $paytype;
|
195 |
+
}
|
196 |
+
|
197 |
+
}
|
198 |
+
return $res;
|
199 |
+
}
|
200 |
+
|
201 |
+
/**
|
202 |
+
* Retrieve current order model instance
|
203 |
+
*
|
204 |
+
* @return Mage_Sales_Model_Order
|
205 |
+
*/
|
206 |
+
public function getOrder()
|
207 |
+
{
|
208 |
+
return Mage::registry('current_order');
|
209 |
+
}
|
210 |
+
|
211 |
+
public function addLink($name, $path, $label)
|
212 |
+
{
|
213 |
+
$this->_links[$name] = new Varien_Object(array(
|
214 |
+
'name' => $name,
|
215 |
+
'label' => $label,
|
216 |
+
'url' => empty($path) ? '' : Mage::getUrl($path, array('order_id' => $this->getOrder()->getId()))
|
217 |
+
));
|
218 |
+
return $this;
|
219 |
+
}
|
220 |
+
|
221 |
+
public function getLinks()
|
222 |
+
{
|
223 |
+
$this->checkLinks();
|
224 |
+
return $this->_links;
|
225 |
+
}
|
226 |
+
|
227 |
+
private function checkLinks()
|
228 |
+
{
|
229 |
+
$order = $this->getOrder();
|
230 |
+
if (!$order->hasInvoices()) {
|
231 |
+
unset($this->_links['invoice']);
|
232 |
+
}
|
233 |
+
if (!$order->hasShipments()) {
|
234 |
+
unset($this->_links['shipment']);
|
235 |
+
}
|
236 |
+
if (!$order->hasCreditmemos()) {
|
237 |
+
unset($this->_links['creditmemo']);
|
238 |
+
}
|
239 |
+
}
|
240 |
+
|
241 |
+
public function getReorderUrl($order)
|
242 |
+
{
|
243 |
+
return $this->getUrl('sales/order/reorder', array('order_id' => $order->getId()));
|
244 |
+
}
|
245 |
+
|
246 |
+
public function getPrintUrl($order)
|
247 |
+
{
|
248 |
+
return $this->getUrl('sales/order/print', array('order_id' => $order->getId()));
|
249 |
+
}
|
250 |
+
}
|
app/code/local/Mage/Sales/Block/Order/Print.php
ADDED
@@ -0,0 +1,207 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category Mage
|
22 |
+
* @package Mage_Sales
|
23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
|
27 |
+
/**
|
28 |
+
* Order information for print
|
29 |
+
*
|
30 |
+
* @category Mage
|
31 |
+
* @package Mage_Sales
|
32 |
+
*/
|
33 |
+
|
34 |
+
class Mage_Sales_Block_Order_Print extends Mage_Sales_Block_Items_Abstract
|
35 |
+
{
|
36 |
+
protected function _prepareLayout()
|
37 |
+
{
|
38 |
+
if ($headBlock = $this->getLayout()->getBlock('head')) {
|
39 |
+
$headBlock->setTitle($this->__('Print Order # %s', $this->getOrder()->getRealOrderId()));
|
40 |
+
}
|
41 |
+
$this->setChild(
|
42 |
+
'payment_info',
|
43 |
+
$this->helper('payment')->getInfoBlock($this->getOrder()->getPayment())
|
44 |
+
);
|
45 |
+
}
|
46 |
+
|
47 |
+
public function getPaymentInfoHtml()
|
48 |
+
{
|
49 |
+
//return $this->getChildHtml('payment_info');
|
50 |
+
|
51 |
+
$res = $this->getChildHtml('payment_info');
|
52 |
+
|
53 |
+
//
|
54 |
+
// Read info directly from the database
|
55 |
+
$read = Mage::getSingleton('core/resource')->getConnection('core_read');
|
56 |
+
$row = $read->fetchRow("select * from dibs_order_status where orderid = " . $this->getOrder()->getIncrementId());
|
57 |
+
$standard = Mage::getModel('dibs/standard');
|
58 |
+
|
59 |
+
if ($row['status'] == '1') {
|
60 |
+
//
|
61 |
+
// Payment has been made to this order
|
62 |
+
$res .= "<table border='0' width='100%'>";
|
63 |
+
if ($row['transact'] != '0') {
|
64 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_8') . "</td>";
|
65 |
+
$res .= "<td>" . $row['transact'] . "</td></tr>";
|
66 |
+
}
|
67 |
+
if ($row['paytype'] != '0') {
|
68 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_12') . "</td>";
|
69 |
+
$res .= "<td>" . $this->printLogo($row['paytype']) . "</td></tr>";
|
70 |
+
}
|
71 |
+
if ($row['fee'] != '0') {
|
72 |
+
$res .= "<tr><td>" . Mage::helper('dibs')->__('DIBS_LABEL_11') . "</td>";
|
73 |
+
$res .= "<td>" . $this->getOrder()->getOrderCurrencyCode() . " " . number_format(((int)$row['fee']) / 100, 2, ',', ' ') . "</td></tr>";
|
74 |
+
}
|
75 |
+
$res .= "</table><br>";
|
76 |
+
|
77 |
+
} else {
|
78 |
+
$res .= "<br>" . Mage::helper('dibs')->__('DIBS_LABEL_19') . "<br>";
|
79 |
+
}
|
80 |
+
|
81 |
+
return $res;
|
82 |
+
}
|
83 |
+
|
84 |
+
public function printLogo($paytype) {
|
85 |
+
|
86 |
+
switch($paytype) {
|
87 |
+
case 'AMEX': {
|
88 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/amex.gif') . '" border="0" />'; break;
|
89 |
+
}
|
90 |
+
case 'AMEX(DK)': {
|
91 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/amex.gif') . '" border="0" />'; break;
|
92 |
+
}
|
93 |
+
case 'BAX': {
|
94 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/bax.gif') . '" border="0" />'; break;
|
95 |
+
}
|
96 |
+
case 'DIN': {
|
97 |
+
$res = $this->getSkinUrl('images/dibs/diners.gif') . '" border="0" />'; break;
|
98 |
+
}
|
99 |
+
case 'DIN(DK)': {
|
100 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/diners.gif') . '" border="0" />'; break;
|
101 |
+
}
|
102 |
+
case 'DK': {
|
103 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/dankort.gif') . '" border="0" />'; break;
|
104 |
+
}
|
105 |
+
case 'FFK': {
|
106 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/forbrugforeningen.gif') . '" border="0" />'; break;
|
107 |
+
}
|
108 |
+
case 'JCB': {
|
109 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/jcb.gif') . '" border="0" />'; break;
|
110 |
+
}
|
111 |
+
case 'MC': {
|
112 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mastercard.gif') . '" border="0" />'; break;
|
113 |
+
}
|
114 |
+
case 'MC(DK)': {
|
115 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mastercard.gif') . '" border="0" />'; break;
|
116 |
+
}
|
117 |
+
case 'MC(SE)': {
|
118 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mastercard.gif') . '" border="0" />'; break;
|
119 |
+
}
|
120 |
+
case 'MTRO': {
|
121 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/maestro.gif') . '" border="0" />'; break;
|
122 |
+
}
|
123 |
+
case 'MTRO(DK)': {
|
124 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/maestro.gif') . '" border="0" />'; break;
|
125 |
+
}
|
126 |
+
case 'MTRO(SE)': {
|
127 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/maestro.gif') . '" border="0" />'; break;
|
128 |
+
}
|
129 |
+
case 'MOCA': {
|
130 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/mobilcash.gif') . '" border="0" />'; break;
|
131 |
+
}
|
132 |
+
case 'V-DK': {
|
133 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
134 |
+
}
|
135 |
+
case 'VISA': {
|
136 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
137 |
+
}
|
138 |
+
case 'VISA(DK)': {
|
139 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
140 |
+
}
|
141 |
+
case 'VISA(SE)': {
|
142 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visa.gif') . '" border="0" />'; break;
|
143 |
+
}
|
144 |
+
case 'ELEC': {
|
145 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/visaelectron.gif') . '" border="0" />'; break;
|
146 |
+
}
|
147 |
+
case 'AKTIA': {
|
148 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/aktia.gif') . '" border="0" />'; break;
|
149 |
+
}
|
150 |
+
case 'DNB': {
|
151 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/danskenetbetaling.gif') . '" border="0" />'; break;
|
152 |
+
}
|
153 |
+
case 'EDK': {
|
154 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/edankort.gif') . '" border="0" />'; break;
|
155 |
+
}
|
156 |
+
case 'ELV': {
|
157 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/bankeinzug.gif') . '" border="0" />'; break;
|
158 |
+
}
|
159 |
+
case 'EW': {
|
160 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/ewire.gif') . '" border="0" />'; break;
|
161 |
+
}
|
162 |
+
case 'FSB': {
|
163 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/swedbankdirektbetaling.gif') . '" border="0" />'; break;
|
164 |
+
}
|
165 |
+
case 'GIT': {
|
166 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/getitcard.gif') . '" border="0" />'; break;
|
167 |
+
}
|
168 |
+
case 'ING': {
|
169 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/ideal.gif') . '" border="0" />'; break;
|
170 |
+
}
|
171 |
+
case 'NDB': {
|
172 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/nordea.gif') . '" border="0" />'; break;
|
173 |
+
}
|
174 |
+
case 'SEB': {
|
175 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/seb.gif') . '" border="0" />'; break;
|
176 |
+
}
|
177 |
+
case 'SHB': {
|
178 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/shbdirektbetaling.gif') . '" border="0" />'; break;
|
179 |
+
}
|
180 |
+
case 'SOLO': {
|
181 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/nordea.gif') . '" border="0" />'; break;
|
182 |
+
}
|
183 |
+
case 'VAL': {
|
184 |
+
$res = '<img src="' . $this->getSkinUrl('images/dibs/valus.gif') . '" border="0" />'; break;
|
185 |
+
}
|
186 |
+
default: {
|
187 |
+
$res = '<img src="' . $paytype;
|
188 |
+
}
|
189 |
+
|
190 |
+
}
|
191 |
+
return $res;
|
192 |
+
}
|
193 |
+
|
194 |
+
public function getOrder()
|
195 |
+
{
|
196 |
+
return Mage::registry('current_order');
|
197 |
+
}
|
198 |
+
|
199 |
+
protected function _prepareItem(Mage_Core_Block_Abstract $renderer)
|
200 |
+
{
|
201 |
+
$renderer->setPrintStatus(true);
|
202 |
+
|
203 |
+
return parent::_prepareItem($renderer);
|
204 |
+
}
|
205 |
+
|
206 |
+
}
|
207 |
+
|
app/design/frontend/default/default/template/dibs/standard/redirect_flexwin.phtml
CHANGED
@@ -42,7 +42,7 @@ $invoice = $convertor->toInvoice($order);
|
|
42 |
<label for="Amount"><?php echo $this->__('DIBS_LABEL_5') ?> :</label>
|
43 |
</td>
|
44 |
<td>
|
45 |
-
<label for="CurrencyAmount"><?php echo $order->getOrderCurrency() . " " . number_format($order->getTotalDue(), 2, ',', ' ') ?></label>
|
46 |
</td>
|
47 |
</tr>
|
48 |
</table>
|
42 |
<label for="Amount"><?php echo $this->__('DIBS_LABEL_5') ?> :</label>
|
43 |
</td>
|
44 |
<td>
|
45 |
+
<label for="CurrencyAmount"><?php echo $order->getOrderCurrency()->getCode() . " " . number_format($order->getTotalDue(), 2, ',', ' ') ?></label>
|
46 |
</td>
|
47 |
</tr>
|
48 |
</table>
|
app/design/frontend/default/default/template/dibs/standard/redirect_paymentwindow.phtml
CHANGED
@@ -42,7 +42,7 @@ $invoice = $convertor->toInvoice($order);
|
|
42 |
<label for="Amount"><?php echo $this->__('DIBS_LABEL_5') ?> :</label>
|
43 |
</td>
|
44 |
<td>
|
45 |
-
<label for="CurrencyAmount"><?php echo $order->getOrderCurrency() . " " . number_format($order->getTotalDue(), 2, ',', ' ') ?></label>
|
46 |
</td>
|
47 |
</tr>
|
48 |
</table>
|
42 |
<label for="Amount"><?php echo $this->__('DIBS_LABEL_5') ?> :</label>
|
43 |
</td>
|
44 |
<td>
|
45 |
+
<label for="CurrencyAmount"><?php echo $order->getOrderCurrency()->getCode() . " " . number_format($order->getTotalDue(), 2, ',', ' ') ?></label>
|
46 |
</td>
|
47 |
</tr>
|
48 |
</table>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>DIBS</name>
|
4 |
-
<version>1.0.0.
|
5 |
<stability>stable</stability>
|
6 |
<license>GPL</license>
|
7 |
<channel>community</channel>
|
@@ -32,7 +32,11 @@ Card types accepted by the DIBS payment gateway:
|
|
32 |
- Nordea e-betaling
|
33 |
|
34 |
A complete list can be found at http://www.dibspayment.com/</description>
|
35 |
-
<notes>1.0.0.
|
|
|
|
|
|
|
|
|
36 |
- Added extra complete status for order
|
37 |
|
38 |
1.0.0.3
|
@@ -48,9 +52,9 @@ Danish, Norwegian, Swedish
|
|
48 |
|
49 |
First release 1.0.0.0</notes>
|
50 |
<authors><author><name>DIBS AS</name><user>auto-converted</user><email>plugins@dibs.dk</email></author></authors>
|
51 |
-
<date>2009-09-
|
52 |
-
<time>
|
53 |
-
<contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="dibs"><file name="aktia.gif" hash="7afe00b19b4194fa4ffbdf20cdd469c1"/><file name="amex.gif" hash="f35f89ccdcb954e02a07f6c0a29c7b43"/><file name="bak.gif" hash="c315574fd839dae52a1316b6d8b836b6"/><file name="bankeinzug.gif" hash="3bd20355343bd250a6a704fdbaf9ba62"/><file name="dankort.gif" hash="daa5d5d2c0d541579b0e13aa3cd9d65b"/><file name="danskenetbetaling.gif" hash="1f616c382b72248334f6aa1ca910003b"/><file name="dibslogo.gif" hash="8b308757472fc5aaaedfefd5c79a2d54"/><file name="diners.gif" hash="fabce04659a94993a230285b9a4651e9"/><file name="edankort.gif" hash="4485910a0fb40512233c1a59ddd31015"/><file name="ewire.gif" hash="b50385f7d878be6a3834310d1fbc3a1d"/><file name="forbrugforeningen.gif" hash="d9cd7fa26230a850114b2dc99aea3b22"/><file name="getitcard.gif" hash="b70e244f36e7aec94fe3f6373e1ae8d7"/><file name="ideal.gif" hash="40f07b266bcd5953bb6c079f7eeaae67"/><file name="jcb.gif" hash="aea8c54e043a75b26887fa1307ad4312"/><file name="jcbsecure.gif" hash="1c687214f79b73d7e99f5011c9c22bce"/><file name="loading.gif" hash="7e99e1159a3686f6aa4f90043c554483"/><file name="maestro.gif" hash="d5df5f7986a21bf5a78b9c7a3656facd"/><file name="mastercard.gif" hash="2680e078159e5aedb561c3a705801a44"/><file name="mastercardsecurecode.gif" hash="730735c1e2d36d9fa3bd6468fa0b1a7d"/><file name="mobilcash.gif" hash="befd2f10976c0ab40333f01fc6db4743"/><file name="nordeasole.gif" hash="17b9be1a06125dcc7d1a6be8fea38dd6"/><file name="oko.gif" hash="1cde3c12036ebd74a643aee2ffb0513a"/><file name="pci.gif" hash="b55a87df550ea6789c17e389604e28e1"/><file name="seb.gif" hash="502b1dbeb81bce51abd1ea149d4dde14"/><file name="shbdirektbetaling.gif" hash="0aa7c7fab4133ff4843c0ae73cabe9de"/><file name="swedbankdirektbetaling.gif" hash="d6da3e67f8096811c2ad0135b2aad80a"/><file name="valus.gif" hash="e62b75eb172934e118a70366baac51ee"/><file name="verifiedbyvisa.gif" hash="517118742fce249485c8eaf6df174764"/><file name="visa.gif" hash="b61251f8c428aa5dca017c9f374957ef"/><file name="visaelectron.gif" hash="e5371ba0da9bb14990d1b8163cedd066"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="images"><dir name="dibs"><file name="aktia.gif" hash="7afe00b19b4194fa4ffbdf20cdd469c1"/><file name="amex.gif" hash="f35f89ccdcb954e02a07f6c0a29c7b43"/><file name="bak.gif" hash="c315574fd839dae52a1316b6d8b836b6"/><file name="bankeinzug.gif" hash="3bd20355343bd250a6a704fdbaf9ba62"/><file name="dankort.gif" hash="daa5d5d2c0d541579b0e13aa3cd9d65b"/><file name="danskenetbetaling.gif" hash="1f616c382b72248334f6aa1ca910003b"/><file name="dibslogo.gif" hash="8b308757472fc5aaaedfefd5c79a2d54"/><file name="diners.gif" hash="fabce04659a94993a230285b9a4651e9"/><file name="edankort.gif" hash="4485910a0fb40512233c1a59ddd31015"/><file name="ewire.gif" hash="b50385f7d878be6a3834310d1fbc3a1d"/><file name="forbrugforeningen.gif" hash="d9cd7fa26230a850114b2dc99aea3b22"/><file name="getitcard.gif" hash="b70e244f36e7aec94fe3f6373e1ae8d7"/><file name="ideal.gif" hash="40f07b266bcd5953bb6c079f7eeaae67"/><file name="jcb.gif" hash="aea8c54e043a75b26887fa1307ad4312"/><file name="jcbsecure.gif" hash="1c687214f79b73d7e99f5011c9c22bce"/><file name="loading.gif" hash="7e99e1159a3686f6aa4f90043c554483"/><file name="maestro.gif" hash="d5df5f7986a21bf5a78b9c7a3656facd"/><file name="mastercard.gif" hash="2680e078159e5aedb561c3a705801a44"/><file name="mastercardsecurecode.gif" hash="730735c1e2d36d9fa3bd6468fa0b1a7d"/><file name="mobilcash.gif" hash="befd2f10976c0ab40333f01fc6db4743"/><file name="nordeasole.gif" hash="17b9be1a06125dcc7d1a6be8fea38dd6"/><file name="oko.gif" hash="1cde3c12036ebd74a643aee2ffb0513a"/><file name="pci.gif" hash="b55a87df550ea6789c17e389604e28e1"/><file name="seb.gif" hash="502b1dbeb81bce51abd1ea149d4dde14"/><file name="shbdirektbetaling.gif" hash="0aa7c7fab4133ff4843c0ae73cabe9de"/><file name="swedbankdirektbetaling.gif" hash="d6da3e67f8096811c2ad0135b2aad80a"/><file name="valus.gif" hash="e62b75eb172934e118a70366baac51ee"/><file name="verifiedbyvisa.gif" hash="517118742fce249485c8eaf6df174764"/><file name="visa.gif" hash="b61251f8c428aa5dca017c9f374957ef"/><file name="visaelectron.gif" hash="e5371ba0da9bb14990d1b8163cedd066"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="da_DK"><file name="Mage_Dibs.csv" hash="d0c5cb82194a6ebf31763974da63cfcf"/></dir><dir name="en_US"><file name="Mage_Dibs.csv" hash="3c87618730f4635447e3b295525c1bb0"/></dir><dir name="nb_NO"><file name="Mage_Dibs.csv" hash="19ff9d72c131dd0f6195b250115551c1"/></dir><dir name="nn_NO"><file name="Mage_Dibs.csv" hash="19ff9d72c131dd0f6195b250115551c1"/></dir><dir name="sv_SE"><file name="Mage_Dibs.csv" hash="cf8699668ba4b02571a7ea574aae0fb9"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="dibs.xml" hash="e0fcac411141323aec77d6b77862f063"/></dir><dir name="template"><dir name="dibs"><dir name="standard"><file name="form.phtml" hash="449b1b49d82239f3af471d598608ae4c"/><file name="redirect_flexwin.phtml" hash="
|
54 |
<compatible/>
|
55 |
<dependencies/>
|
56 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>DIBS</name>
|
4 |
+
<version>1.0.0.6</version>
|
5 |
<stability>stable</stability>
|
6 |
<license>GPL</license>
|
7 |
<channel>community</channel>
|
32 |
- Nordea e-betaling
|
33 |
|
34 |
A complete list can be found at http://www.dibspayment.com/</description>
|
35 |
+
<notes>1.0.0.6
|
36 |
+
- Fixed currency bug
|
37 |
+
- Added order information to DIBS payment process
|
38 |
+
|
39 |
+
1.0.0.5
|
40 |
- Added extra complete status for order
|
41 |
|
42 |
1.0.0.3
|
52 |
|
53 |
First release 1.0.0.0</notes>
|
54 |
<authors><author><name>DIBS AS</name><user>auto-converted</user><email>plugins@dibs.dk</email></author></authors>
|
55 |
+
<date>2009-09-21</date>
|
56 |
+
<time>07:51:49</time>
|
57 |
+
<contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="dibs"><file name="aktia.gif" hash="7afe00b19b4194fa4ffbdf20cdd469c1"/><file name="amex.gif" hash="f35f89ccdcb954e02a07f6c0a29c7b43"/><file name="bak.gif" hash="c315574fd839dae52a1316b6d8b836b6"/><file name="bankeinzug.gif" hash="3bd20355343bd250a6a704fdbaf9ba62"/><file name="dankort.gif" hash="daa5d5d2c0d541579b0e13aa3cd9d65b"/><file name="danskenetbetaling.gif" hash="1f616c382b72248334f6aa1ca910003b"/><file name="dibslogo.gif" hash="8b308757472fc5aaaedfefd5c79a2d54"/><file name="diners.gif" hash="fabce04659a94993a230285b9a4651e9"/><file name="edankort.gif" hash="4485910a0fb40512233c1a59ddd31015"/><file name="ewire.gif" hash="b50385f7d878be6a3834310d1fbc3a1d"/><file name="forbrugforeningen.gif" hash="d9cd7fa26230a850114b2dc99aea3b22"/><file name="getitcard.gif" hash="b70e244f36e7aec94fe3f6373e1ae8d7"/><file name="ideal.gif" hash="40f07b266bcd5953bb6c079f7eeaae67"/><file name="jcb.gif" hash="aea8c54e043a75b26887fa1307ad4312"/><file name="jcbsecure.gif" hash="1c687214f79b73d7e99f5011c9c22bce"/><file name="loading.gif" hash="7e99e1159a3686f6aa4f90043c554483"/><file name="maestro.gif" hash="d5df5f7986a21bf5a78b9c7a3656facd"/><file name="mastercard.gif" hash="2680e078159e5aedb561c3a705801a44"/><file name="mastercardsecurecode.gif" hash="730735c1e2d36d9fa3bd6468fa0b1a7d"/><file name="mobilcash.gif" hash="befd2f10976c0ab40333f01fc6db4743"/><file name="nordeasole.gif" hash="17b9be1a06125dcc7d1a6be8fea38dd6"/><file name="oko.gif" hash="1cde3c12036ebd74a643aee2ffb0513a"/><file name="pci.gif" hash="b55a87df550ea6789c17e389604e28e1"/><file name="seb.gif" hash="502b1dbeb81bce51abd1ea149d4dde14"/><file name="shbdirektbetaling.gif" hash="0aa7c7fab4133ff4843c0ae73cabe9de"/><file name="swedbankdirektbetaling.gif" hash="d6da3e67f8096811c2ad0135b2aad80a"/><file name="valus.gif" hash="e62b75eb172934e118a70366baac51ee"/><file name="verifiedbyvisa.gif" hash="517118742fce249485c8eaf6df174764"/><file name="visa.gif" hash="b61251f8c428aa5dca017c9f374957ef"/><file name="visaelectron.gif" hash="e5371ba0da9bb14990d1b8163cedd066"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="images"><dir name="dibs"><file name="aktia.gif" hash="7afe00b19b4194fa4ffbdf20cdd469c1"/><file name="amex.gif" hash="f35f89ccdcb954e02a07f6c0a29c7b43"/><file name="bak.gif" hash="c315574fd839dae52a1316b6d8b836b6"/><file name="bankeinzug.gif" hash="3bd20355343bd250a6a704fdbaf9ba62"/><file name="dankort.gif" hash="daa5d5d2c0d541579b0e13aa3cd9d65b"/><file name="danskenetbetaling.gif" hash="1f616c382b72248334f6aa1ca910003b"/><file name="dibslogo.gif" hash="8b308757472fc5aaaedfefd5c79a2d54"/><file name="diners.gif" hash="fabce04659a94993a230285b9a4651e9"/><file name="edankort.gif" hash="4485910a0fb40512233c1a59ddd31015"/><file name="ewire.gif" hash="b50385f7d878be6a3834310d1fbc3a1d"/><file name="forbrugforeningen.gif" hash="d9cd7fa26230a850114b2dc99aea3b22"/><file name="getitcard.gif" hash="b70e244f36e7aec94fe3f6373e1ae8d7"/><file name="ideal.gif" hash="40f07b266bcd5953bb6c079f7eeaae67"/><file name="jcb.gif" hash="aea8c54e043a75b26887fa1307ad4312"/><file name="jcbsecure.gif" hash="1c687214f79b73d7e99f5011c9c22bce"/><file name="loading.gif" hash="7e99e1159a3686f6aa4f90043c554483"/><file name="maestro.gif" hash="d5df5f7986a21bf5a78b9c7a3656facd"/><file name="mastercard.gif" hash="2680e078159e5aedb561c3a705801a44"/><file name="mastercardsecurecode.gif" hash="730735c1e2d36d9fa3bd6468fa0b1a7d"/><file name="mobilcash.gif" hash="befd2f10976c0ab40333f01fc6db4743"/><file name="nordeasole.gif" hash="17b9be1a06125dcc7d1a6be8fea38dd6"/><file name="oko.gif" hash="1cde3c12036ebd74a643aee2ffb0513a"/><file name="pci.gif" hash="b55a87df550ea6789c17e389604e28e1"/><file name="seb.gif" hash="502b1dbeb81bce51abd1ea149d4dde14"/><file name="shbdirektbetaling.gif" hash="0aa7c7fab4133ff4843c0ae73cabe9de"/><file name="swedbankdirektbetaling.gif" hash="d6da3e67f8096811c2ad0135b2aad80a"/><file name="valus.gif" hash="e62b75eb172934e118a70366baac51ee"/><file name="verifiedbyvisa.gif" hash="517118742fce249485c8eaf6df174764"/><file name="visa.gif" hash="b61251f8c428aa5dca017c9f374957ef"/><file name="visaelectron.gif" hash="e5371ba0da9bb14990d1b8163cedd066"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="da_DK"><file name="Mage_Dibs.csv" hash="d0c5cb82194a6ebf31763974da63cfcf"/></dir><dir name="en_US"><file name="Mage_Dibs.csv" hash="3c87618730f4635447e3b295525c1bb0"/></dir><dir name="nb_NO"><file name="Mage_Dibs.csv" hash="19ff9d72c131dd0f6195b250115551c1"/></dir><dir name="nn_NO"><file name="Mage_Dibs.csv" hash="19ff9d72c131dd0f6195b250115551c1"/></dir><dir name="sv_SE"><file name="Mage_Dibs.csv" hash="cf8699668ba4b02571a7ea574aae0fb9"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="dibs.xml" hash="e0fcac411141323aec77d6b77862f063"/></dir><dir name="template"><dir name="dibs"><dir name="standard"><file name="form.phtml" hash="449b1b49d82239f3af471d598608ae4c"/><file name="redirect_flexwin.phtml" hash="0299f6bc9f9cf1ada27127ad432af3a9"/><file name="redirect_paymentwindow.phtml" hash="7df4399d8f73ced839a115653affaff0"/></dir></dir></dir></dir></dir></dir></target><target name="magelocal"><dir name="Mage"><dir name="Adminhtml"><dir name="Block"><dir name="Sales"><dir name="Order"><dir name="View"><dir name="Tab"><file name="Info.php" hash="ce54f910bfcdf2b41b2663dadb7ba2fc"/></dir></dir></dir></dir></dir></dir><dir name="Dibs"><dir name="Block"><dir name="Standard"><file name="Form.php" hash="dd81a2e22e518ff104ed3f69528fe347"/><file name="Redirect.php" hash="a652884e7f9ec32cf96df6494e814f4e"/></dir></dir><dir name="controllers"><file name="StandardController.php" hash="0392bfc976b70f4f7f70a700f0e9e66e"/></dir><dir name="etc"><file name="config.xml" hash="a11c6f9e9e4d75fda2fca8ced55eb166"/><file name="system.xml" hash="58f3eaf67bed5cdb9e1b1fb217522879"/></dir><dir name="Helper"><file name="Data.php" hash="b93ec2269b9a302c2e3176e45bffbf73"/></dir><dir name="Model"><dir name="Mysql4"><file name="Setup.php" hash="c18fda329fa5d40b31ac76e4955afa31"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Color.php" hash="78084ee39f49af7291ab0f6cb0ab7f8b"/><file name="Decorator.php" hash="29e5a6c1aa9f92b0542ad2381d5fbabc"/><file name="Dibslogos.php" hash="29a026f1229bafda94a04352e74739e8"/><file name="Lang.php" hash="842d86a353e0f5d1339bb38feea1ec00"/><file name="Paymentwindow.php" hash="0742db19898c94c777385ce2160e25f9"/></dir></dir></dir><file name="Standard.php" hash="f3158b5a714dd0d612f990bd37c8f30d"/></dir><dir name="sql"><dir name="dibs_setup"><file name="mysql4-install-0.7.0.php" hash="09b330e4f4cdfddb3678026e670061a1"/></dir></dir></dir><dir name="Sales"><dir name="Block"><dir name="Order"><file name="Info.php" hash="9e6166c1a038944900094a9dbde9a3a1"/><file name="Print.php" hash="990ab1545e691e8cdc4daf7a8e802069"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="dibs.xml" hash="8bd9e75f2ab5a6f258ea296caff89d7d"/></dir></target></contents>
|
58 |
<compatible/>
|
59 |
<dependencies/>
|
60 |
</package>
|