Merge branch 'v3' into feature/splitTx

Author: sbuche

src/Data/PaymentData/WalletData.php

@@ -17,6 +17,10 @@ class WalletData extends PaymentData {
     protected $walletOwner;
     /** @var string */
     protected $walletType;
+    /** @var string */
+    protected $walletOwnerFirstName;
+    /** @var string */
+    protected $walletOwnerLastName;
 
     /**
      * @return string
@@ -75,4 +79,36 @@ public function setWalletType($walletType)
         return $this;
     }
 
-}
+    /**
+     * @return string
+     */
+    public function getWalletOwnerFirstName()
+    {
+        return $this->walletOwnerFirstName;
+    }
+
+    /**
+     * @param string $walletOwnerFirstName
+     */
+    public function setWalletOwnerFirstName($walletOwnerFirstName)
+    {
+        $this->walletOwnerFirstName = $walletOwnerFirstName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getWalletOwnerLastName()
+    {
+        return $this->walletOwnerLastName;
+    }
+
+    /**
+     * @param string $walletOwnerLastName
+     */
+    public function setWalletOwnerLastName($walletOwnerLastName)
+    {
+        $this->walletOwnerLastName = $walletOwnerLastName;
+    }
+
+}

src/Data/Result/WalletData.php

@@ -25,6 +25,15 @@ class WalletData extends ResultData {
      */
     protected $walletType;
 
+    /**
+     * @var string
+     */
+    protected $walletOwnerFirstName;
+
+    /**
+     * @var string
+     */
+    protected $walletOwnerLastName;
 
     /**
      * @return string
@@ -72,17 +81,59 @@ public function setWalletReferenceId($walletReferenceId) {
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getWalletOwnerFirstName()
+    {
+        return $this->walletOwnerFirstName;
+    }
+
+    /**
+     * @param string $walletOwnerFirstName
+     */
+    public function setWalletOwnerFirstName($walletOwnerFirstName)
+    {
+        $this->walletOwnerFirstName = $walletOwnerFirstName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getWalletOwnerLastName()
+    {
+        return $this->walletOwnerLastName;
+    }
+
+    /**
+     * @param string $walletOwnerLastName
+     */
+    public function setWalletOwnerLastName($walletOwnerLastName)
+    {
+        $this->walletOwnerLastName = $walletOwnerLastName;
+    }
+
 
     /**
      * @return array
      */
     public function toArray() {
-        return array(
+        $result = array(
             'walletType' => $this->walletType,
             'walletOwner' => $this->walletOwner,
             'walletReferenceId' => $this->walletReferenceId
         );
+
+        if (!empty($this->walletOwnerFirstName)) {
+            $result['walletOwnerFirstName'] = $this->walletOwnerFirstName;
+        }
+
+        if (!empty($this->walletOwnerLastName)) {
+            $result['walletOwnerLastName'] = $this->walletOwnerLastName;
+        }
+
+        return $result;
     }
 
 
-}
+}

src/Json/JsonGenerator.php

@@ -505,6 +505,14 @@ protected function createPaymentData($paymentData){
                 'walletOwner' => $paymentData->getWalletOwner(),
                 'walletType' => $paymentData->getWalletType(),
             ];
+
+            if (!empty($paymentData->getWalletOwnerFirstName())) {
+                $data['walletData']['walletOwnerFirstName'] = $paymentData->getWalletOwnerFirstName();
+            }
+
+            if (!empty($paymentData->getWalletOwnerLastName())) {
+                $data['walletData']['walletOwnerLastName'] = $paymentData->getWalletOwnerLastName();
+            }
         }
 
         return $data;

src/Json/JsonParser.php

@@ -352,6 +352,8 @@ protected function parseReturnData($returnData) {
                 $walletData->setWalletOwner($this->arrGet($returnData, 'walletOwner'));
                 $walletData->setWalletReferenceId($this->arrGet($returnData, 'walletReferenceId'));
                 $walletData->setWalletType($this->arrGet($returnData, 'walletType'));
+                $walletData->setWalletOwnerFirstName($this->arrGet($returnData, 'walletOwnerFirstName'));
+                $walletData->setWalletOwnerLastName($this->arrGet($returnData, 'walletOwnerLastName'));
 
                 return $walletData;
 

src/Xml/Parser.php

@@ -570,6 +570,12 @@ protected function parseReturnData(\DOMNode $node) {
                     case 'walletOwner':
                         $walletData->setWalletOwner($child->nodeValue);
                         break;
+                    case 'walletOwnerFirstName':
+                        $walletData->setWalletOwnerFirstName($child->nodeValue);
+                        break;
+                    case 'walletOwnerLastName':
+                        $walletData->setWalletOwnerLastName($child->nodeValue);
+                        break;
                     default:
                         break;
                 }
@@ -822,4 +828,4 @@ protected function parseCustomerData(\DOMNode $node) {
 
         return $customer;
     }
-}
+}