cheppers · Urudin · Nov 20, 2020 · Dec 7, 2020 · Dec 8, 2020
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "ext-dom": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "guzzlehttp/guzzle": "^6.2.1",
+        "guzzlehttp/guzzle": "^7.0.1",
         "psr/log": "^1.0"
     },
     "require-dev": {

diff --git a/example/App.php b/example/App.php
@@ -25,7 +25,7 @@ public function getSecretKey(): string
 
     public function getBaseUrl(): string
     {
-        return getenv('OTPSP_BASE_URL') ?: 'http://127.0.0.1:1234';
+        return getenv('OTPSP_BASE_URL') ?: 'http://otpsp-client.test';
     }
 
     public function twig()

diff --git a/example/docroot/start-query.php b/example/docroot/start-query.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types = 1);
+
+use Cheppers\OtpspClient\Checksum;
+use Cheppers\OtpspClient\DataType\QueryRequest;
+use Cheppers\OtpspClient\OtpSimplePayClient;
+use GuzzleHttp\Client;
+use Psr\Log\Test\TestLogger;
+
+require_once '../../vendor/autoload.php';
+require_once '../App.php';
+
+$app = new App();
+
+$now = new DateTime('now');
+$guzzle = new Client();
+$serializer = new Checksum();
+$logger = new TestLogger();
+$otpSimple = new OtpSimplePayClient($guzzle, $serializer, $logger);
+$otpSimple->setSecretKey($app->getSecretKey());
+$timeout = new DateInterval('PT5M');
+
+$queryRequest = new QueryRequest();
+$queryRequest->merchant = $app->getMerchantId();
+//$queryRequest->orderRefs[] = 'my-order-id-2020-12-07-09-35-51';
+$queryRequest->salt = 'd471d2fb24c5a395563ff60f8ba769d1';
+$queryRequest->transactionIds[] = '500748082';
+//$queryRequest->salt = 'TV0ywJZVdf62p5nAJkldHWDzr2dLJRPe';
+
+$startQueryResponse = $otpSimple->startQuery($queryRequest);
+
+// In a real application do not print anything,
+// just redirect the client to $startPaymentResponse->paymentURL.
+echo $app
+    ->twig()
+    ->render(
+        'start-query.html.twig',
+        [
+            'queryRequest' => $queryRequest,
+            'queryRequestJson' => $app->jsonEncode($queryRequest),
+            'queryPaymentResponse' => $startQueryResponse,
+            'startQueryResponseJson' => $app->jsonEncode($startQueryResponse),
+            'logEntriesJson' => $app->jsonEncode($logger->records),
+        ]
+    );
diff --git a/example/templates/start-query.html.twig b/example/templates/start-query.html.twig
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <link rel="shortcut icon" href="https://sandbox.simplepay.hu/pay/support/favicon.ico">
+    <title>Start query response</title>
+</head>
+<body>
+<main>
+    <h1>Start payment response</h1>
+    <section>
+        <h2>queryRequestJson</h2>
+        <pre><code>{{ queryRequestJson }}</code></pre>
+    </section>
+    <section>
+        <h2>startQueryResponseJson</h2>
+        <pre><code>{{ startQueryResponseJson }}</code></pre>
+    </section>
+    <section>
+        <h2>logEntriesJson</h2>
+        <pre><code>{{ logEntriesJson }}</code></pre>
+    </section>
+{#    {% if startQueryResponse.paymentUrl -%}#}
+{#        <section>#}
+{#            <h2>paymentURL</h2>#}
+{#            <a href="{{ startQueryResponse.paymentUrl }}">Go to SimplePay</a>#}
+{#        </section>#}
+{#    {%- endif %}#}
+</main>
+{% include 'footer.html.twig' %}
+</body>
+</html>
diff --git a/src/DataType/InstantPaymentNotification.php b/src/DataType/InstantPaymentNotification.php
@@ -9,11 +9,6 @@
 class InstantPaymentNotification extends ResponseBase implements JsonSerializable
 {
 
-    /**
-     * @var string
-     */
-    public $cardMask = '';
-
     /**
      * @var string
      */
@@ -24,11 +19,6 @@ class InstantPaymentNotification extends ResponseBase implements JsonSerializabl
      */
     public $finishDate = '';
 
-    /**
-     * @var string
-     */
-    public $expiry = '';
-
     /**
      * @var string
      */
@@ -57,10 +47,8 @@ public function jsonSerialize()
                 case 'merchant':
                 case 'orderRef':
                 case 'transactionId':
-                case 'cardMask':
                 case 'method':
                 case 'finishDate':
-                case 'expiry':
                 case 'paymentDate':
                 case 'status':
                 case 'receiveDate':

diff --git a/src/DataType/PaymentRequest.php b/src/DataType/PaymentRequest.php
@@ -49,6 +49,16 @@ public static function __set_state($values)
         return $instance;
     }
 
+    /**
+     * @var string
+     */
+    public $orderRef = '';
+
+    /**
+     * @var string
+     */
+    public $currency = '';
+
     /**
      * @var string
      */

diff --git a/src/DataType/QueryRequest.php b/src/DataType/QueryRequest.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Cheppers\OtpspClient\DataType;
+
+/**
+ * Represent a data structure to create a transaction.
+ *
+ * Endpoint https://sandbox.simplepay.hu/payment/v2/start
+ *
+ * @see http://simplepartner.hu/download.php?target=v21docen Chapter 3.3
+ */
+class QueryRequest extends RequestBase
+{
+
+    /**
+     * @var string
+     */
+    public $merchant = '';
+
+    /**
+     * @var array
+     */
+    public $transactionIds = [];
+
+//    /**
+//     * @var array
+//     */
+//    public $orderRefs = [];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function jsonSerialize()
+    {
+        $data = [];
+
+        foreach (get_object_vars($this) as $key => $value) {
+            $data[$key] = $value;
+
+        }
+            return $data;
+    }
+}
diff --git a/src/DataType/QueryResponse.php b/src/DataType/QueryResponse.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types = 1);
+namespace Cheppers\OtpspClient\DataType;
+
+class QueryResponse extends ResponseBase
+{
+    /**
+     * @var double
+     */
+    public $totalCount = 0;
+    /**
+     * @var array
+     */
+    public $transactions = [];
+}
diff --git a/src/DataType/RefundRequest.php b/src/DataType/RefundRequest.php
@@ -12,6 +12,16 @@ class RefundRequest extends RequestBase
      */
     public $transactionId = '';
 
+    /**
+     * @var string
+     */
+    public $orderRef = '';
+
+    /**
+     * @var string
+     */
+    public $currency = '';
+
     /**
      * @var float
      */

diff --git a/src/DataType/RequestBase.php b/src/DataType/RequestBase.php
@@ -28,11 +28,6 @@ public static function __set_state($values)
      */
     public $merchant = '';
 
-    /**
-     * @var string
-     */
-    public $orderRef = '';
-
     /**
      * @var string
      */
@@ -41,10 +36,6 @@ public static function __set_state($values)
     /**
      * @var string
      */
-    public $currency = '';
-
-    /**
-     * @var string
-     */
-    public $sdkVersion = 'SimplePay_PHP_SDK_2.0_180930:33ccd5ed8e8a965d18abfae333404184';
+    public $sdkVersion = 'SimplePayV2.1_Payment_PHP_SDK_2.0.7_190701:dd236896400d7463677a82a47f53e36e';
+//    public $sdkVersion = 'SimplePay_PHP_SDK_2.0_180930:33ccd5ed8e8a965d18abfae333404184';
 }
diff --git a/src/OtpSimplePayClient.php b/src/OtpSimplePayClient.php
@@ -7,6 +7,8 @@
 use Cheppers\OtpspClient\DataType\BackResponse;
 use Cheppers\OtpspClient\DataType\InstantPaymentNotification;
 use Cheppers\OtpspClient\DataType\PaymentRequest;
+use Cheppers\OtpspClient\DataType\QueryRequest;
+use Cheppers\OtpspClient\DataType\QueryResponse;
 use Cheppers\OtpspClient\DataType\RefundRequest;
 use Cheppers\OtpspClient\DataType\RefundResponse;
 use Cheppers\OtpspClient\DataType\RequestBase;
@@ -15,6 +17,7 @@
 use DateTimeInterface;
 use Exception;
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use Psr\Http\Message\MessageInterface;
@@ -180,7 +183,7 @@ public function __construct(
     }
 
     /**
-     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws GuzzleException
      * @throws Exception
      */
     public function startPayment(PaymentRequest $paymentRequest): PaymentResponse
@@ -192,7 +195,7 @@ public function startPayment(PaymentRequest $paymentRequest): PaymentResponse
     }
 
     /**
-     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws GuzzleException
      * @throws Exception
      */
     public function startRefund(RefundRequest $refundRequest): RefundResponse
@@ -203,6 +206,19 @@ public function startRefund(RefundRequest $refundRequest): RefundResponse
         return RefundResponse::__set_state($body);
     }
 
+    /**
+     * @param  QueryRequest  $queryRequest
+     * @return QueryResponse
+     * @throws GuzzleException
+     */
+    public function startQuery(QueryRequest $queryRequest): QueryResponse
+    {
+        $response = $this->sendRequest($queryRequest, 'query');
+        $body = $this->getMessageBody($response);
+
+        return QueryResponse::__set_state($body);
+    }
+
     /**
      * @throws Exception
      */
@@ -286,7 +302,7 @@ public function getInstantPaymentNotificationSuccessParts(InstantPaymentNotifica
     }
 
     /**
-     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws GuzzleException
      */
     public function sendRequest(RequestBase $requestType, string $path): ResponseInterface
     {