XOL-2799 give preference to track data over customer profile

Author: anush

src/Message/AIMAbstractRequest.php

@@ -255,4 +255,10 @@ protected function addExtraOptions(\SimpleXMLElement $data)
         }
         return $data;
     }
+
+    protected function isCardPresent()
+    {
+        // If the credit card has track data, then consider this a "card present" scenario
+        return ($card = $this->getCard()) && $card->getTracks();
+    }
 }

src/Message/AIMAuthorizeRequest.php

@@ -57,7 +57,7 @@ protected function addCustomerIP(\SimpleXMLElement $data)
 
     protected function addRetail(\SimpleXMLElement $data)
     {
-        if ($this->getCard()->getTracks()) {
+        if ($this->isCardPresent()) {
             // Retail element is required for card present transactions
             $data->transactionRequest->retail->marketType = 2;
             $data->transactionRequest->retail->deviceType = 1;

src/Message/CIMAuthorizeRequest.php

@@ -11,29 +11,40 @@ class CIMAuthorizeRequest extends AIMAuthorizeRequest
 {
     protected function addPayment(\SimpleXMLElement $data)
     {
-        $this->validate('cardReference');
-
-        /** @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;
-        }
+        if ($this->isCardPresent()) {
+            // Prefer the track data if present over the payment profile (better rate)
+            return parent::addPayment($data);
+
+        } else {
+            $this->validate('cardReference');
+
+            /** @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;
+            }
 
-        $desc = $this->getDescription();
-        if (!empty($desc)) {
-            $req->order->description = $desc;
+            $desc = $this->getDescription();
+            if (!empty($desc)) {
+                $req->order->description = $desc;
+            }
+
+            return $data;
         }
 
-        return $data;
     }
 
     protected function addBillingData(\SimpleXMLElement $data)
     {
-        // Do nothing since billing information is already part of the customer profile
-        return $data;
+        if ($this->isCardPresent()) {
+            return parent::addBillingData($data);
+        } else {
+            // Do nothing since billing information is already part of the customer profile
+            return $data;
+        }
     }
 }

tests/Message/CIMAuthorizeRequestTest.php

@@ -38,4 +38,19 @@ public function testShouldReturnExtraOptionsToDisableDuplicateWindowPeriod()
         $data = $this->request->getData();
         $this->assertEquals('x_duplicate_window=0', strip_tags($data->extraOptions));
     }
+
+    public function testShouldUseTrackDataIfCardPresent()
+    {
+        $card = $this->getValidCard();
+        $card['tracks'] = '%B4242424242424242^SMITH/JOHN ^2511126100000000000000444000000?;4242424242424242=25111269999944401?';
+        $this->request->initialize(array(
+            'card' => $card,
+            'amount' => 21.00
+        ));
+
+        $data = $this->request->getData();
+
+        $this->assertObjectNotHasAttribute('profile', $data->transactionRequest);
+        $this->assertObjectHasAttribute('trackData', $data->transactionRequest->payment);
+    }
 }