Merge remote-tracking branch 'origin/master' into pivo

Author: Kostersson

src/Model/Card.php

@@ -6,7 +6,7 @@
  * @package Solinor\PaymentHighway\Model
  */
 
-class Card implements \JsonSerializable
+class Card extends JsonSerializable
 {
     public $pan = null;
     public $expiry_year = null;
@@ -29,22 +29,4 @@ public function __construct( $pan, $expiry_year, $expiry_month, $cvc = null, $ve
         $this->cvc = $cvc;
         $this->verification = $verification;
     }
-
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    public function jsonSerialize()
-    {
-        $data = get_object_vars($this);
-
-        foreach($data as $key => $val)
-            if($val === null)
-                unset($data[$key]);
-
-        return $data;
-    }
-}
+}

src/Model/JsonSerializable.php

@@ -0,0 +1,22 @@
+<?php namespace Solinor\PaymentHighway\Model;
+
+class JsonSerializable implements \JsonSerializable
+{
+    /**
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     * @since 5.4.0
+     */
+    public function jsonSerialize()
+    {
+        $data = get_object_vars($this);
+
+        foreach($data as $key => $val)
+            if($val === null)
+                unset($data[$key]);
+
+        return $data;
+    }
+}

src/Model/Request/Transaction.php

@@ -8,7 +8,7 @@
  * @package Solinor\PaymentHighway\Model\Request
  */
 
-class Transaction implements \JsonSerializable
+class Transaction extends \Solinor\PaymentHighway\Model\JsonSerializable
 {
     public $amount = null;
     public $currency = null;
@@ -17,21 +17,24 @@ class Transaction implements \JsonSerializable
 
     public $token = null;
     public $card = null;
+    public $splitting = null;
 
     /**
      * @param int $amount
      * @param string $currency
      * @param Card|Token|null $request
      * @param bool $blocking
      * @param string $orderId
+     * @param Splitting $splitting
      * @throws Exception
      */
-    public function __construct( $request, $amount, $currency, $blocking = true, $orderId = null )
+    public function __construct( $request, $amount, $currency, $blocking = true, $orderId = null, $splitting = null )
     {
         $this->amount = $amount;
         $this->currency = $currency;
         $this->order = $orderId;
         $this->blocking = $blocking;
+        $this->splitting = $splitting;
 
         $this->setRequestByType($request);
     }
@@ -48,22 +51,4 @@ private function setRequestByType( $request )
             $this->card = $request;
         }
     }
-
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    public function jsonSerialize()
-    {
-        $data = get_object_vars($this);
-
-        foreach($data as $key => $val)
-            if($val === null)
-                unset($data[$key]);
-
-        return $data;
-    }
-}
+}

src/Model/Splitting.php

@@ -0,0 +1,22 @@
+<?php namespace Solinor\PaymentHighway\Model;
+
+/**
+ * Class Splitting
+ * Splits the payment into sub-merchant settlement and the main merchant commission. Requires separate activation.
+ * @package Solinor\PaymentHighway\Model
+ */
+class Splitting extends JsonSerializable
+{
+    public $merchant_id = null;
+    public $amount = null;
+
+    /**
+     * @param string $merchant_id Sub-merchant ID from the settlements provider. Not to be confused with the sph-merchant value.
+     * @param int $amount The amount settled to the sub-merchant's account. The rest will be considered as the main merchant's commission. In the smallest currency unit. E.g. 99.99 € = 9999.
+     */
+    public function __construct($merchant_id, $amount)
+    {
+        $this->merchant_id = $merchant_id;
+        $this->amount = $amount;
+    }
+}

src/Model/Token.php

@@ -6,7 +6,7 @@
  * @package Solinor\PaymentHighway\Model
  */
 
-class Token implements \JsonSerializable
+class Token extends JsonSerializable
 {
     public $id = null;
     public $cvc = null;
@@ -20,22 +20,4 @@ public function __construct($id, $cvc = null)
         $this->id = $id;
         $this->cvc = $cvc;
     }
-
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    public function jsonSerialize()
-    {
-        $data = get_object_vars($this);
-
-        foreach($data as $key => $val)
-            if($val === null)
-                unset($data[$key]);
-
-        return $data;
-    }
-}
+}

src/PaymentApi.php

@@ -55,7 +55,7 @@ class PaymentApi
      * @param string $merchant
      * @param string $apiversion
      */
-    public function __construct($serviceUrl, $signatureKeyId, $signatureSecret, $account, $merchant, $apiversion = "20160630")
+    public function __construct($serviceUrl, $signatureKeyId, $signatureSecret, $account, $merchant, $apiversion = "20180426")
     {
         $this->serviceUrl = $serviceUrl;
         $this->signatureKeyId = $signatureKeyId;

tests/unit/PaymentApiTest.php

@@ -2,6 +2,7 @@
 
 use Solinor\PaymentHighway\Model\Card;
 use Solinor\PaymentHighway\Model\Request\Transaction;
+use Solinor\PaymentHighway\Model\Splitting;
 use Solinor\PaymentHighway\PaymentApi;
 use Solinor\PaymentHighway\Tests\TestBase;
 
@@ -72,7 +73,7 @@ public function initHandlerSuccessfully( PaymentApi $api )
     public function debitTransactionSuccess(PaymentApi $api, $transactionId )
     {
 
-        $card = $this->getValidCard();
+        $card = $this->getValidCardTransactionRequest();
 
         $response = $api->debitTransaction( $transactionId, $card)->body;
 
@@ -192,9 +193,39 @@ public function getReportSuccess( PaymentApi $api )
     }
 
     /**
-     * @return Card
+     * @depends      paymentApiExists
+     * @test
+     * @param PaymentApi $api
+     * @return string transactionId
+     */
+    public function splittingDetailsAreReturnedInTransactionStatus(PaymentApi $api)
+    {
+        $transactionId = $api->initTransaction()->body->id;
+
+        $subMerchantId = "12345";
+        $amountToSubMerchant = 90;
+
+        $splitting = new Splitting($subMerchantId, $amountToSubMerchant);
+
+        $transactionRequest = $this->getValidCardTransactionRequest($splitting);
+
+        $debitResponse = $api->debitTransaction($transactionId, $transactionRequest)->body;
+
+        $this->assertEquals('100', $debitResponse->result->code);
+
+        $statusResponse = $api->statusTransaction($transactionId)->body;
+
+        $this->assertEquals($subMerchantId, $statusResponse->transaction->splitting->merchant_id);
+        $this->assertEquals($amountToSubMerchant, $statusResponse->transaction->splitting->amount);
+
+        return $transactionId;
+    }
+
+    /**
+     * @param Splitting $splitting
+     * @return Transaction
      */
-    private function getValidCard()
+    private function getValidCardTransactionRequest($splitting = null)
     {
         return new Transaction(
             new Card(
@@ -206,7 +237,8 @@ private function getValidCard()
             99,
             'EUR',
             true,
-            self::$orderId
+            self::$orderId,
+            $splitting
         );
     }
-}
+}