Merge pull request #63 from academe/pr60

PR60 + test

Author: judgej

src/Message/AIMAbstractRequest.php

@@ -118,6 +118,7 @@ public function setTransactionReference($value)
             $transactionRef = new TransactionReference();
             $transactionRef->setTransId($value);
         }
+
         return $this->setParameter('transactionReference', $transactionRef);
     }
 
@@ -130,6 +131,7 @@ public function setCardReference($value)
         if (!($value instanceof CardReference)) {
             $value = new CardReference($value);
         }
+
         return parent::setCardReference($value);
     }
 
@@ -140,15 +142,18 @@ public function setCardReference($value)
     public function getCardReference($serialize = true)
     {
         $value = parent::getCardReference();
+
         if ($serialize) {
             $value = (string)$value;
         }
+
         return $value;
     }
 
     public function sendData($data)
     {
         $headers = array('Content-Type' => 'text/xml; charset=utf-8');
+
         $data = $data->saveXml();
         $httpResponse = $this->httpClient->post($this->getEndpoint(), $headers, $data)->send();
 
@@ -162,10 +167,12 @@ public function sendData($data)
     public function getBaseData()
     {
         $data = new \SimpleXMLElement('<' . $this->requestType . '/>');
+
         $data->addAttribute('xmlns', 'AnetApi/xml/v1/schema/AnetApiSchema.xsd');
         $this->addAuthentication($data);
         $this->addReferenceId($data);
         $this->addTransactionType($data);
+
         return $data;
     }
 
@@ -178,6 +185,7 @@ protected function addAuthentication(\SimpleXMLElement $data)
     protected function addReferenceId(\SimpleXMLElement $data)
     {
         $txnId = $this->getTransactionId();
+
         if (!empty($txnId)) {
             $data->refId = $this->getTransactionId();
         }
@@ -189,6 +197,7 @@ protected function addTransactionType(\SimpleXMLElement $data)
             // The extending class probably hasn't specified an "action"
             throw new InvalidRequestException();
         }
+
         $data->transactionRequest->transactionType = $this->action;
     }
 
@@ -213,6 +222,8 @@ protected function addBillingData(\SimpleXMLElement $data)
         /** @var CreditCard $card */
         if ($card = $this->getCard()) {
             // A card is present, so include billing and shipping details
+            $req->customer->email = $card->getEmail();
+
             $req->billTo->firstName = $card->getBillingFirstName();
             $req->billTo->lastName = $card->getBillingLastName();
             $req->billTo->company = $card->getBillingCompany();

src/Message/CIMAbstractRequest.php

@@ -24,9 +24,11 @@ public function setValidationMode($value)
     public function getValidationMode()
     {
         $validationMode = $this->getParameter('validationMode');
+
         if ($validationMode !== self::VALIDATION_MODE_NONE) {
             $validationMode = $this->getDeveloperMode() ? self::VALIDATION_MODE_TEST : self::VALIDATION_MODE_LIVE;
         }
+
         return $validationMode;
     }
 
@@ -100,6 +102,7 @@ public function getDefaultBillTo()
     public function sendData($data)
     {
         $headers = array('Content-Type' => 'text/xml; charset=utf-8');
+
         $data = $data->saveXml();
         $httpResponse = $this->httpClient->post($this->getEndpoint(), $headers, $data)->send();
 

src/Message/CIMAuthorizeRequest.php

@@ -15,10 +15,14 @@ protected function addPayment(\SimpleXMLElement $data)
 
         /** @var mixed $req */
         $req = $data->transactionRequest;
+
         /** @var CardReference $cardRef */
         $cardRef = $this->getCardReference(false);
+
         $req->profile->customerProfileId = $cardRef->getCustomerProfileId();
+
         $req->profile->paymentProfile->paymentProfileId = $cardRef->getPaymentProfileId();
+
         if ($shippingProfileId = $cardRef->getShippingProfileId()) {
             $req->profile->shippingProfileId = $shippingProfileId;
         }

tests/Message/AIMAuthorizeRequestTest.php

@@ -12,12 +12,14 @@ class AIMAuthorizeRequestTest extends TestCase
     public function setUp()
     {
         $this->request = new AIMAuthorizeRequest($this->getHttpClient(), $this->getHttpRequest());
+        $card = $this->getValidCard();
+        $card['email'] = 'example@example.net';
         $this->request->initialize(
             array(
                 'clientIp' => '10.0.0.1',
                 'amount' => '12.00',
                 'customerId' => 'cust-id',
-                'card' => $this->getValidCard(),
+                'card' => $card,
                 'duplicateWindow' => 0
             )
         );
@@ -30,6 +32,7 @@ public function testGetData()
         $this->assertEquals('authOnlyTransaction', $data->transactionRequest->transactionType);
         $this->assertEquals('10.0.0.1', $data->transactionRequest->customerIP);
         $this->assertEquals('cust-id', $data->transactionRequest->customer->id);
+        $this->assertEquals('example@example.net', $data->transactionRequest->customer->email);
 
         // Issue #38 Make sure the transactionRequest properties are correctly ordered.
         // This feels messy, but works.