From 3f1800253c72ce08c6c1b4c24e3fe3b229c5a736 Mon Sep 17 00:00:00 2001
From: christianheidorn <christianheidorn@gmail.com>
Date: Fri, 30 Sep 2016 07:33:56 +0000
Subject: [PATCH] Fixed Issue #119

---
 lib/Paymill/Models/Request/Subscription.php  | 20 ++++++++++++++++++++
 lib/Paymill/Models/Response/Subscription.php | 14 ++++++++++++++
 lib/Paymill/Services/ResponseHandler.php     |  2 ++
 3 files changed, 36 insertions(+)

diff --git a/lib/Paymill/Models/Request/Subscription.php b/lib/Paymill/Models/Request/Subscription.php
index de1b50f..b2f205a 100755
--- a/lib/Paymill/Models/Request/Subscription.php
+++ b/lib/Paymill/Models/Request/Subscription.php
@@ -62,6 +62,11 @@ class Subscription extends Base
      */
     private $_periodOfValidity;
 
+    /**
+     * @var int
+     */
+    private $_endOfPeriod;
+    
     /**
      * @var boolean
      */
@@ -281,6 +286,15 @@ public function getPeriodOfValidity()
         return $this->_periodOfValidity;
     }
 
+    /**
+     * Returns end of period
+     * @return int
+     */
+    public function getEndOfPeriod()
+    {
+        return $this->_endOfPeriod;
+    }
+    
     /**
      * Returns if subscription is paused or not
      * @return boolean
@@ -461,6 +475,9 @@ public function parameterize($method)
                 if (!is_null($this->getPeriodOfValidity())) {
                     $parameterArray['period_of_validity'] = $this->getPeriodOfValidity();
                 }
+                if (!is_null($this->getEndOfPeriod())) {
+                    $parameterArray['end_of_period'] = $this->getEndOfPeriod();
+                }
                 if (!is_null($this->getTrialEnd())) {
                     $parameterArray['trial_end']  = $this->getTrialEnd();
                 }
@@ -498,6 +515,9 @@ public function parameterize($method)
                 if (!is_null($this->getPeriodOfValidity())) {
                     $parameterArray['period_of_validity'] = $this->getPeriodOfValidity();
                 }
+                if (!is_null($this->getEndOfPeriod())) {
+                    $parameterArray['end_of_period'] = $this->getEndOfPeriod();
+                }
                 if (!is_null($this->getTrialEnd())) {
                     $parameterArray['trial_end']  = $this->getTrialEnd();
                 }
diff --git a/lib/Paymill/Models/Response/Subscription.php b/lib/Paymill/Models/Response/Subscription.php
index ddd38ce..684f645 100755
--- a/lib/Paymill/Models/Response/Subscription.php
+++ b/lib/Paymill/Models/Response/Subscription.php
@@ -76,6 +76,11 @@ class Subscription extends Base
      */
     private $_periodOfValidity;
 
+    /**
+     * @var int
+     */
+    private $_endOfPeriod;
+    
     /**
      * @var int
      */
@@ -363,6 +368,15 @@ public function getPeriodOfValidity()
         return $this->_periodOfValidity;
     }
 
+    /**
+     * Returns the end of the subscription (expiry time in unix time)
+     * @return int
+     */
+    public function getEndOfPeriod()
+    {
+        return $this->_endOfPeriod;
+    }
+
     /**
      * Set amount change type
      *
diff --git a/lib/Paymill/Services/ResponseHandler.php b/lib/Paymill/Services/ResponseHandler.php
index 4cb13d2..c6c2f2c 100755
--- a/lib/Paymill/Services/ResponseHandler.php
+++ b/lib/Paymill/Services/ResponseHandler.php
@@ -391,6 +391,8 @@ private function _createSubscription(array $response)
         $model->setTrialStart($response['trial_start']);
         $model->setTrialEnd($response['trial_end']);
         $model->setNextCaptureAt($response['next_capture_at']);
+        $model->setEndOfPeriod($response['end_of_period']);
+        $model->setNextCaptureAt($response['next_capture_at']);
         $model->setCreatedAt($response['created_at']);
         $model->setUpdatedAt($response['updated_at']);
         $model->setCanceledAt($response['canceled_at']);