Phoenix_Worldpay - Version 1.3.1

Version Notes

- fixed minor translation issues
- added missing features

Download this release

Release Info

Developer Magento Core Team
Extension Phoenix_Worldpay
Version 1.3.1
Comparing to
See all releases


Code changes from version 1.3.0 to 1.3.1

Files changed (12) hide show
  1. app/code/community/Phoenix/Worldpay/Model/Cc.php +61 -16
  2. app/code/community/Phoenix/Worldpay/Model/Source/SignatureType.php +29 -0
  3. app/code/community/Phoenix/Worldpay/controllers/ProcessingController.php +22 -0
  4. app/code/community/Phoenix/Worldpay/etc/config.xml +2 -1
  5. app/code/community/Phoenix/Worldpay/etc/system.xml +44 -7
  6. app/design/adminhtml/default/default/template/worldpay/info.phtml +4 -1
  7. app/design/frontend/default/default/template/worldpay/failure.phtml +1 -1
  8. app/design/frontend/default/default/template/worldpay/redirect.phtml +1 -1
  9. app/locale/de_DE/Phoenix_Worldpay.csv +9 -4
  10. app/locale/en_GB/Phoenix_Worldpay.csv +26 -0
  11. app/locale/en_US/Phoenix_Worldpay.csv +8 -3
  12. package.xml +6 -8
app/code/community/Phoenix/Worldpay/Model/Cc.php CHANGED
@@ -21,6 +21,8 @@
21
  class Phoenix_Worldpay_Model_Cc extends Mage_Payment_Model_Method_Abstract
22
 
23
  {
 
 
24
 
25
  /**
26
  * unique internal payment method identifier
@@ -143,21 +145,41 @@ class Phoenix_Worldpay_Model_Cc extends Mage_Payment_Model_Method_Abstract
143
  $params['fixContact'] = 1;
144
  if ($this->getConfigData('hide_contact') == 1)
145
  $params['hideContact'] = 1;
 
 
146
 
147
  // add md5 hash
148
- if ($this->getConfigData('security_key') != '') {
149
- $params['signatureFields'] = 'amount:currency:instId:cartId:authMode:email';
150
- $params['signature'] = md5(
151
- $this->getConfigData('security_key') . ':' .
152
- $params['amount'] . ':' .
153
- $params['currency'] . ':' .
154
- $params['instId'] . ':' .
155
- $params['cartId'] . ':' .
156
- $params['authMode'] . ':' .
157
- $params['email']
158
- );
159
- }
160
- return $params;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
161
  }
162
 
163
  /**
@@ -180,7 +202,9 @@ class Phoenix_Worldpay_Model_Cc extends Mage_Payment_Model_Method_Abstract
180
  $responseBody = $this->processAdminRequest($params);
181
  $response = explode(',', $responseBody);
182
  if (count($response) <= 0 || $response[0] != 'A' || $response[1] != $transactionId) {
183
- Mage::throwException($this->_getHelper()->__('Error during refunding online. Server response: %s', $responseBody));
 
 
184
  }
185
  return $this;
186
  }
@@ -211,7 +235,9 @@ class Phoenix_Worldpay_Model_Cc extends Mage_Payment_Model_Method_Abstract
211
  $response = explode(',', $responseBody);
212
 
213
  if (count($response) <= 0 || $response[0] != 'A' || $response[1] != $transactionId) {
214
- Mage::throwException($this->_getHelper()->__('Error during capture online. Server response: %s', $responseBody));
 
 
215
  } else {
216
  $payment->getOrder()->addStatusToHistory($payment->getOrder()->getStatus(), $this->_getHelper()->__('Worldpay transaction has been captured.'));
217
  }
@@ -263,7 +289,7 @@ class Phoenix_Worldpay_Model_Cc extends Mage_Payment_Model_Method_Abstract
263
  // create array out of response
264
 
265
  } catch (Exception $e) {
266
- Mage::log($e->getMessage());
267
  Mage::throwException($this->_getHelper()->__('Worldpay API connection error. The request has not been processed.'));
268
  }
269
 
@@ -281,4 +307,23 @@ class Phoenix_Worldpay_Model_Cc extends Mage_Payment_Model_Method_Abstract
281
  }
282
  return $params;
283
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
284
  }
21
  class Phoenix_Worldpay_Model_Cc extends Mage_Payment_Model_Method_Abstract
22
 
23
  {
24
+ const SIGNATURE_TYPE_STATIC = 1;
25
+ const SIGNATURE_TYPE_DYNAMIC = 2;
26
 
27
  /**
28
  * unique internal payment method identifier
145
  $params['fixContact'] = 1;
146
  if ($this->getConfigData('hide_contact') == 1)
147
  $params['hideContact'] = 1;
148
+ if ($this->getConfigData('hide_language_select') == 1)
149
+ $params['noLanguageMenu'] = null;
150
 
151
  // add md5 hash
152
+ $securityKey = trim($this->getConfigData('security_key'));
153
+ if (empty($securityKey)) {
154
+ return $params;
155
+ }
156
+
157
+ switch ($this->getConfigData('signature_type')) {
158
+ case self::SIGNATURE_TYPE_STATIC :
159
+ $signatureParams = explode(':', $this->getConfigData('signature_params'));
160
+ $signatureString = $securityKey;
161
+ foreach ($signatureParams as $param) {
162
+ if (array_key_exists($param, $params)) {
163
+ $signatureString .= ':' . $params[$param];
164
+ }
165
+ }
166
+ $params['signature'] = md5($signatureString);
167
+ break;
168
+ case self::SIGNATURE_TYPE_DYNAMIC :
169
+ //'amount:currency:instId:cartId:authMode:email';
170
+ $signatureParamsString = $this->getConfigData('signature_params');
171
+ $signatureParams = explode(':', $signatureParamsString);
172
+ $params['signatureFields'] = $signatureParamsString;
173
+ $signatureString = $securityKey . ';' . $signatureParamsString;
174
+ foreach ($signatureParams as $param) {
175
+ if (array_key_exists($param, $params)) {
176
+ $signatureString .= ';' . $params[$param];
177
+ }
178
+ }
179
+ $params['signature'] = md5($signatureString);
180
+ break;
181
+ }
182
+ return $params;
183
  }
184
 
185
  /**
202
  $responseBody = $this->processAdminRequest($params);
203
  $response = explode(',', $responseBody);
204
  if (count($response) <= 0 || $response[0] != 'A' || $response[1] != $transactionId) {
205
+ $message = $this->_getHelper()->__('Error during refunding online. Server response: %s', $responseBody);
206
+ $this->_debug($message);
207
+ Mage::throwException($message);
208
  }
209
  return $this;
210
  }
235
  $response = explode(',', $responseBody);
236
 
237
  if (count($response) <= 0 || $response[0] != 'A' || $response[1] != $transactionId) {
238
+ $message = $this->_getHelper()->__('Error during capture online. Server response: %s', $responseBody);
239
+ $this->_debug($message);
240
+ Mage::throwException($message);
241
  } else {
242
  $payment->getOrder()->addStatusToHistory($payment->getOrder()->getStatus(), $this->_getHelper()->__('Worldpay transaction has been captured.'));
243
  }
289
  // create array out of response
290
 
291
  } catch (Exception $e) {
292
+ $this->_debug('Worldpay API connection error: '.$e->getMessage());
293
  Mage::throwException($this->_getHelper()->__('Worldpay API connection error. The request has not been processed.'));
294
  }
295
 
307
  }
308
  return $params;
309
  }
310
+
311
+ /**
312
+ * Log debug data to file
313
+ *
314
+ * Prior Magento 1.4.1 this method doesn't exists. So it is mainly to provide
315
+ * BC.
316
+ *
317
+ * @param mixed $debugData
318
+ */
319
+ protected function _debug($debugData)
320
+ {
321
+ if (method_exists($this, 'getDebugFlag')) {
322
+ return parent::_debug($debugData);
323
+ }
324
+
325
+ if ($this->getConfigData('debug')) {
326
+ Mage::log($debugData, null, 'payment_' . $this->getCode() . '.log', true);
327
+ }
328
+ }
329
  }
