Merge branch 'master' into card-present

Conflicts:
	src/Message/AIMAuthorizeRequest.php
	tests/Message/CIMAuthorizeRequestTest.php

Author: anush

src/AIMGateway.php

@@ -87,6 +87,16 @@ public function setDeveloperEndpoint($value)
         return $this->setParameter('developerEndpoint', $value);
     }
 
+    public function getDuplicateWindow()
+    {
+        return $this->getParameter('duplicateWindow');
+    }
+
+    public function setDuplicateWindow($value)
+    {
+        return $this->setParameter('duplicateWindow', $value);
+    }
+
     /**
      * @param array $parameters
      * @return AIMAuthorizeRequest

src/Message/AIMAbstractRequest.php

@@ -72,7 +72,7 @@ public function setDuplicateWindow($value)
 
     private function getDuplicateWindow()
     {
-        return $this->getParameter('duplicateWindow'); // Maps x_duplicate_window
+        return $this->getParameter('duplicateWindow');
     }
 
     public function getLiveEndpoint()
@@ -235,24 +235,21 @@ protected function addBillingData(\SimpleXMLElement $data)
         return $data;
     }
 
-    protected function addTestModeSetting(\SimpleXMLElement $data)
+    protected function addTransactionSettings(\SimpleXMLElement $data)
     {
-        // Test mode setting
-        $data->transactionRequest->transactionSettings->setting->settingName = 'testRequest';
-        $data->transactionRequest->transactionSettings->setting->settingValue = $this->getTestMode() ? 'true' : 'false';
+        $i = 0;
 
-        return $data;
-    }
+        // The test mode setting indicates whether or not this is a live request or a test request
+        $data->transactionRequest->transactionSettings->setting[$i]->settingName = 'testRequest';
+        $data->transactionRequest->transactionSettings->setting[$i]->settingValue = $this->getTestMode() ? 'true' : 'false';
 
-    protected function addExtraOptions(\SimpleXMLElement $data)
-    {
+        // The duplicate window setting specifies the threshold for AuthorizeNet's duplicate transaction detection logic
         if (!is_null($this->getDuplicateWindow())) {
-            $extraOptions = $data->addChild('extraOptions');
-            $node = dom_import_simplexml($extraOptions);
-            $nodeOwner = $node->ownerDocument;
-            $duplicateWindowStr = sprintf("x_duplicate_window=%s", $this->getDuplicateWindow());
-            $node->appendChild($nodeOwner->createCDATASection($duplicateWindowStr));
+            $i++;
+            $data->transactionRequest->transactionSettings->setting[$i]->settingName = 'duplicateWindow';
+            $data->transactionRequest->transactionSettings->setting[$i]->settingValue = $this->getDuplicateWindow();
         }
+
         return $data;
     }
 

src/Message/AIMAuthorizeRequest.php

@@ -20,8 +20,7 @@ public function getData()
         $this->addCustomerIP($data);
         $this->addBillingData($data);
         $this->addRetail($data);
-        $this->addTestModeSetting($data);
-        $this->addExtraOptions($data);
+        $this->addTransactionSettings($data);
 
         return $data;
     }

src/Message/AIMCaptureRequest.php

@@ -16,7 +16,7 @@ public function getData()
         $data = $this->getBaseData();
         $data->transactionRequest->amount = $this->getAmount();
         $data->transactionRequest->refTransId = $this->getTransactionReference()->getTransId();
-        $this->addTestModeSetting($data);
+        $this->addTransactionSettings($data);
 
         return $data;
     }

src/Message/AIMRefundRequest.php

@@ -38,11 +38,13 @@ public function getData()
             $this->validate('card');
             $card = $this->getCard();
             $data->transactionRequest->payment->creditCard->cardNumber = $card->getNumberLastFour();
-            $data->transactionRequest->payment->creditCard->expirationDate = $card->getExpiryDate('my');
+            if ($card->getExpiryMonth()) {
+                $data->transactionRequest->payment->creditCard->expirationDate = $card->getExpiryDate('my');
+            }
         }
         $data->transactionRequest->refTransId = $transactionRef->getTransId();
 
-        $this->addTestModeSetting($data);
+        $this->addTransactionSettings($data);
 
         return $data;
     }

src/Message/AIMVoidRequest.php

@@ -15,7 +15,7 @@ public function getData()
 
         $data = $this->getBaseData();
         $data->transactionRequest->refTransId = $this->getTransactionReference()->getTransId();
-        $this->addTestModeSetting($data);
+        $this->addTransactionSettings($data);
 
         return $data;
     }

src/Message/CIMCreateCardRequest.php

@@ -21,7 +21,7 @@ public function getData()
 
         $data = $this->getBaseData();
         $this->addProfileData($data);
-        $this->addTestModeSetting($data);
+        $this->addTransactionSettings($data);
 
         return $data;
     }
@@ -143,7 +143,7 @@ protected function addShippingData(\SimpleXMLElement $data)
         }
     }
 
-    protected function addTestModeSetting(\SimpleXMLElement $data)
+    protected function addTransactionSettings(\SimpleXMLElement $data)
     {
         $data->validationMode = $this->getValidationMode();
     }

src/Message/CIMCreatePaymentProfileRequest.php

@@ -22,7 +22,7 @@ public function getData()
         $data = $this->getBaseData();
         $data->customerProfileId = $this->getCustomerProfileId();
         $this->addPaymentProfileData($data);
-        $this->addTestModeSetting($data);
+        $this->addTransactionSettings($data);
 
         return $data;
     }

src/Message/CIMUpdatePaymentProfileRequest.php

@@ -22,7 +22,7 @@ public function getData()
         $data = $this->getBaseData();
         $data->customerProfileId = $this->getCustomerProfileId();
         $this->addPaymentProfileData($data);
-        $this->addTestModeSetting($data);
+        $this->addTransactionSettings($data);
 
         return $data;
     }

src/Message/DPMResponse.php

@@ -59,6 +59,9 @@ class DPMResponse extends AbstractResponse implements RedirectResponseInterface
         'x_email_customer',
 
         'x_delim_data',
+
+        // Custom omnipay field.
+        'omnipay_transaction_id',
     );
 
     /**