Made ipaddress configurable

Put some more functions in the transaction info result

Author: Andy Pieters

src/Api/Transaction/Start.php

@@ -49,8 +49,14 @@ class Start extends Api
     private $_object;
     private $_domainId;
     private $_transferData;
+    private $_ipaddress;
+
     private $_products = array();
 
+    public function setIpAddress($ipAddress){
+        $this->_ipaddress = $ipAddress;
+    }
+
     public function setPromotorId($promotorId)
     {
         $this->_promotorId = $promotorId;
@@ -288,12 +294,14 @@ protected function getData()
             $data['paymentOptionSubId'] = $this->_paymentOptionSubId;
         }
 
-        //ip en browserdata setten browserdata set ik met dummydata
-        $data['ipAddress'] = Helper::getIp();
+
+        if(isset($this->_ipaddress)){
+            $data['ipAddress'] = $this->_ipaddress;
+        } else {
+            $data['ipAddress'] = Helper::getIp();
+        }
 
         if (!empty($this->_products)) {
-//            $data['saleData']['invoiceDate'] = date('d-m-Y');
-//            $data['saleData']['deliveryDate'] = date('d-m-Y', strtotime('+1 day'));
             $data['saleData']['orderData'] = $this->_products;
         }
 

src/Helper.php

@@ -116,6 +116,26 @@ public static function calculateTaxClass($amountInclTax, $taxAmount)
         return($taxClasses[$nearestTaxRate]);
     }
 
+	public static function splitAddress($strAddress)
+    {
+        $strAddress = trim($strAddress);
+
+        $a               = preg_split('/([0-9]+)/', $strAddress, 2,
+            PREG_SPLIT_DELIM_CAPTURE);
+        $strStreetName   = trim(array_shift($a));
+        $strStreetNumber = trim(implode('', $a));
+
+        if (empty($strStreetName)) { // American address notation
+            $a = preg_split('/([a-zA-Z]{2,})/', $strAddress, 2,
+                PREG_SPLIT_DELIM_CAPTURE);
+
+            $strStreetNumber = trim(array_shift($a));
+            $strStreetName   = implode(' ', $a);
+        }
+
+        return array($strStreetName, $strStreetNumber);
+    }
+	
     public static function getBaseUrl()
     {
         $protocol = isset($_SERVER["HTTPS"]) ? 'https' : 'http';

src/Result/Transaction.php

@@ -37,4 +37,32 @@ public function isPending(){
     public function isCanceled(){
         return $this->data['paymentDetails']['state'] < 0;
     }
+    public function getPaidAmount(){
+        return $this->data['paymentDetails']['paidAmount']/100;
+    }
+    public function getPaidCurrency(){
+        return $this->data['paymentDetails']['paidCurrency'];
+    }
+    public function getAccountHolderName(){
+        return $this->data['paymentDetails']['identifierName'];
+    }
+    public function getAccountNumber(){
+        return $this->data['paymentDetails']['identifierPublic'];
+    }
+    public function getAccountHash(){
+        return $this->data['paymentDetails']['identifierHash'];
+    }
+    public function getDescription(){
+        return $this->data['paymentDetails']['description'];
+    }
+    public function getExtra1(){
+        return $this->data['statsDetails']['extra1'];
+    }
+    public function getExtra2(){
+        return $this->data['statsDetails']['extra2'];
+    }
+    public function getExtra3(){
+        return $this->data['statsDetails']['extra3'];
+    }
+
 }

src/Transaction.php

@@ -74,6 +74,10 @@ public static function start($options = array())
             $api->setExtra3($options['extra3']);
         }
 
+        if(isset($options['ipaddress'])){
+            $api->setIpAddress($options['ipaddress']);
+        }
+
         if (isset($options['products'])) {
             foreach ($options['products'] as $product) {
                 $taxClass = Helper::calculateTaxClass($product['price'],
@@ -189,8 +193,6 @@ public static function getForExchange()
             $input = file_get_contents('php://input');
             $xml   = simplexml_load_string($input);
 
-
-
             $transactionId = $xml->order_id;
         }