Release 1.23.0

CHANGELOG.md

@@ -18,6 +18,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Removed
 
+
+## [1.23.0] - 2022-12-05
+
+### Added
+Function to check the live transaction status:
+- \SecucardConnect\Product\Payment\TransactionsService::checkStatus()
+
+### Changed
+- New structure of Payment.Model.CrowdFundingData
+
+
 ## [1.22.0] - 2021-06-11
 
 ### Added
@@ -703,3 +714,4 @@ First release
 [1.20.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/1.19.0...1.20.0
 [1.21.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/1.20.0...1.21.0
 [1.22.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/1.21.0...1.22.0
+[1.23.0]:https://github.com/secucard/secucard-connect-php-sdk/compare/1.22.0...1.23.0

composer.json

@@ -3,7 +3,7 @@
     "description": "secucard connect PHP client SDK",
     "license": "Apache-2.0",
     "homepage": "https://github.com/secucard/secucard-connect-php-sdk",
-    "version": "1.22.0",
+    "version": "1.23.0",
     "require": {
         "php": ">=5.5.0",
         "guzzlehttp/guzzle": "~6.3|~7.0",

src/SecucardConnect/Auth/OauthProvider.php

@@ -200,8 +200,6 @@ public function getAccessToken($deviceCode = null, $json = false)
      */
     private function updateToken(RefreshTokenCredentials $refreshToken = null, $deviceCode = null)
     {
-        $tokenData = null;
-
         // array of url parameters that will be sent in auth request
         $params = [];
         if ($refreshToken == null && !empty($deviceCode)) {

src/SecucardConnect/Product/Payment/ContainersService.php

@@ -1,13 +1,9 @@
 <?php
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Payment;
 
-use GuzzleHttp\Exception\GuzzleException;
-use SecucardConnect\Client\ApiError;
-use SecucardConnect\Client\AuthError;
-use SecucardConnect\Client\ClientError;
 use SecucardConnect\Client\ProductService;
-use SecucardConnect\Product\Common\Model\BaseCollection;
 
 /**
  * Operations for the payment/containers resource.

src/SecucardConnect/Product/Payment/ContractsService.php

@@ -1,4 +1,5 @@
 <?php
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Payment;
 
@@ -11,7 +12,6 @@
 use SecucardConnect\Product\Payment\Model\CloneParams;
 use SecucardConnect\Product\Payment\Model\CreateSubContractRequest;
 use SecucardConnect\Product\Payment\Model\CreateSubContractResponse;
-use SecucardConnect\Product\Payment\Model\Transaction;
 use SecucardConnect\Product\Services\Model\Contract;
 
 
@@ -26,7 +26,7 @@ class ContractsService extends ProductService
      *
      * @param string $contractId The id of the parent contract.
      * @param CloneParams $param The parameters for cloning.
-     * @return Contract
+     * @return \SecucardConnect\Product\Payment\Model\Contract
      * @throws GuzzleException
      * @throws ApiError
      * @throws AuthError
@@ -56,7 +56,7 @@ public function getPaymentMethods($contractId = 'me')
      * Clones the contract of the current user according to the given parameters and returns the contract.
      *
      * @param CloneParams $param The parameters for cloning.
-     * @return Contract
+     * @return \SecucardConnect\Product\Payment\Model\Contract
      * @throws GuzzleException
      * @throws ApiError
      * @throws AuthError

src/SecucardConnect/Product/Payment/Model/CheckStatusResponse.php

@@ -0,0 +1,26 @@
+<?php
+/** @noinspection PhpUnused */
+
+namespace SecucardConnect\Product\Payment\Model;
+
+/**
+ * Class CheckStatusResponse
+ * @package SecucardConnect\Product\Payment\Model
+ */
+class CheckStatusResponse
+{
+    /**
+     * @var int
+     */
+    public $status;
+
+    /**
+     * @var int
+     */
+    public $amount;
+
+    /**
+     * @var string
+     */
+    public $currency;
+}

src/SecucardConnect/Product/Payment/Model/CrowdFundingData.php

@@ -1,4 +1,5 @@
 <?php
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Payment\Model;
 
@@ -13,11 +14,21 @@ class CrowdFundingData
      */
     public $project;
 
+    /**
+     * @var int
+     */
+    public $deposited_amount = 0;
+
     /**
      * @var int
      */
     public $paid_out = 0;
 
+    /**
+     * @var int
+     */
+    public $deducted_amount = 0;
+
     /**
      * @var CrowdFundingDataOpen
      */

src/SecucardConnect/Product/Payment/Model/CrowdFundingDataOpenDetail.php

@@ -1,4 +1,5 @@
 <?php
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Payment\Model;
 
@@ -12,4 +13,29 @@ class CrowdFundingDataOpenDetail
      * @var int
      */
     public $total = 0;
+
+    /**
+     * @var int|null
+     */
+    public $debit = null;
+
+    /**
+     * @var int|null
+     */
+    public $credit_card = null;
+
+    /**
+     * @var int|null
+     */
+    public $prepay = null;
+
+    /**
+     * @var int|null
+     */
+    public $sofort = null;
+
+    /**
+     * @var int|null
+     */
+    public $twint = null;
 }

src/SecucardConnect/Product/Payment/Model/CrowdFundingDataProject.php

@@ -9,14 +9,9 @@
 class CrowdFundingDataProject
 {
     /**
-     * @var int
+     * @var string
      */
-    public $total_amount = 0;
-
-    /**
-     * @var int
-     */
-    public $total_count = 0;
+    public $currency = 'EUR';
 
     /**
      * @var CrowdFundingDataProjectAmount
@@ -37,4 +32,9 @@ class CrowdFundingDataProject
      * @var CrowdFundingDataProjectAmount
      */
     public $sofort;
+
+    /**
+     * @var CrowdFundingDataProjectAmount
+     */
+    public $twint;
 }

src/SecucardConnect/Product/Payment/Model/Data.php

@@ -13,7 +13,6 @@ class Data
      */
     public $owner;
 
-    // account data:
     /**
      * @var string
      */

src/SecucardConnect/Product/Payment/Model/SecupayPayout.php

@@ -1,4 +1,5 @@
 <?php
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Payment\Model;
 
@@ -18,7 +19,7 @@ class SecupayPayout extends BaseModel
     public $demo;
 
     /**
-     * 	Total amount of transaction lit's items
+     * Total amount of transaction lit's items
      *
      * @var int
      */

src/SecucardConnect/Product/Payment/Model/Transactions.php

@@ -1,9 +1,8 @@
 <?php
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Payment\Model;
 
-use SecucardConnect\Product\Common\Model\BaseModel;
-
 /**
  * Class Transactions
  * @package SecucardConnect\Product\Payment\Model

src/SecucardConnect/Product/Payment/TransactionsService.php

@@ -1,4 +1,6 @@
 <?php
+/** @noinspection PhpUnused */
+/** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
 
 namespace SecucardConnect\Product\Payment;
 
@@ -14,6 +16,7 @@
 use SecucardConnect\Product\Payment\Event\PaymentChanged;
 use SecucardConnect\Product\Payment\Model\AssignedPaymentTransaction;
 use SecucardConnect\Product\Payment\Model\Basket;
+use SecucardConnect\Product\Payment\Model\CheckStatusResponse;
 use SecucardConnect\Product\Payment\Model\CrowdFundingData;
 use SecucardConnect\Product\Payment\Model\Transaction;
 use SecucardConnect\Product\Payment\Model\Transactions;
@@ -88,6 +91,27 @@ public function getOldFormat($id)
         );
     }
 
+    /**
+     * Function to check the live data for the given transaction
+     *
+     * @param string $paymentId The payment transaction id
+     * @return CheckStatusResponse
+     * @throws ApiError
+     * @throws AuthError
+     * @throws ClientError
+     * @throws GuzzleException
+     */
+    public function checkStatus($paymentId)
+    {
+        return $this->getWithAction(
+            $paymentId,
+            'checkStatus',
+            null,
+            null,
+            'SecucardConnect\\Product\\Payment\\Model\\CheckStatusResponse'
+        );
+    }
+
     /**
      * @param string $merchantId ('MRC_...')
      * @return CrowdFundingData

src/SecucardConnect/Product/Services/Model/Contract.php

@@ -1,9 +1,10 @@
 <?php
+/** @noinspection PhpFullyQualifiedNameUsageInspection */
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Services\Model;
 
 use SecucardConnect\Product\Common\Model\BaseModel;
-use SecucardConnect\Product\General\Model\Merchant;
 
 /**
  * Ident contracts Api Model class
@@ -31,7 +32,7 @@ class Contract extends BaseModel
     public $created;
 
     /**
-     * @var Merchant
+     * @var \SecucardConnect\Product\General\Model\Merchant
      */
     public $merchant;
-}
+}

src/SecucardConnect/Product/Services/Model/IdentCase.php

@@ -1,9 +1,10 @@
 <?php
+/** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Services\Model;
 
 use SecucardConnect\Product\Common\Model\BaseModel;
-use SecucardConnect\Product\Common\Model\Contact;
 
 /**
  * Identcase Api Model class
@@ -100,7 +101,7 @@ class IdentCase extends BaseModel
     public $task;
 
     /**
-     * @var BaseModel
+     * @var \SecucardConnect\Product\Common\Model\BaseModel
      */
     public $owner;
 }

src/SecucardConnect/Product/Services/Model/IdentRequest.php

@@ -1,9 +1,10 @@
 <?php
+/** @noinspection PhpFullyQualifiedNameUsageInspection */
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Services\Model;
 
 use SecucardConnect\Product\Common\Model\BaseModel;
-use SecucardConnect\Product\General\Model\Merchant;
 
 /**
  * Identrequests Api Model class
@@ -68,7 +69,7 @@ class IdentRequest extends BaseModel
     public $use_internal_contract;
 
     /**
-     * @var Merchant[]
+     * @var \SecucardConnect\Product\General\Model\Merchant[]
      */
     public $assignment;
 

src/SecucardConnect/Product/Services/Model/Task.php

@@ -1,9 +1,9 @@
 <?php
+/** @noinspection PhpFullyQualifiedNameUsageInspection */
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Services\Model;
 
-use SecucardConnect\Product\Common\Model\BaseModel;
-
 /**
  * Task Api Model class
  */
@@ -30,7 +30,7 @@ class Task
     public $status;
 
     /**
-     * @var BaseModel[]
+     * @var \SecucardConnect\Product\Common\Model\BaseModel[]
      */
     public $assign;
-}
+}

src/SecucardConnect/Product/Services/Model/Uploadident.php

@@ -1,9 +1,9 @@
 <?php
+/** @noinspection PhpUnused */
 
 namespace SecucardConnect\Product\Services\Model;
 
 use SecucardConnect\Product\Common\Model\BaseModel;
-use SecucardConnect\Product\General\Model\Merchant;
 
 /**
  * Uploadidents Api Model class

src/SecucardConnect/Product/Services/UploadidentsService.php

@@ -2,12 +2,7 @@
 
 namespace SecucardConnect\Product\Services;
 
-use GuzzleHttp\Exception\GuzzleException;
-use SecucardConnect\Client\ApiError;
-use SecucardConnect\Client\AuthError;
-use SecucardConnect\Client\ClientError;
 use SecucardConnect\Client\ProductService;
-use SecucardConnect\Product\Services\Model\IdentCase;
 
 /**
  * Operations for the services/uploadidents resource.