Merge pull request #15 from ThePay/v1.x-spring1

V1.x spring backup because, v1.x-spring original branch is complete fuck-up
ThePay · May 19, 2022 · 3f747a3 · 3f747a3
2 parents 43eec4e + 2744e19
commit 3f747a3
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 4 deletions.
diff --git a/src/Model/RealizeIrregularSubscriptionPaymentParams.php b/src/Model/RealizeIrregularSubscriptionPaymentParams.php
@@ -10,9 +10,13 @@ class RealizeIrregularSubscriptionPaymentParams extends RealizeSubscriptionPayme
      * RealizeIrregularSubscriptionPaymentParams constructor.
      *
      * @param string $uid
+     * @param string|null $orderId
+     * @param string|null $descriptionForMerchant
      */
-    public function __construct($uid)
+    public function __construct($uid, $orderId = null, $descriptionForMerchant = null)
     {
         $this->uid = new Identifier($uid);
+        $this->orderId = $orderId;
+        $this->descriptionForMerchant = $descriptionForMerchant;
     }
 }
diff --git a/src/Model/RealizePaymentBySavedAuthorizationParams.php b/src/Model/RealizePaymentBySavedAuthorizationParams.php
@@ -21,21 +21,31 @@ final class RealizePaymentBySavedAuthorizationParams implements SignableRequest
     /** @var CurrencyCode|null */
     private $currencyCode;
 
+    /** @var string|null */
+    protected $orderId = null;
+
+    /** @var string|null */
+    protected $descriptionForMerchant = null;
+
     /**
      * RealizePaymentBySavedAuthorizationParams constructor.
      *
      * @param string $uid
      * @param int|null $amount - payment amount in cents, if set to null it will use amount from parent payment, required if $currencyCode is present
      * @param string|null $currencyCode required if $amount is present
+     * @param string|null $orderId
+     * @param string|null $descriptionForMerchant
      */
-    public function __construct($uid, $amount = null, $currencyCode = null)
+    public function __construct($uid, $amount = null, $currencyCode = null, $orderId = null, $descriptionForMerchant = null)
     {
         if (($amount === null && $currencyCode !== null) || ($amount !== null && $currencyCode === null)) {
             throw new InvalidArgumentException('Amount and currency code is required if one of these parameters have value.');
         }
         $this->uid = new Identifier($uid);
         $this->amount = $amount === null ? null : new Amount($amount);
         $this->currencyCode = $currencyCode === null ? null : new CurrencyCode($currencyCode);
+        $this->orderId = $orderId;
+        $this->descriptionForMerchant = $descriptionForMerchant;
     }
 
     /**
@@ -70,6 +80,22 @@ public function getCurrencyCode()
         return $this->currencyCode;
     }
 
+    /**
+     * @return string|null
+     */
+    public function getOrderId()
+    {
+        return $this->orderId;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getDescriptionForMerchant()
+    {
+        return $this->descriptionForMerchant;
+    }
+
     /**
      * If no items will be set, the items from parent payment will be used.
      *
@@ -91,6 +117,8 @@ public function toArray()
         $result = array(
             'uid' => $this->uid->getValue(),
             'items' => null,
+            'orderId' => $this->orderId,
+            'descriptionForMerchant' => $this->descriptionForMerchant,
         );
 
         if ($this->items) {

diff --git a/src/Model/RealizeRegularSubscriptionPaymentParams.php b/src/Model/RealizeRegularSubscriptionPaymentParams.php
@@ -10,9 +10,13 @@ class RealizeRegularSubscriptionPaymentParams extends RealizeSubscriptionPayment
      * RealizeRegularSubscriptionPaymentParams constructor.
      *
      * @param string $uid
+     * @param string|null $orderId
+     * @param string|null $descriptionForMerchant
      */
-    public function __construct($uid)
+    public function __construct($uid, $orderId = null, $descriptionForMerchant = null)
     {
         $this->uid = new Identifier($uid);
+        $this->orderId = $orderId;
+        $this->descriptionForMerchant = $descriptionForMerchant;
     }
 }
diff --git a/src/Model/RealizeSubscriptionPaymentParams.php b/src/Model/RealizeSubscriptionPaymentParams.php
@@ -16,6 +16,12 @@ abstract class RealizeSubscriptionPaymentParams implements SignableRequest
     /** @var Identifier */
     protected $uid;
 
+    /** @var string|null */
+    protected $orderId = null;
+
+    /** @var string|null */
+    protected $descriptionForMerchant = null;
+
     /**
      * @return Amount
      */
@@ -40,6 +46,22 @@ public function getItems()
         return $this->items;
     }
 
+    /**
+     * @return string|null
+     */
+    public function getOrderId()
+    {
+        return $this->orderId;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getDescriptionForMerchant()
+    {
+        return $this->descriptionForMerchant;
+    }
+
     /**
      * If no items will be set, the items from parent payment will be used.
      *
@@ -61,6 +83,8 @@ public function toArray()
         $result = array(
             'payment_uid' => $this->uid->getValue(),
             'items' => null,
+            'order_id' => $this->orderId,
+            'description_for_merchant' => $this->descriptionForMerchant,
         );
 
         if ($this->items) {

diff --git a/src/Model/RealizeUsageBasedSubscriptionPaymentParams.php b/src/Model/RealizeUsageBasedSubscriptionPaymentParams.php
@@ -12,10 +12,14 @@ class RealizeUsageBasedSubscriptionPaymentParams extends RealizeSubscriptionPaym
      *
      * @param string $uid
      * @param int $amount - payment amount in cents
+     * @param string|null $orderId
+     * @param string|null $descriptionForMerchant
      */
-    public function __construct($uid, $amount)
+    public function __construct($uid, $amount, $orderId = null, $descriptionForMerchant = null)
     {
         $this->uid = new Identifier($uid);
         $this->amount = new Amount($amount);
+        $this->orderId = $orderId;
+        $this->descriptionForMerchant = $descriptionForMerchant;
     }
 }