app/code/community/Phoenix/Worldpay/Model/Source/SignatureType.php ADDED
@@ -0,0 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
+ * @category Phoenix
16
+ * @package Phoenix_Worldpay
17
+ * @copyright Copyright (c) 2008 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
18
+ */
19
+
20
+ class Phoenix_Worldpay_Model_Source_SignatureType
21
+ {
22
+ public function toOptionArray()
23
+ {
24
+ return array(
25
+ array('value' => Phoenix_Worldpay_Model_Cc::SIGNATURE_TYPE_STATIC, 'label' => Mage::helper('worldpay')->__('Static')),
26
+ array('value' => Phoenix_Worldpay_Model_Cc::SIGNATURE_TYPE_DYNAMIC, 'label' => Mage::helper('worldpay')->__('Dynamic')),
27
+ );
28
+ }
29
+ }
app/code/community/Phoenix/Worldpay/controllers/ProcessingController.php CHANGED
@@ -72,6 +72,7 @@ class Phoenix_Worldpay_ProcessingController extends Mage_Core_Controller_Front_A
72
  } catch (Mage_Core_Exception $e) {
73
  $this->_getCheckout()->addError($e->getMessage());
74
  } catch(Exception $e) {
 
75
  Mage::logException($e);
76
  }
77
  $this->_redirect('checkout/cart');
@@ -92,6 +93,7 @@ class Phoenix_Worldpay_ProcessingController extends Mage_Core_Controller_Front_A
92
  Mage::throwException('Transaction was not successfull.');
93
  }
94
  } catch (Mage_Core_Exception $e) {
 
95
  $this->getResponse()->setBody(
96
  $this->getLayout()
97
  ->createBlock($this->_failureBlockType)
@@ -116,6 +118,7 @@ class Phoenix_Worldpay_ProcessingController extends Mage_Core_Controller_Front_A
116
  } catch (Mage_Core_Exception $e) {
117
  $this->_getCheckout()->addError($e->getMessage());
118
  } catch(Exception $e) {
 
119
  Mage::logException($e);
120
  }
121
  $this->_redirect('checkout/cart');
@@ -215,6 +218,13 @@ class Phoenix_Worldpay_ProcessingController extends Mage_Core_Controller_Front_A
215
  ->setCcAvsStatus($request['AVS'])
216
  ->setCcType($request['cardType']);
217
 
 
 
 
 
 
 
 
218
  switch($request['authMode']) {
219
  case 'A':
220
  if ($this->_order->canInvoice()) {
@@ -269,4 +279,16 @@ class Phoenix_Worldpay_ProcessingController extends Mage_Core_Controller_Front_A
269
  {
270
  return Mage::helper('worldpay')->getPendingPaymentStatus();
271
  }
 
 
 
 
 
 
 
 
 
 
 
 
272
  }
72
  } catch (Mage_Core_Exception $e) {
73
  $this->_getCheckout()->addError($e->getMessage());
74
  } catch(Exception $e) {
75
+ $this->_debug('Worldpay error: ' . $e->getMessage());
76
  Mage::logException($e);
77
  }
78
  $this->_redirect('checkout/cart');
93
  Mage::throwException('Transaction was not successfull.');
94
  }
