Version Notes
Stable Release
Download this release
Release Info
Developer | Magento Core Team |
Extension | Morningtime_Internetkassa |
Version | 1.3.2.4.2 |
Comparing to | |
See all releases |
Code changes from version 1.3.2.4 to 1.3.2.4.2
- app/code/community/Morningtime/Internetkassa/Helper/ViewerList.php +3 -3
- app/code/community/Morningtime/Internetkassa/Model/Internetkassa.php +4 -4
- app/code/community/Morningtime/Internetkassa/Model/Source/PaymentMethodsList.php +36 -36
- app/code/community/Morningtime/Internetkassa/controllers/{OgoneController.php → ResultController.php} +5 -5
- app/code/community/Morningtime/Internetkassa/etc/config.xml +5 -5
- app/code/community/Morningtime/Internetkassa/etc/system.xml +25 -25
- app/design/frontend/default/default/template/morningtime/internetkassa/form.phtml +12 -4
- app/locale/en_US/Morningtime_Internetkassa.csv +2 -1
- app/locale/nl_NL/Morningtime_Internetkassa.csv +2 -1
- package.xml +4 -4
app/code/community/Morningtime/Internetkassa/Helper/ViewerList.php
CHANGED
@@ -83,10 +83,10 @@ class Morningtime_Internetkassa_Helper_ViewerList extends Mage_Core_Helper_Abstr
|
|
83 |
->setPmUrlLogo('MaestroUK_choice.gif')
|
84 |
->setPmFamily('Cards: General');
|
85 |
$pmList[] = Mage::getModel('internetkassa/paymentMethod')
|
86 |
-
->setPmName('
|
87 |
->setPmValue('CreditCard')
|
88 |
-
->setPmBrand('
|
89 |
-
->setPmUrlLogo('
|
90 |
->setPmFamily('Cards: General');
|
91 |
$pmList[] = Mage::getModel('internetkassa/paymentMethod')
|
92 |
->setPmName('Solo')
|
83 |
->setPmUrlLogo('MaestroUK_choice.gif')
|
84 |
->setPmFamily('Cards: General');
|
85 |
$pmList[] = Mage::getModel('internetkassa/paymentMethod')
|
86 |
+
->setPmName('Eurocard')
|
87 |
->setPmValue('CreditCard')
|
88 |
+
->setPmBrand('Eurocard')
|
89 |
+
->setPmUrlLogo('Eurocard_choice.gif')
|
90 |
->setPmFamily('Cards: General');
|
91 |
$pmList[] = Mage::getModel('internetkassa/paymentMethod')
|
92 |
->setPmName('Solo')
|
app/code/community/Morningtime/Internetkassa/Model/Internetkassa.php
CHANGED
@@ -448,7 +448,7 @@ class Morningtime_Internetkassa_Model_Internetkassa extends Mage_Payment_Model_M
|
|
448 |
$ccType = $info->getCcType();
|
449 |
|
450 |
if(empty($ccType)){
|
451 |
-
$errorMsg = $this->__('
|
452 |
}
|
453 |
|
454 |
if($errorMsg){
|
@@ -460,12 +460,12 @@ class Morningtime_Internetkassa_Model_Internetkassa extends Mage_Payment_Model_M
|
|
460 |
|
461 |
protected function getSuccessURL()
|
462 |
{
|
463 |
-
return Mage::getUrl('/internetkassa/
|
464 |
}
|
465 |
|
466 |
protected function getErrorURL()
|
467 |
{
|
468 |
-
return Mage::getUrl('/internetkassa/
|
469 |
}
|
470 |
|
471 |
/**
|
@@ -592,7 +592,7 @@ class Morningtime_Internetkassa_Model_Internetkassa extends Mage_Payment_Model_M
|
|
592 |
* @return string Order Redirect URL
|
593 |
*/
|
594 |
public function getOrderPlaceRedirectUrl(){
|
595 |
-
return Mage::getUrl('internetkassa/
|
596 |
}
|
597 |
|
598 |
public function getCustomer()
|
448 |
$ccType = $info->getCcType();
|
449 |
|
450 |
if(empty($ccType)){
|
451 |
+
$errorMsg = $this->__('You have to choose a payment method!');
|
452 |
}
|
453 |
|
454 |
if($errorMsg){
|
460 |
|
461 |
protected function getSuccessURL()
|
462 |
{
|
463 |
+
return Mage::getUrl('/internetkassa/result/success', array('_secure' => true));
|
464 |
}
|
465 |
|
466 |
protected function getErrorURL()
|
467 |
{
|
468 |
+
return Mage::getUrl('/internetkassa/result/error', array('_secure' => true));
|
469 |
}
|
470 |
|
471 |
/**
|
592 |
* @return string Order Redirect URL
|
593 |
*/
|
594 |
public function getOrderPlaceRedirectUrl(){
|
595 |
+
return Mage::getUrl('internetkassa/result/redirect');
|
596 |
}
|
597 |
|
598 |
public function getCustomer()
|
app/code/community/Morningtime/Internetkassa/Model/Source/PaymentMethodsList.php
CHANGED
@@ -43,68 +43,68 @@ class Morningtime_Internetkassa_Model_Source_PaymentMethodsList
|
|
43 |
|
44 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
45 |
$pm->__PaymentMethod('AIRPLUS','CreditCard',
|
46 |
-
'AIRPLUS','
|
47 |
$pmList[] = $pm;
|
48 |
|
49 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
50 |
$pm->__PaymentMethod('American Express','CreditCard',
|
51 |
-
'American Express','American
|
52 |
'Cards: General', false);
|
53 |
$pmList[] = $pm;
|
54 |
|
55 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
56 |
$pm->__PaymentMethod('Aurora','CreditCard',
|
57 |
-
'Aurora','
|
58 |
, false);
|
59 |
$pmList[] = $pm;
|
60 |
|
61 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
62 |
$pm->__PaymentMethod('Aurore','CreditCard',
|
63 |
-
'Aurore','
|
64 |
$pmList[] = $pm;
|
65 |
|
66 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
67 |
$pm->__PaymentMethod('Cofinoga','CreditCard',
|
68 |
-
'Cofinoga','
|
69 |
$pmList[] = $pm;
|
70 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
71 |
$pm->__PaymentMethod('Dankort','CreditCard',
|
72 |
-
'Dankort','
|
73 |
'Cards: General', false);
|
74 |
$pmList[] = $pm;
|
75 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
76 |
$pm->__PaymentMethod('Diners Club','CreditCard',
|
77 |
-
'Diners Club','Diners
|
78 |
$pmList[] = $pm;
|
79 |
|
80 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
81 |
$pm->__PaymentMethod('JCB','CreditCard',
|
82 |
-
'JCB','
|
83 |
$pmList[] = $pm;
|
84 |
|
85 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
86 |
$pm->__PaymentMethod('MaestroUK','CreditCard',
|
87 |
-
'MaestroUK','
|
88 |
$pmList[] = $pm;
|
89 |
|
90 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
91 |
$pm->__PaymentMethod('MasterCard','CreditCard',
|
92 |
-
'
|
93 |
$pmList[] = $pm;
|
94 |
|
95 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
96 |
$pm->__PaymentMethod('Solo','CreditCard',
|
97 |
-
'Solo','
|
98 |
$pmList[] = $pm;
|
99 |
|
100 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
101 |
$pm->__PaymentMethod('UATP','CreditCard',
|
102 |
-
'UATP','
|
103 |
$pmList[] = $pm;
|
104 |
|
105 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
106 |
$pm->__PaymentMethod('VISA','CreditCard',
|
107 |
-
'VISA','
|
108 |
$pmList[] = $pm;
|
109 |
|
110 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
@@ -114,12 +114,12 @@ class Morningtime_Internetkassa_Model_Source_PaymentMethodsList
|
|
114 |
|
115 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
116 |
$pm->__PaymentMethod('BCMC','CreditCard',
|
117 |
-
'BCMC','
|
118 |
$pmList[] = $pm;
|
119 |
|
120 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
121 |
$pm->__PaymentMethod('Maestro','CreditCard',
|
122 |
-
'Maestro','
|
123 |
'Cards: exceptions', false);
|
124 |
$pmList[] = $pm;
|
125 |
|
@@ -130,13 +130,13 @@ class Morningtime_Internetkassa_Model_Source_PaymentMethodsList
|
|
130 |
|
131 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
132 |
$pm->__PaymentMethod('NetReserve','CreditCard',
|
133 |
-
'NetReserve','
|
134 |
'Cards: Online Credit', false);
|
135 |
$pmList[] = $pm;
|
136 |
|
137 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
138 |
$pm->__PaymentMethod('UNEUROCOM','UNEUROCOM',
|
139 |
-
'UNEUROCOM','
|
140 |
'Cards: Online Credit', false);
|
141 |
$pmList[] = $pm;
|
142 |
|
@@ -147,55 +147,55 @@ class Morningtime_Internetkassa_Model_Source_PaymentMethodsList
|
|
147 |
|
148 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
149 |
$pm->__PaymentMethod('CBC Online','CBC Online',
|
150 |
-
'CBC Online','CBC
|
151 |
'WebBanking', false);
|
152 |
$pmList[] = $pm;
|
153 |
|
154 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
155 |
$pm->__PaymentMethod('CENTEA Online','CENTEA Online',
|
156 |
-
'CENTEA Online','CENTEA
|
157 |
'WebBanking', false);
|
158 |
$pmList[] = $pm;
|
159 |
|
160 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
161 |
$pm->__PaymentMethod('Dexia Direct Net','Dexia Direct Net',
|
162 |
-
'Dexia Direct Net','Dexia Direct
|
163 |
'WebBanking', false);
|
164 |
$pmList[] = $pm;
|
165 |
|
166 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
167 |
$pm->__PaymentMethod('eDankort','eDankort',
|
168 |
-
'eDankort','
|
169 |
$pmList[] = $pm;
|
170 |
|
171 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
172 |
$pm->__PaymentMethod('EPS','EPS',
|
173 |
-
'EPS','
|
174 |
$pmList[] = $pm;
|
175 |
|
176 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
177 |
$pm->__PaymentMethod('iDEAL','iDEAL',
|
178 |
-
'iDEAL','
|
179 |
$pmList[] = $pm;
|
180 |
|
181 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
182 |
$pm->__PaymentMethod('ING HomePay','ING HomePay',
|
183 |
-
'ING HomePay','ING
|
184 |
$pmList[] = $pm;
|
185 |
|
186 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
187 |
$pm->__PaymentMethod('KBC Online','KBC Online',
|
188 |
-
'KBC Online','KBC
|
189 |
$pmList[] = $pm;
|
190 |
|
191 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
192 |
$pm->__PaymentMethod('PostFinance Debit Direct','PostFinance Debit Direct',
|
193 |
-
'PostFinance Debit Direct','PostFinance Debit
|
194 |
$pmList[] = $pm;
|
195 |
|
196 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
197 |
$pm->__PaymentMethod('PostFinance yellownet','PostFinance yellownet',
|
198 |
-
'PostFinance yellownet','PostFinance
|
199 |
$pmList[] = $pm;
|
200 |
|
201 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
@@ -205,12 +205,12 @@ class Morningtime_Internetkassa_Model_Source_PaymentMethodsList
|
|
205 |
|
206 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
207 |
$pm->__PaymentMethod('Direct Debits DE','Direct Debits DE',
|
208 |
-
'Direct Debits DE','Direct Debits
|
209 |
$pmList[] = $pm;
|
210 |
|
211 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
212 |
$pm->__PaymentMethod('Direct Debits NL','Direct Debits NL',
|
213 |
-
'Direct Debits NL','Direct Debits
|
214 |
$pmList[] = $pm;
|
215 |
|
216 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
@@ -220,17 +220,17 @@ class Morningtime_Internetkassa_Model_Source_PaymentMethodsList
|
|
220 |
|
221 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
222 |
$pm->__PaymentMethod('Acceptgiro','Acceptgiro',
|
223 |
-
'Acceptgiro','
|
224 |
$pmList[] = $pm;
|
225 |
|
226 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
227 |
$pm->__PaymentMethod('Bank transfer','Bank transfer',
|
228 |
-
'Bank transfer','Bank
|
229 |
$pmList[] = $pm;
|
230 |
|
231 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
232 |
$pm->__PaymentMethod('Payment on Delivery','Payment on Delivery',
|
233 |
-
'Payment on Delivery','Payment on
|
234 |
$pmList[] = $pm;
|
235 |
|
236 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
@@ -240,7 +240,7 @@ class Morningtime_Internetkassa_Model_Source_PaymentMethodsList
|
|
240 |
|
241 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
242 |
$pm->__PaymentMethod('MiniTix','MiniTix',
|
243 |
-
'MiniTix','
|
244 |
$pmList[] = $pm;
|
245 |
|
246 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
@@ -250,7 +250,7 @@ class Morningtime_Internetkassa_Model_Source_PaymentMethodsList
|
|
250 |
|
251 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
252 |
$pm->__PaymentMethod('TUNZ','TUNZ',
|
253 |
-
'TUNZ','
|
254 |
$pmList[] = $pm;
|
255 |
|
256 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
@@ -260,12 +260,12 @@ class Morningtime_Internetkassa_Model_Source_PaymentMethodsList
|
|
260 |
|
261 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
262 |
$pm->__PaymentMethod('PAYPAL','PAYPAL',
|
263 |
-
'PAYPAL','
|
264 |
$pmList[] = $pm;
|
265 |
|
266 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
267 |
$pm->__PaymentMethod('Wallie','Wallie',
|
268 |
-
'Wallie','
|
269 |
$pmList[] = $pm;
|
270 |
|
271 |
return $pmList;
|
43 |
|
44 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
45 |
$pm->__PaymentMethod('AIRPLUS','CreditCard',
|
46 |
+
'AIRPLUS','AIRPLUS_choice.gif','Cards: General', false);
|
47 |
$pmList[] = $pm;
|
48 |
|
49 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
50 |
$pm->__PaymentMethod('American Express','CreditCard',
|
51 |
+
'American Express','American Express_choice.gif',
|
52 |
'Cards: General', false);
|
53 |
$pmList[] = $pm;
|
54 |
|
55 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
56 |
$pm->__PaymentMethod('Aurora','CreditCard',
|
57 |
+
'Aurora','Aurora_choice.gif','Cards: General'
|
58 |
, false);
|
59 |
$pmList[] = $pm;
|
60 |
|
61 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
62 |
$pm->__PaymentMethod('Aurore','CreditCard',
|
63 |
+
'Aurore','Aurore_choice.gif','Cards: General', false);
|
64 |
$pmList[] = $pm;
|
65 |
|
66 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
67 |
$pm->__PaymentMethod('Cofinoga','CreditCard',
|
68 |
+
'Cofinoga','Cofinoga_choice.gif','Cards: General', false);
|
69 |
$pmList[] = $pm;
|
70 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
71 |
$pm->__PaymentMethod('Dankort','CreditCard',
|
72 |
+
'Dankort','Dankort_choice.gif',
|
73 |
'Cards: General', false);
|
74 |
$pmList[] = $pm;
|
75 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
76 |
$pm->__PaymentMethod('Diners Club','CreditCard',
|
77 |
+
'Diners Club','Diners Club_choice.gif','Cards: General', false);
|
78 |
$pmList[] = $pm;
|
79 |
|
80 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
81 |
$pm->__PaymentMethod('JCB','CreditCard',
|
82 |
+
'JCB','JCB_choice.gif','Cards: General', false);
|
83 |
$pmList[] = $pm;
|
84 |
|
85 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
86 |
$pm->__PaymentMethod('MaestroUK','CreditCard',
|
87 |
+
'MaestroUK','MaestroUK_choice.gif','Cards: General', false);
|
88 |
$pmList[] = $pm;
|
89 |
|
90 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
91 |
$pm->__PaymentMethod('MasterCard','CreditCard',
|
92 |
+
'Eurocard','Eurocard_choice.gif','Cards: General', false);
|
93 |
$pmList[] = $pm;
|
94 |
|
95 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
96 |
$pm->__PaymentMethod('Solo','CreditCard',
|
97 |
+
'Solo','Solo_choice.gif','Cards: General', false);
|
98 |
$pmList[] = $pm;
|
99 |
|
100 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
101 |
$pm->__PaymentMethod('UATP','CreditCard',
|
102 |
+
'UATP','UATP_choice.gif','Cards: General', false);
|
103 |
$pmList[] = $pm;
|
104 |
|
105 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
106 |
$pm->__PaymentMethod('VISA','CreditCard',
|
107 |
+
'VISA','VISA_choice.gif','Cards: General', false);
|
108 |
$pmList[] = $pm;
|
109 |
|
110 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
114 |
|
115 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
116 |
$pm->__PaymentMethod('BCMC','CreditCard',
|
117 |
+
'BCMC','BCMC_choice.gif','Cards: exceptions', false);
|
118 |
$pmList[] = $pm;
|
119 |
|
120 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
121 |
$pm->__PaymentMethod('Maestro','CreditCard',
|
122 |
+
'Maestro','Maestro_choice.gif',
|
123 |
'Cards: exceptions', false);
|
124 |
$pmList[] = $pm;
|
125 |
|
130 |
|
131 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
132 |
$pm->__PaymentMethod('NetReserve','CreditCard',
|
133 |
+
'NetReserve','NetReserve_choice.gif',
|
134 |
'Cards: Online Credit', false);
|
135 |
$pmList[] = $pm;
|
136 |
|
137 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
138 |
$pm->__PaymentMethod('UNEUROCOM','UNEUROCOM',
|
139 |
+
'UNEUROCOM','UNEUROCOM_choice.gif',
|
140 |
'Cards: Online Credit', false);
|
141 |
$pmList[] = $pm;
|
142 |
|
147 |
|
148 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
149 |
$pm->__PaymentMethod('CBC Online','CBC Online',
|
150 |
+
'CBC Online','CBC Online_choice.gif',
|
151 |
'WebBanking', false);
|
152 |
$pmList[] = $pm;
|
153 |
|
154 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
155 |
$pm->__PaymentMethod('CENTEA Online','CENTEA Online',
|
156 |
+
'CENTEA Online','CENTEA Online_choice.gif',
|
157 |
'WebBanking', false);
|
158 |
$pmList[] = $pm;
|
159 |
|
160 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
161 |
$pm->__PaymentMethod('Dexia Direct Net','Dexia Direct Net',
|
162 |
+
'Dexia Direct Net','Dexia Direct Net_choice.gif',
|
163 |
'WebBanking', false);
|
164 |
$pmList[] = $pm;
|
165 |
|
166 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
167 |
$pm->__PaymentMethod('eDankort','eDankort',
|
168 |
+
'eDankort','eDankort_choice.gif','WebBanking', false);
|
169 |
$pmList[] = $pm;
|
170 |
|
171 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
172 |
$pm->__PaymentMethod('EPS','EPS',
|
173 |
+
'EPS','EPS_choice.gif','WebBanking', false);
|
174 |
$pmList[] = $pm;
|
175 |
|
176 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
177 |
$pm->__PaymentMethod('iDEAL','iDEAL',
|
178 |
+
'iDEAL','iDEAL_choice.gif','WebBanking', false);
|
179 |
$pmList[] = $pm;
|
180 |
|
181 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
182 |
$pm->__PaymentMethod('ING HomePay','ING HomePay',
|
183 |
+
'ING HomePay','ING HomePay_choice.gif','WebBanking', false);
|
184 |
$pmList[] = $pm;
|
185 |
|
186 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
187 |
$pm->__PaymentMethod('KBC Online','KBC Online',
|
188 |
+
'KBC Online','KBC Online_choice.gif','WebBanking', false);
|
189 |
$pmList[] = $pm;
|
190 |
|
191 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
192 |
$pm->__PaymentMethod('PostFinance Debit Direct','PostFinance Debit Direct',
|
193 |
+
'PostFinance Debit Direct','PostFinance Debit Direct_choice.gif','WebBanking', false);
|
194 |
$pmList[] = $pm;
|
195 |
|
196 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
197 |
$pm->__PaymentMethod('PostFinance yellownet','PostFinance yellownet',
|
198 |
+
'PostFinance yellownet','PostFinance yellownet_choice.gif','WebBanking', false);
|
199 |
$pmList[] = $pm;
|
200 |
|
201 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
205 |
|
206 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
207 |
$pm->__PaymentMethod('Direct Debits DE','Direct Debits DE',
|
208 |
+
'Direct Debits DE','Direct Debits DE_choice.gif','Direct Debits', false);
|
209 |
$pmList[] = $pm;
|
210 |
|
211 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
212 |
$pm->__PaymentMethod('Direct Debits NL','Direct Debits NL',
|
213 |
+
'Direct Debits NL','Direct Debits NL_choice.gif','Direct Debits', false);
|
214 |
$pmList[] = $pm;
|
215 |
|
216 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
220 |
|
221 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
222 |
$pm->__PaymentMethod('Acceptgiro','Acceptgiro',
|
223 |
+
'Acceptgiro','Acceptgiro_choice.gif','Offline payment', false);
|
224 |
$pmList[] = $pm;
|
225 |
|
226 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
227 |
$pm->__PaymentMethod('Bank transfer','Bank transfer',
|
228 |
+
'Bank transfer','Bank transfer_choice.gif','Offline payment', false);
|
229 |
$pmList[] = $pm;
|
230 |
|
231 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
232 |
$pm->__PaymentMethod('Payment on Delivery','Payment on Delivery',
|
233 |
+
'Payment on Delivery','Payment on Delivery_choice.gif','Offline payment', false);
|
234 |
$pmList[] = $pm;
|
235 |
|
236 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
240 |
|
241 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
242 |
$pm->__PaymentMethod('MiniTix','MiniTix',
|
243 |
+
'MiniTix','MiniTix_choice.gif','Micro', false);
|
244 |
$pmList[] = $pm;
|
245 |
|
246 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
250 |
|
251 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
252 |
$pm->__PaymentMethod('TUNZ','TUNZ',
|
253 |
+
'TUNZ','TUNZ_choice.gif','Mobile', false);
|
254 |
$pmList[] = $pm;
|
255 |
|
256 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
260 |
|
261 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
262 |
$pm->__PaymentMethod('PAYPAL','PAYPAL',
|
263 |
+
'PAYPAL','PAYPAL_choice.gif','Others', false);
|
264 |
$pmList[] = $pm;
|
265 |
|
266 |
$pm = Mage::getModel('internetkassa/source_paymentMethod');
|
267 |
$pm->__PaymentMethod('Wallie','Wallie',
|
268 |
+
'Wallie','Wallie_choice.gif','Others', false);
|
269 |
$pmList[] = $pm;
|
270 |
|
271 |
return $pmList;
|
app/code/community/Morningtime/Internetkassa/controllers/{OgoneController.php → ResultController.php}
RENAMED
@@ -23,7 +23,7 @@
|
|
23 |
* @name Morningtime_Internetkassa_InternetkassaController
|
24 |
* @author Magento Core Team <core@magentocommerce.com>, ALTIC
|
25 |
*/
|
26 |
-
class
|
27 |
{
|
28 |
/**
|
29 |
* Get Checkout Singleton
|
@@ -337,7 +337,7 @@ class Morningtime_Internetkassa_OgoneController extends Mage_Core_Controller_Fro
|
|
337 |
->save();
|
338 |
}
|
339 |
|
340 |
-
|
341 |
$order->save();
|
342 |
|
343 |
$this->_redirect('checkout/onepage/success');
|
@@ -349,7 +349,7 @@ class Morningtime_Internetkassa_OgoneController extends Mage_Core_Controller_Fro
|
|
349 |
|
350 |
$session = Mage::getSingleton('checkout/session');
|
351 |
$session->addError($this->__('An unexpected error occurred. Your order was cancelled. Please try again.'));
|
352 |
-
|
353 |
return;
|
354 |
}
|
355 |
} else {
|
@@ -454,7 +454,7 @@ class Morningtime_Internetkassa_OgoneController extends Mage_Core_Controller_Fro
|
|
454 |
if ($order instanceof Mage_Sales_Model_Order && $order->getId()) {
|
455 |
$order->addStatusToHistory(
|
456 |
$order->getStatus(),
|
457 |
-
$this->__('Customer returned from
|
458 |
);
|
459 |
|
460 |
$order->save();
|
@@ -463,7 +463,7 @@ class Morningtime_Internetkassa_OgoneController extends Mage_Core_Controller_Fro
|
|
463 |
// $this->loadLayout();
|
464 |
// $this->renderLayout();
|
465 |
Mage::getSingleton('checkout/session')->unsLastRealOrderId();
|
466 |
-
$this->_redirect('
|
467 |
}
|
468 |
|
469 |
}
|
23 |
* @name Morningtime_Internetkassa_InternetkassaController
|
24 |
* @author Magento Core Team <core@magentocommerce.com>, ALTIC
|
25 |
*/
|
26 |
+
class Morningtime_Internetkassa_ResultController extends Mage_Core_Controller_Front_Action
|
27 |
{
|
28 |
/**
|
29 |
* Get Checkout Singleton
|
337 |
->save();
|
338 |
}
|
339 |
|
340 |
+
$order->sendNewOrderEmail();
|
341 |
$order->save();
|
342 |
|
343 |
$this->_redirect('checkout/onepage/success');
|
349 |
|
350 |
$session = Mage::getSingleton('checkout/session');
|
351 |
$session->addError($this->__('An unexpected error occurred. Your order was cancelled. Please try again.'));
|
352 |
+
$this->_redirect('checkout/cart');
|
353 |
return;
|
354 |
}
|
355 |
} else {
|
454 |
if ($order instanceof Mage_Sales_Model_Order && $order->getId()) {
|
455 |
$order->addStatusToHistory(
|
456 |
$order->getStatus(),
|
457 |
+
$this->__('Customer returned from Ogone with an error.') . $errorMsg
|
458 |
);
|
459 |
|
460 |
$order->save();
|
463 |
// $this->loadLayout();
|
464 |
// $this->renderLayout();
|
465 |
Mage::getSingleton('checkout/session')->unsLastRealOrderId();
|
466 |
+
$this->_redirect('ogone/result/exception');
|
467 |
}
|
468 |
|
469 |
}
|
app/code/community/Morningtime/Internetkassa/etc/config.xml
CHANGED
@@ -136,7 +136,7 @@
|
|
136 |
<active>0</active>
|
137 |
<model>internetkassa/internetkassa</model>
|
138 |
<title>Internetkassa</title>
|
139 |
-
<order_status>
|
140 |
<ogone_logo>https://secure.ogone.com/images/ogone.gif</ogone_logo>
|
141 |
<SHA1PASS></SHA1PASS>
|
142 |
<PSPID></PSPID>
|
@@ -152,10 +152,10 @@
|
|
152 |
<FONTTYPE>Verdana</FONTTYPE>
|
153 |
<LOGO></LOGO>
|
154 |
<TP></TP>
|
155 |
-
<accepturl>{{unsecure_base_url}}internetkassa/
|
156 |
-
<declineurl>{{unsecure_base_url}}internetkassa/
|
157 |
-
<exceptionurl>{{unsecure_base_url}}internetkassa/
|
158 |
-
<cancelurl>{{unsecure_base_url}}internetkassa/
|
159 |
<homeurl>{{unsecure_base_url}}</homeurl>
|
160 |
<catalogurl>{{unsecure_base_url}}</catalogurl>
|
161 |
<CN></CN>
|
136 |
<active>0</active>
|
137 |
<model>internetkassa/internetkassa</model>
|
138 |
<title>Internetkassa</title>
|
139 |
+
<order_status>pending</order_status>
|
140 |
<ogone_logo>https://secure.ogone.com/images/ogone.gif</ogone_logo>
|
141 |
<SHA1PASS></SHA1PASS>
|
142 |
<PSPID></PSPID>
|
152 |
<FONTTYPE>Verdana</FONTTYPE>
|
153 |
<LOGO></LOGO>
|
154 |
<TP></TP>
|
155 |
+
<accepturl>{{unsecure_base_url}}internetkassa/result/success</accepturl>
|
156 |
+
<declineurl>{{unsecure_base_url}}internetkassa/result/decline</declineurl>
|
157 |
+
<exceptionurl>{{unsecure_base_url}}internetkassa/result/exception</exceptionurl>
|
158 |
+
<cancelurl>{{unsecure_base_url}}internetkassa/result/cancel</cancelurl>
|
159 |
<homeurl>{{unsecure_base_url}}</homeurl>
|
160 |
<catalogurl>{{unsecure_base_url}}</catalogurl>
|
161 |
<CN></CN>
|
app/code/community/Morningtime/Internetkassa/etc/system.xml
CHANGED
@@ -34,12 +34,12 @@
|
|
34 |
<sort_order>30</sort_order>
|
35 |
<show_in_default>1</show_in_default>
|
36 |
<show_in_website>1</show_in_website>
|
37 |
-
<show_in_store>
|
38 |
</title>
|
39 |
<order_status translate="label">
|
40 |
<label>New order status</label>
|
41 |
<frontend_type>select</frontend_type>
|
42 |
-
<source_model>adminhtml/
|
43 |
<sort_order>320</sort_order>
|
44 |
<show_in_default>1</show_in_default>
|
45 |
<show_in_website>1</show_in_website>
|
@@ -52,7 +52,7 @@
|
|
52 |
<sort_order>10</sort_order>
|
53 |
<show_in_default>1</show_in_default>
|
54 |
<show_in_website>1</show_in_website>
|
55 |
-
<show_in_store>
|
56 |
</active>
|
57 |
<test translate="label">
|
58 |
<label>Test mode</label>
|
@@ -70,7 +70,7 @@
|
|
70 |
<sort_order>25</sort_order>
|
71 |
<show_in_default>1</show_in_default>
|
72 |
<show_in_website>1</show_in_website>
|
73 |
-
<show_in_store>
|
74 |
</issuer>
|
75 |
<PSPID translate="label">
|
76 |
<label>PSPID</label>
|
@@ -78,7 +78,7 @@
|
|
78 |
<sort_order>40</sort_order>
|
79 |
<show_in_default>1</show_in_default>
|
80 |
<show_in_website>1</show_in_website>
|
81 |
-
<show_in_store>
|
82 |
</PSPID>
|
83 |
<SHA1PASS translate="label">
|
84 |
<label>SHA1PASS</label>
|
@@ -86,7 +86,7 @@
|
|
86 |
<sort_order>50</sort_order>
|
87 |
<show_in_default>1</show_in_default>
|
88 |
<show_in_website>1</show_in_website>
|
89 |
-
<show_in_store>
|
90 |
</SHA1PASS>
|
91 |
<Currency>
|
92 |
<label>Currency</label>
|
@@ -95,7 +95,7 @@
|
|
95 |
<sort_order>60</sort_order>
|
96 |
<show_in_default>1</show_in_default>
|
97 |
<show_in_website>1</show_in_website>
|
98 |
-
<show_in_store>
|
99 |
</Currency>
|
100 |
<Language>
|
101 |
<label>Language</label>
|
@@ -104,7 +104,7 @@
|
|
104 |
<sort_order>70</sort_order>
|
105 |
<show_in_default>1</show_in_default>
|
106 |
<show_in_website>1</show_in_website>
|
107 |
-
<show_in_store>
|
108 |
</Language>
|
109 |
<PAGE_TITLE>
|
110 |
<label>PAGE_TITLE</label>
|
@@ -112,7 +112,7 @@
|
|
112 |
<sort_order>80</sort_order>
|
113 |
<show_in_default>1</show_in_default>
|
114 |
<show_in_website>1</show_in_website>
|
115 |
-
<show_in_store>
|
116 |
</PAGE_TITLE>
|
117 |
<BGCOLOR>
|
118 |
<label>BGCOLOR</label>
|
@@ -120,7 +120,7 @@
|
|
120 |
<sort_order>90</sort_order>
|
121 |
<show_in_default>1</show_in_default>
|
122 |
<show_in_website>1</show_in_website>
|
123 |
-
<show_in_store>
|
124 |
</BGCOLOR>
|
125 |
<TXTCOLOR>
|
126 |
<label>TXTCOLOR</label>
|
@@ -128,7 +128,7 @@
|
|
128 |
<sort_order>100</sort_order>
|
129 |
<show_in_default>1</show_in_default>
|
130 |
<show_in_website>1</show_in_website>
|
131 |
-
<show_in_store>
|
132 |
</TXTCOLOR>
|
133 |
<TBLBGCOLOR>
|
134 |
<label>TBLBGCOLOR</label>
|
@@ -136,7 +136,7 @@
|
|
136 |
<sort_order>110</sort_order>
|
137 |
<show_in_default>1</show_in_default>
|
138 |
<show_in_website>1</show_in_website>
|
139 |
-
<show_in_store>
|
140 |
</TBLBGCOLOR>
|
141 |
<TBLTXTCOLOR>
|
142 |
<label>TBLTXTCOLOR</label>
|
@@ -144,7 +144,7 @@
|
|
144 |
<sort_order>120</sort_order>
|
145 |
<show_in_default>1</show_in_default>
|
146 |
<show_in_website>1</show_in_website>
|
147 |
-
<show_in_store>
|
148 |
</TBLTXTCOLOR>
|
149 |
<BUTTONBGCOL>
|
150 |
<label>BUTTONBGCOL</label>
|
@@ -152,7 +152,7 @@
|
|
152 |
<sort_order>130</sort_order>
|
153 |
<show_in_default>1</show_in_default>
|
154 |
<show_in_website>1</show_in_website>
|
155 |
-
<show_in_store>
|
156 |
</BUTTONBGCOL>
|
157 |
<BUTTONTXTCOLOR>
|
158 |
<label>BUTTONTXTCOLOR</label>
|
@@ -160,7 +160,7 @@
|
|
160 |
<sort_order>140</sort_order>
|
161 |
<show_in_default>1</show_in_default>
|
162 |
<show_in_website>1</show_in_website>
|
163 |
-
<show_in_store>
|
164 |
</BUTTONTXTCOLOR>
|
165 |
<FONTTYPE>
|
166 |
<label>FONTTYPE</label>
|
@@ -168,7 +168,7 @@
|
|
168 |
<sort_order>150</sort_order>
|
169 |
<show_in_default>1</show_in_default>
|
170 |
<show_in_website>1</show_in_website>
|
171 |
-
<show_in_store>
|
172 |
</FONTTYPE>
|
173 |
<LOGO>
|
174 |
<label>LOGO</label>
|
@@ -176,7 +176,7 @@
|
|
176 |
<sort_order>160</sort_order>
|
177 |
<show_in_default>1</show_in_default>
|
178 |
<show_in_website>1</show_in_website>
|
179 |
-
<show_in_store>
|
180 |
</LOGO>
|
181 |
<TP>
|
182 |
<label>TP</label>
|
@@ -184,7 +184,7 @@
|
|
184 |
<sort_order>170</sort_order>
|
185 |
<show_in_default>1</show_in_default>
|
186 |
<show_in_website>1</show_in_website>
|
187 |
-
<show_in_store>
|
188 |
</TP>
|
189 |
<accepturl>
|
190 |
<label>accepturl</label>
|
@@ -192,7 +192,7 @@
|
|
192 |
<sort_order>180</sort_order>
|
193 |
<show_in_default>1</show_in_default>
|
194 |
<show_in_website>1</show_in_website>
|
195 |
-
<show_in_store>
|
196 |
</accepturl>
|
197 |
<declineurl>
|
198 |
<label>declineurl</label>
|
@@ -200,7 +200,7 @@
|
|
200 |
<sort_order>190</sort_order>
|
201 |
<show_in_default>1</show_in_default>
|
202 |
<show_in_website>1</show_in_website>
|
203 |
-
<show_in_store>
|
204 |
</declineurl>
|
205 |
<exceptionurl>
|
206 |
<label>exceptionurl</label>
|
@@ -208,7 +208,7 @@
|
|
208 |
<sort_order>200</sort_order>
|
209 |
<show_in_default>1</show_in_default>
|
210 |
<show_in_website>1</show_in_website>
|
211 |
-
<show_in_store>
|
212 |
</exceptionurl>
|
213 |
<cancelurl>
|
214 |
<label>cancelurl</label>
|
@@ -216,7 +216,7 @@
|
|
216 |
<sort_order>210</sort_order>
|
217 |
<show_in_default>1</show_in_default>
|
218 |
<show_in_website>1</show_in_website>
|
219 |
-
<show_in_store>
|
220 |
</cancelurl>
|
221 |
<homeurl>
|
222 |
<label>homeurl</label>
|
@@ -224,7 +224,7 @@
|
|
224 |
<sort_order>220</sort_order>
|
225 |
<show_in_default>1</show_in_default>
|
226 |
<show_in_website>1</show_in_website>
|
227 |
-
<show_in_store>
|
228 |
</homeurl>
|
229 |
<catalogurl>
|
230 |
<label>catalogurl</label>
|
@@ -232,7 +232,7 @@
|
|
232 |
<sort_order>230</sort_order>
|
233 |
<show_in_default>1</show_in_default>
|
234 |
<show_in_website>1</show_in_website>
|
235 |
-
<show_in_store>
|
236 |
</catalogurl>
|
237 |
<cctypes>
|
238 |
<label>Payment Methods</label>
|
@@ -241,7 +241,7 @@
|
|
241 |
<sort_order>240</sort_order>
|
242 |
<show_in_default>1</show_in_default>
|
243 |
<show_in_website>1</show_in_website>
|
244 |
-
<show_in_store>
|
245 |
</cctypes>
|
246 |
</fields>
|
247 |
</internetkassa>
|
34 |
<sort_order>30</sort_order>
|
35 |
<show_in_default>1</show_in_default>
|
36 |
<show_in_website>1</show_in_website>
|
37 |
+
<show_in_store>1</show_in_store>
|
38 |
</title>
|
39 |
<order_status translate="label">
|
40 |
<label>New order status</label>
|
41 |
<frontend_type>select</frontend_type>
|
42 |
+
<source_model>adminhtml/system_config_source_order_status_processing</source_model>
|
43 |
<sort_order>320</sort_order>
|
44 |
<show_in_default>1</show_in_default>
|
45 |
<show_in_website>1</show_in_website>
|
52 |
<sort_order>10</sort_order>
|
53 |
<show_in_default>1</show_in_default>
|
54 |
<show_in_website>1</show_in_website>
|
55 |
+
<show_in_store>1</show_in_store>
|
56 |
</active>
|
57 |
<test translate="label">
|
58 |
<label>Test mode</label>
|
70 |
<sort_order>25</sort_order>
|
71 |
<show_in_default>1</show_in_default>
|
72 |
<show_in_website>1</show_in_website>
|
73 |
+
<show_in_store>1</show_in_store>
|
74 |
</issuer>
|
75 |
<PSPID translate="label">
|
76 |
<label>PSPID</label>
|
78 |
<sort_order>40</sort_order>
|
79 |
<show_in_default>1</show_in_default>
|
80 |
<show_in_website>1</show_in_website>
|
81 |
+
<show_in_store>1</show_in_store>
|
82 |
</PSPID>
|
83 |
<SHA1PASS translate="label">
|
84 |
<label>SHA1PASS</label>
|
86 |
<sort_order>50</sort_order>
|
87 |
<show_in_default>1</show_in_default>
|
88 |
<show_in_website>1</show_in_website>
|
89 |
+
<show_in_store>1</show_in_store>
|
90 |
</SHA1PASS>
|
91 |
<Currency>
|
92 |
<label>Currency</label>
|
95 |
<sort_order>60</sort_order>
|
96 |
<show_in_default>1</show_in_default>
|
97 |
<show_in_website>1</show_in_website>
|
98 |
+
<show_in_store>1</show_in_store>
|
99 |
</Currency>
|
100 |
<Language>
|
101 |
<label>Language</label>
|
104 |
<sort_order>70</sort_order>
|
105 |
<show_in_default>1</show_in_default>
|
106 |
<show_in_website>1</show_in_website>
|
107 |
+
<show_in_store>1</show_in_store>
|
108 |
</Language>
|
109 |
<PAGE_TITLE>
|
110 |
<label>PAGE_TITLE</label>
|
112 |
<sort_order>80</sort_order>
|
113 |
<show_in_default>1</show_in_default>
|
114 |
<show_in_website>1</show_in_website>
|
115 |
+
<show_in_store>1</show_in_store>
|
116 |
</PAGE_TITLE>
|
117 |
<BGCOLOR>
|
118 |
<label>BGCOLOR</label>
|
120 |
<sort_order>90</sort_order>
|
121 |
<show_in_default>1</show_in_default>
|
122 |
<show_in_website>1</show_in_website>
|
123 |
+
<show_in_store>1</show_in_store>
|
124 |
</BGCOLOR>
|
125 |
<TXTCOLOR>
|
126 |
<label>TXTCOLOR</label>
|
128 |
<sort_order>100</sort_order>
|
129 |
<show_in_default>1</show_in_default>
|
130 |
<show_in_website>1</show_in_website>
|
131 |
+
<show_in_store>1</show_in_store>
|
132 |
</TXTCOLOR>
|
133 |
<TBLBGCOLOR>
|
134 |
<label>TBLBGCOLOR</label>
|
136 |
<sort_order>110</sort_order>
|
137 |
<show_in_default>1</show_in_default>
|
138 |
<show_in_website>1</show_in_website>
|
139 |
+
<show_in_store>1</show_in_store>
|
140 |
</TBLBGCOLOR>
|
141 |
<TBLTXTCOLOR>
|
142 |
<label>TBLTXTCOLOR</label>
|
144 |
<sort_order>120</sort_order>
|
145 |
<show_in_default>1</show_in_default>
|
146 |
<show_in_website>1</show_in_website>
|
147 |
+
<show_in_store>1</show_in_store>
|
148 |
</TBLTXTCOLOR>
|
149 |
<BUTTONBGCOL>
|
150 |
<label>BUTTONBGCOL</label>
|
152 |
<sort_order>130</sort_order>
|
153 |
<show_in_default>1</show_in_default>
|
154 |
<show_in_website>1</show_in_website>
|
155 |
+
<show_in_store>1</show_in_store>
|
156 |
</BUTTONBGCOL>
|
157 |
<BUTTONTXTCOLOR>
|
158 |
<label>BUTTONTXTCOLOR</label>
|
160 |
<sort_order>140</sort_order>
|
161 |
<show_in_default>1</show_in_default>
|
162 |
<show_in_website>1</show_in_website>
|
163 |
+
<show_in_store>1</show_in_store>
|
164 |
</BUTTONTXTCOLOR>
|
165 |
<FONTTYPE>
|
166 |
<label>FONTTYPE</label>
|
168 |
<sort_order>150</sort_order>
|
169 |
<show_in_default>1</show_in_default>
|
170 |
<show_in_website>1</show_in_website>
|
171 |
+
<show_in_store>1</show_in_store>
|
172 |
</FONTTYPE>
|
173 |
<LOGO>
|
174 |
<label>LOGO</label>
|
176 |
<sort_order>160</sort_order>
|
177 |
<show_in_default>1</show_in_default>
|
178 |
<show_in_website>1</show_in_website>
|
179 |
+
<show_in_store>1</show_in_store>
|
180 |
</LOGO>
|
181 |
<TP>
|
182 |
<label>TP</label>
|
184 |
<sort_order>170</sort_order>
|
185 |
<show_in_default>1</show_in_default>
|
186 |
<show_in_website>1</show_in_website>
|
187 |
+
<show_in_store>1</show_in_store>
|
188 |
</TP>
|
189 |
<accepturl>
|
190 |
<label>accepturl</label>
|
192 |
<sort_order>180</sort_order>
|
193 |
<show_in_default>1</show_in_default>
|
194 |
<show_in_website>1</show_in_website>
|
195 |
+
<show_in_store>1</show_in_store>
|
196 |
</accepturl>
|
197 |
<declineurl>
|
198 |
<label>declineurl</label>
|
200 |
<sort_order>190</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 |
</declineurl>
|
205 |
<exceptionurl>
|
206 |
<label>exceptionurl</label>
|
208 |
<sort_order>200</sort_order>
|
209 |
<show_in_default>1</show_in_default>
|
210 |
<show_in_website>1</show_in_website>
|
211 |
+
<show_in_store>1</show_in_store>
|
212 |
</exceptionurl>
|
213 |
<cancelurl>
|
214 |
<label>cancelurl</label>
|
216 |
<sort_order>210</sort_order>
|
217 |
<show_in_default>1</show_in_default>
|
218 |
<show_in_website>1</show_in_website>
|
219 |
+
<show_in_store>1</show_in_store>
|
220 |
</cancelurl>
|
221 |
<homeurl>
|
222 |
<label>homeurl</label>
|
224 |
<sort_order>220</sort_order>
|
225 |
<show_in_default>1</show_in_default>
|
226 |
<show_in_website>1</show_in_website>
|
227 |
+
<show_in_store>1</show_in_store>
|
228 |
</homeurl>
|
229 |
<catalogurl>
|
230 |
<label>catalogurl</label>
|
232 |
<sort_order>230</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 |
</catalogurl>
|
237 |
<cctypes>
|
238 |
<label>Payment Methods</label>
|
241 |
<sort_order>240</sort_order>
|
242 |
<show_in_default>1</show_in_default>
|
243 |
<show_in_website>1</show_in_website>
|
244 |
+
<show_in_store>1</show_in_store>
|
245 |
</cctypes>
|
246 |
</fields>
|
247 |
</internetkassa>
|
app/design/frontend/default/default/template/morningtime/internetkassa/form.phtml
CHANGED
@@ -20,22 +20,30 @@
|
|
20 |
$_code=$this->getMethodCode() ;
|
21 |
$_method = $this->getMethod();
|
22 |
?>
|
23 |
-
<p><?php print $this->__('Choose your payment method'); ?>:</p>
|
24 |
<span id="internetkassa-please-wait" style="display:none;" class="opc-please-wait">
|
25 |
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" class="v-middle" alt="" /> <?php echo $this->__('Loading next step...') ?>
|
26 |
</span>
|
27 |
<ul id="payment_form_<?php echo $_code ?>" style="display:none">
|
|
|
|
|
|
|
28 |
<?php
|
29 |
-
$
|
|
|
|
|
|
|
|
|
|
|
30 |
if ($_method ) {
|
31 |
$availableTypes = $_method->getConfigData('cctypes');
|
32 |
if ($availableTypes) {
|
|
|
33 |
$availableTypes = explode(',', $availableTypes);
|
34 |
|
35 |
foreach ($availableTypes as $key=>$name) {
|
36 |
?>
|
37 |
-
<li style="border-bottom: 1px solid #ddd; padding: 0.5em; margin: auto; height:
|
38 |
-
<img src="https://secure.ogone.com/images/<?php echo $name ?>
|
39 |
<input type="radio" name="payment[cc_type]" value="<?php echo $name?>"> <?php echo $name?>
|
40 |
</li>
|
41 |
<?php
|
20 |
$_code=$this->getMethodCode() ;
|
21 |
$_method = $this->getMethod();
|
22 |
?>
|
|
|
23 |
<span id="internetkassa-please-wait" style="display:none;" class="opc-please-wait">
|
24 |
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" class="v-middle" alt="" /> <?php echo $this->__('Loading next step...') ?>
|
25 |
</span>
|
26 |
<ul id="payment_form_<?php echo $_code ?>" style="display:none">
|
27 |
+
<li>
|
28 |
+
<strong><?php print $this->__('Choose your payment method'); ?>:</strong>
|
29 |
+
</li>
|
30 |
<?php
|
31 |
+
$logoArray = array();
|
32 |
+
$listItems = Mage::getModel('internetkassa/source_paymentMethodsList')->getPMList();
|
33 |
+
foreach ($listItems as $item):
|
34 |
+
$logoArray[$item->getPmName()] = $item->getPmUrlLogo();
|
35 |
+
endforeach;
|
36 |
+
|
37 |
if ($_method ) {
|
38 |
$availableTypes = $_method->getConfigData('cctypes');
|
39 |
if ($availableTypes) {
|
40 |
+
|
41 |
$availableTypes = explode(',', $availableTypes);
|
42 |
|
43 |
foreach ($availableTypes as $key=>$name) {
|
44 |
?>
|
45 |
+
<li style="border-bottom: 1px solid #ddd; padding: 0.5em; margin: auto; height: 25px; line-height: 25px;">
|
46 |
+
<img src="https://secure.ogone.com/images/<?php echo $logoArray[$name] ?>" style="float: right; margin-right: 1em;" height="25">
|
47 |
<input type="radio" name="payment[cc_type]" value="<?php echo $name?>"> <?php echo $name?>
|
48 |
</li>
|
49 |
<?php
|
app/locale/en_US/Morningtime_Internetkassa.csv
CHANGED
@@ -21,4 +21,5 @@
|
|
21 |
"Paid with Internetkassa","Paid with Internetkassa"
|
22 |
"Card type","Card type"
|
23 |
"Processor","Processor"
|
24 |
-
"Choose your payment method","Choose your payment method"
|
|
21 |
"Paid with Internetkassa","Paid with Internetkassa"
|
22 |
"Card type","Card type"
|
23 |
"Processor","Processor"
|
24 |
+
"Choose your payment method","Choose your payment method"
|
25 |
+
"You have to choose a payment method!","You have to choose a payment method!"
|
app/locale/nl_NL/Morningtime_Internetkassa.csv
CHANGED
@@ -21,4 +21,5 @@
|
|
21 |
"Paid with Internetkassa","Betaald met Internetkassa"
|
22 |
"Card type","Betaalmethode"
|
23 |
"Processor","Merk"
|
24 |
-
"Choose your payment method","Kies uw betaalmethode"
|
|
21 |
"Paid with Internetkassa","Betaald met Internetkassa"
|
22 |
"Card type","Betaalmethode"
|
23 |
"Processor","Merk"
|
24 |
+
"Choose your payment method","Kies uw betaalmethode"
|
25 |
+
"You have to choose a payment method!","U dient een betaalmethode te kiezen!"
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Morningtime_Internetkassa</name>
|
4 |
-
<version>1.3.2.4</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
|
7 |
<channel>community</channel>
|
@@ -70,9 +70,9 @@ Voor commerciele hulp bij installaties, stuur een email naar info@morningtime.co
|
|
70 |
- Micro </description>
|
71 |
<notes>Stable Release</notes>
|
72 |
<authors><author><name>Mathijs Koenraadt (MSc)</name><user>auto-converted</user><email>info@morningtime.com</email></author></authors>
|
73 |
-
<date>2009-10-
|
74 |
-
<time>
|
75 |
-
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="morningtime"><dir name="internetkassa"><file name="info.phtml" hash="3cbd827aa0a3a4edb008c7b990c3db66"/><dir name="pdf"><file name="info.phtml" hash="05579e93a584cc9ee43a53fea8ba6da5"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="morningtime"><dir name="internetkassa"><file name="form.phtml" hash="
|
76 |
<compatible/>
|
77 |
<dependencies/>
|
78 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Morningtime_Internetkassa</name>
|
4 |
+
<version>1.3.2.4.2</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
|
7 |
<channel>community</channel>
|
70 |
- Micro </description>
|
71 |
<notes>Stable Release</notes>
|
72 |
<authors><author><name>Mathijs Koenraadt (MSc)</name><user>auto-converted</user><email>info@morningtime.com</email></author></authors>
|
73 |
+
<date>2009-10-18</date>
|
74 |
+
<time>10:17:10</time>
|
75 |
+
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="morningtime"><dir name="internetkassa"><file name="info.phtml" hash="3cbd827aa0a3a4edb008c7b990c3db66"/><dir name="pdf"><file name="info.phtml" hash="05579e93a584cc9ee43a53fea8ba6da5"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="morningtime"><dir name="internetkassa"><file name="form.phtml" hash="c1098b177f0b1dfbb6147a9a709a0c7b"/><file name="info.phtml" hash="1109a89242b9700c6429e86b72e738d3"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Morningtime_Internetkassa.csv" hash="5319bbb126b9f483cb99b66bc12a4500"/></dir><dir name="nl_NL"><file name="Morningtime_Internetkassa.csv" hash="82037bd514a36f6c9d2c51f73eb3ed07"/></dir></target><target name="mageetc"><dir name="modules"><file name="Morningtime_Internetkassa.xml" hash="9731708aa2a079f84a50c70c87177fd7"/></dir></target><target name="magecommunity"><dir name="Morningtime"><dir name="Internetkassa"><dir name="Block"><file name="Form.php" hash="a109336d61bdfa7005b41898bc38ff81"/><file name="Info.php" hash="77ab3da2e9b35057058b7bb567fa3ffc"/><file name="Redirect.php" hash="1592521ed0a9d8f21be8b96b73a1bbeb"/></dir><dir name="controllers"><file name="ResultController.php" hash="a2866e21128b5a57f08673e9225a378b"/></dir><dir name="etc"><file name="config.xml" hash="1fbdadf0d66ba628ec95a216f85cbaee"/><file name="system.xml" hash="cdb4cc793a77a976342bc1cb0b44cd74"/></dir><dir name="Helper"><file name="Data.php" hash="fa86846926f40fa9c95a4de34ca763ef"/><file name="ViewerList.php" hash="68418a460feb58c02f5e60d84f21a33f"/></dir><dir name="Model"><file name="Internetkassa.php" hash="24c4302b466720eec1fb5f687c19ab04"/><dir name="Source"><file name="Currencies.php" hash="13eedd7e0079b6f240970247f9fd6398"/><file name="Issuers.php" hash="2583a4a262d8ba2bb9676b77961994ab"/><file name="Languages.php" hash="3c3ccf80a3b03d9684ca33615a3c4995"/><file name="PaymentMethod.php" hash="efa2989f80a115bedd6952c45b837ef9"/><file name="PaymentMethods.php" hash="26c106880b74c9a2b880e5cd772955c0"/><file name="PaymentMethodsList.php" hash="d61488e0d24e24d8a13b2e4c44ce02c8"/></dir></dir></dir></dir></target></contents>
|
76 |
<compatible/>
|
77 |
<dependencies/>
|
78 |
</package>
|