<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>patched_moneris_lib/mpgClasses.php</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,6 +1,8 @@
 &lt;?php
 /**
+* Moneris Magento v0.5 - show me the money release
 *
+* 
 * Copyright (c) 2008 Pier-Hugues Pellerin
 * 
 * Permission is hereby granted, free of charge, to any person obtaining
@@ -295,7 +297,7 @@ class Mage_Moneris_Model_PaymentMethod extends Mage_Payment_Model_Method_Cc
 			if($response-&gt;getResponseCode() &gt; 0 &amp;&amp; $response-&gt;getResponseCode() &lt;= self::ERROR_CODE_LIMIT) {
 				$payment-&gt;setStatus(self::STATUS_APPROVED);
 			} else if($response-&gt;getResponseCode() &gt; self::ERROR_CODE_LIMIT &amp;&amp; $response-&gt;getResponseCode() &lt; self::ERROR_CODE_UPPER_LIMIT) {
-				$error = Mage::helper('paygate')-&gt;__($this-&gt;_errors[$response-&gt;getResponseCodes]);
+				$error = Mage::helper('paygate')-&gt;__($this-&gt;_errors[$response-&gt;getResponseCode()]);
 			} else {
 				$error = Mage::helper('paygate')-&gt;__('Incomplete transaction.');
 			}
@@ -331,7 +333,7 @@ class Mage_Moneris_Model_PaymentMethod extends Mage_Payment_Model_Method_Cc
 			if($response-&gt;getResponseCode() &gt; 0 &amp;&amp; $response-&gt;getResponseCode() &lt;= self::ERROR_CODE_LIMIT) {
 				$payment-&gt;setStatus(self::STATUS_SUCCESS);
 			} else if($response-&gt;getResponseCode() &gt; self::ERROR_CODE_LIMIT &amp;&amp; $response-&gt;getResponseCode() &lt; self::ERROR_CODE_UPPER_LIMIT) {
-				$error = Mage::helper('paygate')-&gt;__($this-&gt;_errors[$response-&gt;getResponseCodes]);
+				$error = Mage::helper('paygate')-&gt;__($this-&gt;_errors[$response-&gt;getResponseCode()]);
 			} else {
 				$error = Mage::helper('paygate')-&gt;__('Incomplete transaction.');
 			}
@@ -391,10 +393,15 @@ class Mage_Moneris_Model_PaymentMethod extends Mage_Payment_Model_Method_Cc
 		$billing  = $order-&gt;getBillingAddress();
 		$shipping = $order-&gt;getShippingAddress();
 		
+		# Should be only used in the developement environment
+		# without it we get duplicate order id.
+		$token = $this-&gt;getConfigData('order_token');
+		$token = (empty($token)) ? &quot;&quot; : &quot;-&quot; . $token;
+
 
 		$transaction = array(
 								'type'		 =&gt;	$type,
-								'order_id'	 =&gt;	$order-&gt;getIncrementId(),
+								'order_id'	 =&gt;	$order-&gt;getIncrementId() . $token,
 								'crypt_type' =&gt;	self::CRYPT_TYPE,
 							);
 	</diff>
      <filename>Model/PaymentMethod.php</filename>
    </modified>
    <modified>
      <diff>@@ -18,15 +18,15 @@ when pushing them in production, look at their documentation for the right endpo
 
 
 
-feel free to send me patches or fork the project.
+Feel free to send me patches or fork the project.
 
 Pier-Hugues Pellerin ph - at - heykimo.com
 
 Thanks to Antoine Girard - antoinegirard.com if you need magento integration contact him.
 
 
-# .
- 
+---
+
 Copyright (c) 2008 Pier-Hugues Pellerin
 
 Permission is hereby granted, free of charge, to any person obtaining</diff>
      <filename>README.markdown</filename>
    </modified>
    <modified>
      <diff>@@ -63,6 +63,14 @@
                             &lt;show_in_website&gt;1&lt;/show_in_website&gt;
                             &lt;show_in_store&gt;1&lt;/show_in_store&gt;
 						&lt;/api_token&gt;
+						&lt;order_token translate=&quot;label&quot;&gt;
+							&lt;label&gt;Order Token (make unique order on moneris development environment, remove it in production)&lt;/label&gt;
+							&lt;frontend_type&gt;text&lt;/frontend_type&gt;
+							&lt;sort_order&gt;5&lt;/sort_order&gt;
+							&lt;show_in_default&gt;1&lt;/show_in_default&gt;
+                            &lt;show_in_website&gt;1&lt;/show_in_website&gt;
+                            &lt;show_in_store&gt;1&lt;/show_in_store&gt;
+						&lt;/order_token&gt;						
                      &lt;/fields&gt;
                  &lt;/moneris&gt;
              &lt;/groups&gt;</diff>
      <filename>etc/system.xml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>18b68e81b5d36db88641863772e665d565cd71a2</id>
    </parent>
  </parents>
  <author>
    <name>Pier-Hugues Pellerin</name>
    <email>ph@heykimo.com</email>
  </author>
  <url>http://github.com/ph/magento-moneris/commit/697dcf5e4b747d7ee3c8b24e86807987cab1d480</url>
  <id>697dcf5e4b747d7ee3c8b24e86807987cab1d480</id>
  <committed-date>2008-11-11T18:05:08-08:00</committed-date>
  <authored-date>2008-11-11T18:05:08-08:00</authored-date>
  <message>Fix the error handling, add the patched moneris lib</message>
  <tree>4ef730c4bf845f012a62631790620d4dbc9dd982</tree>
  <committer>
    <name>Pier-Hugues Pellerin</name>
    <email>ph@heykimo.com</email>
  </committer>
</commit>