95
  } catch (Mage_Core_Exception $e) {
96
+ $this->_debug('Worldpay response error: ' . $e->getMessage());
97
  $this->getResponse()->setBody(
98
  $this->getLayout()
99
  ->createBlock($this->_failureBlockType)
118
  } catch (Mage_Core_Exception $e) {
119
  $this->_getCheckout()->addError($e->getMessage());
120
  } catch(Exception $e) {
121
+ $this->_debug('Worldpay error: ' . $e->getMessage());
122
  Mage::logException($e);
123
  }
124
  $this->_redirect('checkout/cart');
218
  ->setCcAvsStatus($request['AVS'])
219
  ->setCcType($request['cardType']);
220
 
221
+ // save fraud information
222
+ if (!empty($request['wafMerchMessage'])) {
223
+ $additional_data = $this->_order->getPayment()->getAdditionalData();
224
+ $additional_data .= ($additional_data ? "<br/>\n" : '') . $request['wafMerchMessage'];
225
+ $this->_order->getPayment()->setAdditionalData($additional_data);
226
+ }
227
+
228
  switch($request['authMode']) {
229
  case 'A':
230
  if ($this->_order->canInvoice()) {
279
  {
280
  return Mage::helper('worldpay')->getPendingPaymentStatus();
281
  }
282
+
283
+ /**
284
+ * Log debug data to file
285
+ *
286
+ * @param mixed $debugData
287
+ */
288
+ protected function _debug($debugData)
289
+ {
290
+ if (Mage::getStoreConfigFlag('payment/worldpay_cc/debug')) {
291
+ Mage::log($debugData, null, 'payment_worldpay_cc.log', true);
292
+ }
293
+ }
294
  }
app/code/community/Phoenix/Worldpay/etc/config.xml CHANGED
@@ -21,7 +21,7 @@
21
  <config>
22
  <modules>
23
  <Phoenix_Worldpay>
24
- <version>1.2.6</version>
25
  </Phoenix_Worldpay>
26
  </modules>
27
  <global>
@@ -134,6 +134,7 @@
134
  <fix_contact>1</fix_contact>
135
  <hide_contact>0</hide_contact>
136
  <enable_online_operations>0</enable_online_operations>
 
137
  </worldpay_cc>
138
  </payment>
139
  </default>
21
  <config>
22
  <modules>
23
  <Phoenix_Worldpay>
24
+ <version>1.3.1</version>
25
  </Phoenix_Worldpay>
26
  </modules>
27
  <global>
134
  <fix_contact>1</fix_contact>
135
  <hide_contact>0</hide_contact>
136
  <enable_online_operations>0</enable_online_operations>
137
+ <signature_params>amount:currency:instId:cartId:authMode:email</signature_params>
138
  </worldpay_cc>
139
  </payment>
140
  </default>
app/code/community/Phoenix/Worldpay/etc/system.xml CHANGED
@@ -118,11 +118,29 @@
118
  <show_in_website>1</show_in_website>
119
  <show_in_store>0</show_in_store>
120
  </security_key>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
121
  <request_type translate="label">
122
  <label>Request Type</label>
123
  <frontend_type>select</frontend_type>
124
  <source_model>worldpay/source_requestType</source_model>
125
- <sort_order>10</sort_order>
126
  <show_in_default>1</show_in_default>
127
  <show_in_website>1</show_in_website>
128
  <show_in_store>0</show_in_store>
@@ -131,7 +149,7 @@
131
  <label>Transaction Mode</label>
132
  <frontend_type>select</frontend_type>
133
  <source_model>worldpay/source_transactionMode</source_model>
134
- <sort_order>11</sort_order>
135
  <show_in_default>1</show_in_default>
136
  <show_in_website>1</show_in_website>
137
  <show_in_store>0</show_in_store>
@@ -140,7 +158,7 @@
140
  <label>Fix contact</label>
141
  <frontend_type>select</frontend_type>
142
  <source_model>adminhtml/system_config_source_yesno</source_model>
143
- <sort_order>12</sort_order>
144
  <show_in_default>1</show_in_default>
145
  <show_in_website>1</show_in_website>
146
  <show_in_store>0</show_in_store>
@@ -149,17 +167,27 @@
149
  <label>Hide contact</label>
150
  <frontend_type>select</frontend_type>
151
  <source_model>adminhtml/system_config_source_yesno</source_model>
152
- <sort_order>13</sort_order>
153
  <show_in_default>1</show_in_default>
154
  <show_in_website>1</show_in_website>
155
  <show_in_store>0</show_in_store>
156
  </hide_contact>
 
 
 
 
 
 
 
 
 
 
157
  <enable_online_operations translate="label,comment">
158
  <label>Enable online operations</label>
159
  <comment>Remote admin installation is needed to perform online refund</comment>
160
  <frontend_type>select</frontend_type>
161
  <source_model>adminhtml/system_config_source_yesno</source_model>
162
- <sort_order>14</sort_order>
163
  <show_in_default>1</show_in_default>
164
  <show_in_website>1</show_in_website>
165
  <show_in_store>0</show_in_store>
@@ -169,7 +197,7 @@
169
  <frontend_type>text</frontend_type>
170
  <comment>Required for Remote Admin</comment>
171
  <backend_model>worldpay/config_backend_instid</backend_model>
172
- <sort_order>15</sort_order>
173
  <show_in_default>1</show_in_default>
174
  <show_in_website>1</show_in_website>
175
  <show_in_store>0</show_in_store>
@@ -178,11 +206,20 @@
178
  <label>Authorisation password</label>
179
  <comment>Required for Remote Admin</comment>
180
  <frontend_type>text</frontend_type>
181
- <sort_order>16</sort_order>
182
  <show_in_default>1</show_in_default>
183
  <show_in_website>1</show_in_website>
184
  <show_in_store>0</show_in_store>
185
  </auth_password>
 
 
 
 
 
 
 
 
 
186
  </fields>
187
  </worldpay_cc>
188
  </groups>
118
  <show_in_website>1</show_in_website>
119
  <show_in_store>0</show_in_store>
120
  </security_key>
121
+ <signature_type>
122
+ <label>Signature Type</label>
123
+ <frontend_type>select</frontend_type>
124
+ <source_model>worldpay/source_signatureType</source_model>
125
+ <sort_order>10</sort_order>
126
+ <show_in_default>1</show_in_default>
127
+ <show_in_website>1</show_in_website>
128
+ <show_in_store>0</show_in_store>
129
+ </signature_type>
130
+ <signature_params>
131
+ <label>Signature parameters</label>
132
+ <frontend_type>text</frontend_type>
133
+ <comment>Must be the same as parameters list in Worldpay merchant account, if signature type is static.</comment>
134
+ <sort_order>11</sort_order>
135
+ <show_in_default>1</show_in_default>
136
+ <show_in_website>1</show_in_website>
137
+ <show_in_store>0</show_in_store>
138
+ </signature_params>
139
  <request_type translate="label">
140
  <label>Request Type</label>
141
  <frontend_type>select</frontend_type>
142
  <source_model>worldpay/source_requestType</source_model>
143
+ <sort_order>12</sort_order>
144
  <show_in_default>1</show_in_default>
145
  <show_in_website>1</show_in_website>
146
  <show_in_store>0</show_in_store>
149
  <label>Transaction Mode</label>
150
  <frontend_type>select</frontend_type>
151
  <source_model>worldpay/source_transactionMode</source_model>
152
+ <sort_order>13</sort_order>
153
  <show_in_default>1</show_in_default>
154
  <show_in_website>1</show_in_website>
155
  <show_in_store>0</show_in_store>
158
  <label>Fix contact</label>
159
  <frontend_type>select</frontend_type>
160
  <source_model>adminhtml/system_config_source_yesno</source_model>
161
+ <sort_order>14</sort_order>
162
  <show_in_default>1</show_in_default>
163
  <show_in_website>1</show_in_website>
164
  <show_in_store>0</show_in_store>
167
  <label>Hide contact</label>
168
  <frontend_type>select</frontend_type>
169
  <source_model>adminhtml/system_config_source_yesno</source_model>
170
+ <sort_order>15</sort_order>
171
  <show_in_default>1</show_in_default>
172
  <show_in_website>1</show_in_website>
173
  <show_in_store>0</show_in_store>
174
  </hide_contact>
175
+ <hide_language_select translate="label">
176
+ <label>Hide language select.</label>
177
+ <comment>Select 'YES' to hide language select on WorldPay CC form.</comment>
178
+ <frontend_type>select</frontend_type>
179
+ <source_model>adminhtml/system_config_source_yesno</source_model>
180
+ <sort_order>16</sort_order>
181
+ <show_in_default>1</show_in_default>
182
+ <show_in_website>1</show_in_website>
183
+ <show_in_store>0</show_in_store>
184
+ </hide_language_select>
185
  <enable_online_operations translate="label,comment">
186
  <label>Enable online operations</label>
187
  <comment>Remote admin installation is needed to perform online refund</comment>
188
  <frontend_type>select</frontend_type>
189
  <source_model>adminhtml/system_config_source_yesno</source_model>
190
+ <sort_order>17</sort_order>
191
  <show_in_default>1</show_in_default>
192
  <show_in_website>1</show_in_website>
193
  <show_in_store>0</show_in_store>
197
  <frontend_type>text</frontend_type>
198
  <comment>Required for Remote Admin</comment>
199
  <backend_model>worldpay/config_backend_instid</backend_model>
200
+ <sort_order>18</sort_order>
201
  <show_in_default>1</show_in_default>
202
  <show_in_website>1</show_in_website>
203
  <show_in_store>0</show_in_store>
206
  <label>Authorisation password</label>
207
  <comment>Required for Remote Admin</comment>
208
  <frontend_type>text</frontend_type>
209
+ <sort_order>19</sort_order>
210
  <show_in_default>1</show_in_default>
211
  <show_in_website>1</show_in_website>
212
  <show_in_store>0</show_in_store>
213
  </auth_password>
214
+ <debug translate="label">
215
+ <label>Debug</label>
216
+ <frontend_type>select</frontend_type>
217
+ <source_model>adminhtml/system_config_source_yesno</source_model>
218
+ <sort_order>20</sort_order>
219
+ <show_in_default>1</show_in_default>
220
+ <show_in_website>1</show_in_website>
221
+ <show_in_store>1</show_in_store>
222
+ </debug>
223
  </fields>
224
  </worldpay_cc>
225
  </groups>
app/design/adminhtml/default/default/template/worldpay/info.phtml CHANGED
@@ -17,7 +17,7 @@
17
  * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
18
  */
19
  ?>
20
- <?php
21
  echo $this->getMethod()->getTitle() . '<br/>';
22
  if ($this->getInfo()->getLastTransId() == '') {
23
  echo Mage::helper('worldpay')->__('Payment has not been processed yet.') . '<br/>';
@@ -25,5 +25,8 @@
25
  echo Mage::helper('worldpay')->__('Credit Card Type: %s', $this->htmlEscape($this->getInfo()->getCcType())) . '<br/>';
26
  echo Mage::helper('worldpay')->__('Worldpay Transaction ID: %s', $this->htmlEscape($this->getInfo()->getLastTransId())) . '<br/>';
27
  echo Mage::helper('worldpay')->__('AVS status: %s', $this->htmlEscape($this->getInfo()->getCcAvsStatus())) . '<br/>';
 
 
 
28
  }
29
  ?>
17
  * @copyright Copyright (c) 2009 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
18
  */
19
  ?>
20
+ <?php
21
  echo $this->getMethod()->getTitle() . '<br/>';
22
  if ($this->getInfo()->getLastTransId() == '') {
23
  echo Mage::helper('worldpay')->__('Payment has not been processed yet.') . '<br/>';
25
  echo Mage::helper('worldpay')->__('Credit Card Type: %s', $this->htmlEscape($this->getInfo()->getCcType())) . '<br/>';
26
  echo Mage::helper('worldpay')->__('Worldpay Transaction ID: %s', $this->htmlEscape($this->getInfo()->getLastTransId())) . '<br/>';
27
  echo Mage::helper('worldpay')->__('AVS status: %s', $this->htmlEscape($this->getInfo()->getCcAvsStatus())) . '<br/>';
28
+ if ($additional_data = $this->getInfo()->getAdditionalData()) {
29
+ echo Mage::helper('worldpay')->__('Fraud status: %s', $this->htmlEscape($additional_data)) . '<br/>';
30
+ }
31
  }
32
  ?>
app/design/frontend/default/default/template/worldpay/failure.phtml CHANGED
@@ -21,7 +21,7 @@
21
  <meta http-equiv="refresh" content="0; URL=<?php echo $this->getContinueShoppingUrl()?>">
22
  <body>
23
  <div class="page-head">
24
- <h3><?php echo Mage::helper('worldpay')->__('Error occured') ?></h3>
25
  </div>
26
  <p><?php echo Mage::helper('worldpay')->__('Please <a href="%s">continue shopping</a>.', $this->getContinueShoppingUrl()) ?></p>
27
  </body>
21
  <meta http-equiv="refresh" content="0; URL=<?php echo $this->getContinueShoppingUrl()?>">
22
  <body>
23
  <div class="page-head">
24
+ <h3><?php echo Mage::helper('worldpay')->__('Error occurred') ?></h3>
25
  </div>
26
  <p><?php echo Mage::helper('worldpay')->__('Please <a href="%s">continue shopping</a>.', $this->getContinueShoppingUrl()) ?></p>
27
  </body>
app/design/frontend/default/default/template/worldpay/redirect.phtml CHANGED
@@ -21,7 +21,7 @@
21
  <form name="worldpay_checkout" id="worldpay_checkout" action="<?php echo $this->getFormAction();?>" method="POST">
22
  <?php if (is_array($this->getFormData())): ?>
23
  <?php foreach ($this->getFormData() as $name => $value): ?>
24
- <input type="hidden" name="<?php echo $name; ?>" value="<?php echo $value; ?>"/>
25
  <?php endforeach; ?>
26
  <?php endif; ?>
27
  </form>
21
  <form name="worldpay_checkout" id="worldpay_checkout" action="<?php echo $this->getFormAction();?>" method="POST">
22
  <?php if (is_array($this->getFormData())): ?>
23
  <?php foreach ($this->getFormData() as $name => $value): ?>
24
+ <input type="hidden" name="<?php echo $name; ?>" <?php if (!is_null($value)) { echo 'value="'. $value . '"'; } ?> />
25
  <?php endforeach; ?>
26
  <?php endif; ?>
27
  </form>
app/locale/de_DE/Phoenix_Worldpay.csv CHANGED
@@ -1,11 +1,11 @@
1
  "You will be redirected to Worldpay in a few seconds.","Sie werden an Worldpay weitergeleitet."
2
  "Your payment has been successfully processed by our shop system.","Ihre Zahlung war erfolgreich."
3
- "Please click <a href="%s">here</a> if you are not redirected automatically.","Bitte klicken Sie <a href="%s">hier</a> wenn Sie nicht automatisch weitergeleitet werden."
4
  "Customer was redirected to Worldpay.","Kunde wurde an Worldpay weitergeleitet."
5
  "preauthorize: Customer returned successfully","Der Betrag wurde bei Worldpay vorautorisiert."
6
  "authorize: Customer returned successfully","Der Betrag wurde bei Worldpay autorisiert und abgebucht."
7
  "Customer was rejected by Worldpay","Kunde wurde von Worldpay abgelehnt"
8
- "Error occured","Ein Fehler trat auf"
9
  "Please <a href=""%s"">continue shopping</a>.","<a href=""%s"">Weiter einkaufen</a>."
10
  "Worldpay Transaction ID: %s","Worldpay Transaction ID: %s"
11
  "AVS status: %s","AVS Status: %s"
@@ -17,5 +17,10 @@
17
  "Your purchase at","Ihr Einkauf bei"
18
  "Error during refunding online. Server response: %s","Fehler während der Gutschrift-Erteilung. Server-Antwort: %s"
19
  "Worldpay transaction has been captured.","Worldpay Transaktion wurde abgebucht."
20
- "The order has been canceled.,"Der Bestellvorgang wurde abgebrochen."
21
- "Credit Card Type: %s","Kreditkarte: %s"
 
 
 
 
 
1
  "You will be redirected to Worldpay in a few seconds.","Sie werden an Worldpay weitergeleitet."
2
  "Your payment has been successfully processed by our shop system.","Ihre Zahlung war erfolgreich."
3
+ "Please click <a href=""%s"">here</a> if you are not redirected automatically.","Bitte klicken Sie <a href=""%s"">hier</a> wenn Sie nicht automatisch weitergeleitet werden."
4
  "Customer was redirected to Worldpay.","Kunde wurde an Worldpay weitergeleitet."
5
  "preauthorize: Customer returned successfully","Der Betrag wurde bei Worldpay vorautorisiert."
6
  "authorize: Customer returned successfully","Der Betrag wurde bei Worldpay autorisiert und abgebucht."
7
  "Customer was rejected by Worldpay","Kunde wurde von Worldpay abgelehnt"
8
+ "Error occurred","Ein Fehler trat auf"
9
  "Please <a href=""%s"">continue shopping</a>.","<a href=""%s"">Weiter einkaufen</a>."
10
  "Worldpay Transaction ID: %s","Worldpay Transaction ID: %s"
11
  "AVS status: %s","AVS Status: %s"
17
  "Your purchase at","Ihr Einkauf bei"
18
  "Error during refunding online. Server response: %s","Fehler während der Gutschrift-Erteilung. Server-Antwort: %s"
19
  "Worldpay transaction has been captured.","Worldpay Transaktion wurde abgebucht."
20
+ "The order has been canceled.","Der Bestellvorgang wurde abgebrochen."
21
+ "Credit Card Type: %s","Kreditkarte: %s"
22
+ "Signature Type","Signierungsart"
23
+ "Signature parameters","Signatur-Parameter"
24
+ "Must be the same as parameters list in Worldpay merchant account, if signature type is static.","Muss die selbe Parameter-Liste wie im Worldpay Händler-Account sein, wenn die Signierungsart statisch ist."
25
+ "Hide language select","Sprachauswahl verstecken"
26
+ "Activate to hide language menu on WorldPay payment page.","Aktivieren, um Sprachauswahl auf der WorldPay-Zahlungsseite auszublenden."
app/locale/en_GB/Phoenix_Worldpay.csv ADDED
@@ -0,0 +1,26 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ "You will be redirected to Worldpay in a few seconds.","You will be redirected to Worldpay in a few seconds."
2
+ "Your payment has been successfully processed by our shop system.","Your payment has been successfully processed by our shop system."
3
+ "Please click <a href=""%s"">here</a> if you are not redirected automatically.","Please click <a href=""%s"">here</a> if you are not redirected automatically."
4
+ "Customer was redirected to Worldpay.","Customer was redirected to Worldpay."
5
+ "preauthorize: Customer returned successfully","The amount has been preauthorized by Worldpay."
6
+ "authorize: Customer returned successfully","The amount has been authorized and captured by Worldpay."
7
+ "Customer was rejected by Worldpay","Customer was rejected by Worldpay"
8
+ "Error occurred","Error occurred"
9
+ "Please <a href=""%s"">continue shopping</a>.","Please <a href=""%s"">continue shopping</a>."
10
+ "Worldpay Transaction ID: %s","Worldpay Transaction ID: %s"
11
+ "AVS status: %s","AVS status: %s"
12
+ "worldpay_cc:You will be redirected to Worldpay website when you place an order.","You will be redirected to Worldpay website when you place an order to enter your credit card information."
13
+ "Shopping basket","Shopping basket"
14
+ "Payment has not been processed yet.","Payment has not been processed yet."
15
+ "Authorization","Authorization"
16
+ "Preauthorization","Preauthorization"
17
+ "Your purchase at","Your purchase at"
18
+ "Error during refunding online. Server response: %s","Error during refunding online. Server response: %s"
19
+ "Worldpay transaction has been captured.","Worldpay transaction has been captured."
20
+ "The order has been canceled.","The order has been cancelled."
21
+ "Credit Card Type: %s","Credit Card Type: %s"
22
+ "Signature Type","Signature Type"
23
+ "Signature parameters","Signature parameters"
24
+ "Must be the same as parameters list in Worldpay merchant account, if signature type is static.","Must be the same as parameters list in Worldpay merchant account, if signature type is static."
25
+ "Hide language select","Hide language select"
26
+ "Activate to hide language menu on WorldPay payment page.","Activate to hide language menu on WorldPay payment page."
app/locale/en_US/Phoenix_Worldpay.csv CHANGED
@@ -1,11 +1,11 @@
1
  "You will be redirected to Worldpay in a few seconds.","You will be redirected to Worldpay in a few seconds."
2
  "Your payment has been successfully processed by our shop system.","Your payment has been successfully processed by our shop system."
3
- "Please click <a href="%s">here</a> if you are not redirected automatically.","Please click <a href="%s">here</a> if you are not redirected automatically."
4
  "Customer was redirected to Worldpay.","Customer was redirected to Worldpay."
5
  "preauthorize: Customer returned successfully","The amount has been preauthorized by Worldpay."
6
  "authorize: Customer returned successfully","The amount has been authorized and captured by Worldpay."
7
  "Customer was rejected by Worldpay","Customer was rejected by Worldpay"
8
- "Error occured","Error occured"
9
  "Please <a href=""%s"">continue shopping</a>.","Please <a href=""%s"">continue shopping</a>."
10
  "Worldpay Transaction ID: %s","Worldpay Transaction ID: %s"
11
  "AVS status: %s","AVS status: %s"
@@ -18,4 +18,9 @@
18
  "Error during refunding online. Server response: %s","Error during refunding online. Server response: %s"
19
  "Worldpay transaction has been captured.","Worldpay transaction has been captured."
20
  "The order has been canceled.","The order has been canceled."
21
- "Credit Card Type: %s","Credit Card Type: %s"
 
 
 
 
 
1
  "You will be redirected to Worldpay in a few seconds.","You will be redirected to Worldpay in a few seconds."
2
  "Your payment has been successfully processed by our shop system.","Your payment has been successfully processed by our shop system."
3
+ "Please click <a href=""%s"">here</a> if you are not redirected automatically.","Please click <a href=""%s"">here</a> if you are not redirected automatically."
4
  "Customer was redirected to Worldpay.","Customer was redirected to Worldpay."
5
  "preauthorize: Customer returned successfully","The amount has been preauthorized by Worldpay."
6
  "authorize: Customer returned successfully","The amount has been authorized and captured by Worldpay."
7
  "Customer was rejected by Worldpay","Customer was rejected by Worldpay"
8
+ "Error occurred","Error occurred"
9
  "Please <a href=""%s"">continue shopping</a>.","Please <a href=""%s"">continue shopping</a>."
10
  "Worldpay Transaction ID: %s","Worldpay Transaction ID: %s"
11
  "AVS status: %s","AVS status: %s"
18
  "Error during refunding online. Server response: %s","Error during refunding online. Server response: %s"
19
  "Worldpay transaction has been captured.","Worldpay transaction has been captured."
20
  "The order has been canceled.","The order has been canceled."
21
+ "Credit Card Type: %s","Credit Card Type: %s"
22
+ "Signature Type","Signature Type"
23
+ "Signature parameters","Signature parameters"
24
+ "Must be the same as parameters list in Worldpay merchant account, if signature type is static.","Must be the same as parameters list in Worldpay merchant account, if signature type is static."
25
+ "Hide language select","Hide language select"
26
+ "Activate to hide language menu on WorldPay payment page.","Activate to hide language menu on WorldPay payment page."
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Phoenix_Worldpay</name>
4
- <version>1.3.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -19,14 +19,12 @@ Notice: This extension is still beta. We recommend to test all transactions in y
19
  The extension is developed and maintained by the German Magento Silver Partner Phoenix Medien (http://www.phoenix-medien.de).
20
 
21
  The development was sponsored by liaison dangereuse (http://www.liaison-dangereuse.de).</description>
22
- <notes>- support for new signature hash
23
- - save fraud information in database
24
- - hide language switch option
25
- - debug option</notes>
26
  <authors><author><name>Phoenix Medien</name><user>auto-converted</user><email>info@phoenix-medien.de</email></author></authors>
27
- <date>2011-04-01</date>
28
- <time>14:40:37</time>
29
- <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="worldpay"><dir name="pdf"><file name="info.phtml" hash="3a92c60f5c05a3e51df366cee651edd6"/></dir><file name="info.phtml" hash="1790560a09702bdbe3f6a2074e03144b"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="worldpay.xml" hash="ac4191773623ae2ad6170f363866ed43"/></dir><dir name="template"><dir name="worldpay"><file name="blank.phtml" hash="8b7d8aa0521878b2dd796acfd4d655b6"/><file name="cancel.phtml" hash="350348b8fecb9b7c2b1045d1a8edd9c7"/><file name="failure.phtml" hash="77b202de38902c9e6458218bdce07de8"/><file name="form.phtml" hash="8c7184cbaffc115349de415d12273528"/><file name="info.phtml" hash="9c17afe371e23674979aad7e6ce82fe3"/><file name="redirect.phtml" hash="84d38770a43262c890094c132dc2bd5c"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Phoenix_Worldpay.csv" hash="f1120c2e8a91f142440b200863e691e9"/></dir><dir name="en_US"><file name="Phoenix_Worldpay.csv" hash="fed1c35eeb4d0bbc7edc275b63b2f0e0"/></dir></target><target name="mageetc"><dir name="modules"><file name="Phoenix_Worldpay.xml" hash="52b9dc5cd0d94ab43d8691438f090617"/></dir></target><target name="magecommunity"><dir name="Phoenix"><dir name="Worldpay"><dir name="Block"><file name="Cancel.php" hash="b0f213ee8e45d0b8b48a6fad48f05017"/><file name="Failure.php" hash="5add6ed9890109ba624b7a16bc0504f5"/><file name="Form.php" hash="d279b2d502e875e155101007eef7ebc5"/><file name="Info.php" hash="845d37c36ea2973599324f9e294969a4"/><file name="Redirect.php" hash="ee8eb2b8cdabaf9ae0dea66fd7362777"/><file name="Success.php" hash="0c072e272d53a0b24e5157201cd65877"/></dir><dir name="controllers"><file name="ProcessingController.php" hash="2735aded2e552488c8d4e4e7361a28ba"/></dir><dir name="etc"><file name="config.xml" hash="787177b04b26dd6317f901ae3459bcf7"/><file name="system.xml" hash="ceb5a05ac462091280d3dda7649d3376"/></dir><dir name="Helper"><file name="Data.php" hash="954555e22d7867b2eb2b698b86405d63"/></dir><dir name="Model"><dir name="Config"><dir name="Backend"><file name="Instid.php" hash="07147ceac69c3c19593b4a24873f15cc"/></dir></dir><dir name="Source"><file name="RequestType.php" hash="795d51b4c3f04bb00cf6cca5a3180cd7"/><file name="TransactionMode.php" hash="da4cadb5df1213edc34f22b67235d374"/></dir><file name="Cc.php" hash="cf6b3bff52b5aedd85ff94cc59a0fc8e"/><file name="Config.php" hash="9098369b245a824396354e1b64cd47ab"/></dir></dir></dir></target></contents>
30
  <compatible/>
31
  <dependencies/>
32
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Phoenix_Worldpay</name>
4
+ <version>1.3.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
19
  The extension is developed and maintained by the German Magento Silver Partner Phoenix Medien (http://www.phoenix-medien.de).
20
 
21
  The development was sponsored by liaison dangereuse (http://www.liaison-dangereuse.de).</description>
22
+ <notes>- fixed minor translation issues
23
+ - added missing features</notes>
 
 
24
  <authors><author><name>Phoenix Medien</name><user>auto-converted</user><email>info@phoenix-medien.de</email></author></authors>
25
+ <date>2011-04-20</date>
26
+ <time>10:03:22</time>
27
+ <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="worldpay"><dir name="pdf"><file name="info.phtml" hash="3a92c60f5c05a3e51df366cee651edd6"/></dir><file name="info.phtml" hash="ca932cd58bc6e0c951e6119d4ee40185"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="worldpay.xml" hash="ac4191773623ae2ad6170f363866ed43"/></dir><dir name="template"><dir name="worldpay"><file name="blank.phtml" hash="8b7d8aa0521878b2dd796acfd4d655b6"/><file name="cancel.phtml" hash="350348b8fecb9b7c2b1045d1a8edd9c7"/><file name="failure.phtml" hash="9126748b39206ddd936ad72357bcf9b7"/><file name="form.phtml" hash="8c7184cbaffc115349de415d12273528"/><file name="info.phtml" hash="9c17afe371e23674979aad7e6ce82fe3"/><file name="redirect.phtml" hash="441b182afae33e16b26bbfdae2f12a87"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Phoenix_Worldpay.csv" hash="a261960a7cd06a38f6fc686cfa7c08e2"/></dir><dir name="en_GB"><file name="Phoenix_Worldpay.csv" hash="7ab5f7f407e252616b2bd04ebe0564cd"/></dir><dir name="en_US"><file name="Phoenix_Worldpay.csv" hash="49947b473e21e818ce0d39db5896cf96"/></dir></target><target name="mageetc"><dir name="modules"><file name="Phoenix_Worldpay.xml" hash="52b9dc5cd0d94ab43d8691438f090617"/></dir></target><target name="magecommunity"><dir name="Phoenix"><dir name="Worldpay"><dir name="Block"><file name="Cancel.php" hash="b0f213ee8e45d0b8b48a6fad48f05017"/><file name="Failure.php" hash="5add6ed9890109ba624b7a16bc0504f5"/><file name="Form.php" hash="d279b2d502e875e155101007eef7ebc5"/><file name="Info.php" hash="845d37c36ea2973599324f9e294969a4"/><file name="Redirect.php" hash="ee8eb2b8cdabaf9ae0dea66fd7362777"/><file name="Success.php" hash="0c072e272d53a0b24e5157201cd65877"/></dir><dir name="controllers"><file name="ProcessingController.php" hash="678edad8cc33d581199ffd8cdfb3631a"/></dir><dir name="etc"><file name="config.xml" hash="0ce1d7a90d65666afea5eb42b4b30902"/><file name="system.xml" hash="b5f29fbcc56636bd519058804f08d66d"/></dir><dir name="Helper"><file name="Data.php" hash="954555e22d7867b2eb2b698b86405d63"/></dir><dir name="Model"><dir name="Config"><dir name="Backend"><file name="Instid.php" hash="07147ceac69c3c19593b4a24873f15cc"/></dir></dir><dir name="Source"><file name="RequestType.php" hash="795d51b4c3f04bb00cf6cca5a3180cd7"/><file name="SignatureType.php" hash="68e8267596e0c040633f2ce8e40472fe"/><file name="TransactionMode.php" hash="da4cadb5df1213edc34f22b67235d374"/></dir><file name="Cc.php" hash="c5a80ec182e9812050cfe1b6777b2214"/><file name="Config.php" hash="9098369b245a824396354e1b64cd47ab"/></dir></dir></dir></target></contents>
28
  <compatible/>
29
  <dependencies/>
30
  </package>