removed set/get CreditType, added translator method

Author: Maksim Rafalko

src/Omnipay/NetBanx/Message/AbstractRequest.php

@@ -11,6 +11,8 @@
 
 namespace Omnipay\NetBanx\Message;
 
+use Omnipay\Common\CreditCard;
+
 /**
  * NetBanx Abstract Request
  */
@@ -114,27 +116,6 @@ public function setCustomerId($value)
         return $this->setParameter('customerId', $value);
     }
 
-    /**
-     * Setter for Card Type
-     *
-     * @param string $value
-     * @return $this
-     */
-    public function setCardType($value)
-    {
-        return $this->setParameter('cardType', $value);
-    }
-
-    /**
-     * Getter for Card Type
-     *
-     * @return string
-     */
-    public function getCardType()
-    {
-        return $this->getParameter('cardType');
-    }
-
     /**
      * Send request
      *
@@ -171,4 +152,47 @@ protected function getBaseData()
 
         return $data;
     }
+
+    /**
+     * Translate card type to internal NetBanx format
+     *
+     * @param string $brand
+     * @return string
+     */
+    protected function translateCardType($brand)
+    {
+        switch ($brand) {
+            case CreditCard::BRAND_VISA:
+                $cardType = 'VI';
+                break;
+            case CreditCard::BRAND_AMEX:
+                $cardType = 'AM';
+                break;
+            case CreditCard::BRAND_DISCOVER:
+                $cardType = 'DI';
+                break;
+            case CreditCard::BRAND_MASTERCARD:
+                $cardType = 'MC';
+                break;
+            case CreditCard::BRAND_MAESTRO:
+                $cardType = 'MD';
+                break;
+            case CreditCard::BRAND_LASER:
+                $cardType = 'LA';
+                break;
+            case CreditCard::BRAND_SOLO:
+                $cardType = 'SO';
+                break;
+            case CreditCard::BRAND_JCB:
+                $cardType = 'JC';
+                break;
+            case CreditCard::BRAND_DINERS_CLUB:
+                $cardType = 'DC';
+                break;
+            default:
+                $cardType = 'VI';
+        }
+
+        return $cardType;
+    }
 }

src/Omnipay/NetBanx/Message/AuthorizeRequest.php

@@ -57,7 +57,7 @@ public function getData()
      */
     protected function getXmlString()
     {
-        if ($this->getStoredDataMode() == $this->txnMode) {
+        if ($this->getTransactionReference()) {
             $xmlRoot = 'ccStoredDataRequestV1';
         } else {
             $xmlRoot = 'ccAuthRequestV1';
@@ -79,7 +79,7 @@ protected function getXmlString()
 
         $sxml->addChild('merchantRefNum', $this->getCustomerId() ?: 'ref-num - ' . time());
 
-        if ($this->getStoredDataMode() == $this->txnMode) {
+        if ($this->getTransactionReference()) {
             $sxml->addChild('confirmationNumber', $this->getTransactionReference());
             $sxml->addChild('amount', $this->getAmountDecimal());
         } else {
@@ -96,7 +96,7 @@ protected function getXmlString()
             $cardExpiry->addChild('month', $card->getExpiryDate('m'));
             $cardExpiry->addChild('year', $card->getExpiryDate('Y'));
 
-            $cardChild->addChild('cardType', $this->getCardType() ?: 'VI');
+            $cardChild->addChild('cardType', $this->translateCardType($card->getBrand()));
             $cardChild->addChild('cvdIndicator', '1');
             $cardChild->addChild('cvd', $card->getCvv());
 

tests/Omnipay/NetBanx/GatewayTest.php

@@ -37,7 +37,6 @@ public function setUp()
         $this->purchaseOptions = array(
             'amount' => 9563,
             'card' => $card,
-            'cardType' => 'AM',
             'customerId' => '9966441',
         );
 
@@ -76,7 +75,7 @@ public function testAuthorizeSuccess()
         $this->assertSame('ccAuthorize', $requestData['txnMode']);
 
         $this->assertSame('93401', (string) $sxml->billingDetails->zip);
-        $this->assertSame('AM', (string) $sxml->card->cardType);
+        $this->assertSame('VI', (string) $sxml->card->cardType);
 
         $this->assertTrue(isset($sxml->billingDetails));
         $this->assertTrue(isset($sxml->shippingDetails));