Merge branch 'master' of github.com:bluerock-solutions/omnipay-authorizenet into dpm_support

Conflicts:
	src/AIMGateway.php

Author: judgej

src/AIMGateway.php

@@ -17,10 +17,12 @@ public function getName()
     public function getDefaultParameters()
     {
         return array(
-            'apiLoginId'     => '',
-            'transactionKey' => '',
-            'testMode'       => false,
-            'developerMode'  => false,
+            'apiLoginId'        => '',
+            'transactionKey'    => '',
+            'testMode'          => false,
+            'developerMode'     => false,
+            'liveEndpoint'      => 'https://secure.authorize.net/gateway/transact.dll',
+            'developerEndpoint' => 'https://test.authorize.net/gateway/transact.dll'
         );
     }
 
@@ -54,6 +56,12 @@ public function setDeveloperMode($value)
         return $this->setParameter('developerMode', $value);
     }
 
+    public function setEndpoints($endpoints)
+    {
+        $this->setParameter('liveEndpoint', $endpoints['live']);
+        return $this->setParameter('developerEndpoint', $endpoints['developer']);
+    }
+
     public function authorize(array $parameters = array())
     {
         return $this->createRequest('\Omnipay\AuthorizeNet\Message\AIMAuthorizeRequest', $parameters);

src/Message/AbstractRequest.php

@@ -7,9 +7,6 @@
  */
 abstract class AbstractRequest extends \Omnipay\Common\Message\AbstractRequest
 {
-    protected $liveEndpoint = 'https://secure.authorize.net/gateway/transact.dll';
-    protected $developerEndpoint = 'https://test.authorize.net/gateway/transact.dll';
-
     public function getApiLoginId()
     {
         return $this->getParameter('apiLoginId');
@@ -60,6 +57,16 @@ public function setHashSecret($value)
         return $this->setParameter('hashSecret', $value);
     }
 
+    public function setLiveEndpoint($value)
+    {
+        return $this->setParameter('liveEndpoint', $value);
+    }
+
+    public function setDeveloperEndpoint($value)
+    {
+        return $this->setParameter('developerEndpoint', $value);
+    }
+
     protected function getBaseData()
     {
         $data = array();
@@ -124,6 +131,6 @@ public function sendData($data)
 
     public function getEndpoint()
     {
-        return $this->getDeveloperMode() ? $this->developerEndpoint : $this->liveEndpoint;
+        return $this->getDeveloperMode() ? $this->getParameter('developerEndpoint') : $this->getParameter('liveEndpoint');
     }
 }

src/Message/SIMAuthorizeRequest.php

@@ -25,6 +25,9 @@ public function getData()
         // "Response/Receipt URLs" URL, but not necessarily the default.
         $data['x_relay_url'] = $this->getReturnUrl();
         $data['x_cancel_url'] = $this->getCancelUrl();
+        if ($this->getCustomerId() !== null) {
+            $data['x_cust_id'] = $this->getCustomerId();
+        }
 
         if ($this->getTestMode()) {
             $data['x_test_request'] = 'TRUE';