Merge pull request #4 from SincosSoftware/feature/update-recurring-ap…

…i-to-v3 Use Vipps Recurring V3 API
SincosSoftware · Apr 18, 2024 · 82b3b98 · 82b3b98
2 parents fc6939f + 751b96e
commit 82b3b98
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 28 deletions.
diff --git a/src/Model/Agreement/RequestChargeAgreement.php b/src/Model/Agreement/RequestChargeAgreement.php
@@ -5,10 +5,10 @@
 class RequestChargeAgreement
 {
     protected $amount = 0;
-    protected $currency = 'NOK';
     protected $description;
     protected $due;
     protected $retryDays = 7;
+    protected $transactionType = 'DIRECT_CAPTURE';
 
     public function __construct($amount, $description)
     {

diff --git a/src/Model/Agreement/RequestInitiateAgreement.php b/src/Model/Agreement/RequestInitiateAgreement.php
@@ -12,29 +12,34 @@
  */
 class RequestInitiateAgreement
 {
-    protected $currency = 'NOK';
-
-    protected $customerPhoneNumber;
+    protected $phoneNumber;
     protected $interval;
-    protected $intervalCount;
     protected $isApp = false;
 
     protected $merchantRedirectUrl;
     protected $merchantAgreementUrl;
-    protected $price;
     protected $productDescription;
     protected $productName;
+    protected $pricing;
     //protected $scope = "address birthDate email name phoneNumber";
 
     public function __construct($phoneNumber, $price, $productName, $productDescription, $interval, $intervalCount, $redirectUrl, $agreementUrl)
     {
-        $this->customerPhoneNumber = $phoneNumber;
-        $this->price = $price;
+        $this->phoneNumber = $phoneNumber;
         $this->productName = $productName;
         $this->productDescription = $productDescription;
-        $this->interval = $interval;
-        $this->intervalCount = $intervalCount;
         $this->merchantRedirectUrl = $redirectUrl;
         $this->merchantAgreementUrl = $agreementUrl;
+
+        $this->pricing = [
+            'type' => 'LEGACY',
+            'amount' => $price,
+            'currency' => 'NOK'
+        ];
+
+        $this->interval = [
+            'unit' => $interval,
+            'count' => $intervalCount
+        ];
     }
 }
diff --git a/src/Model/Agreement/ResponseGetAgreement.php b/src/Model/Agreement/ResponseGetAgreement.php
@@ -43,10 +43,10 @@ class ResponseGetAgreement
     protected $productName;
 
     /**
-     * @var string
-     * @Serializer\Type("string")
+     * @var array
+     * @Serializer\Type("array")
      */
-    protected $price;
+    protected $pricing;
 
     /**
      * @var string
@@ -55,8 +55,8 @@ class ResponseGetAgreement
     protected $productDescription;
 
     /**
-     * @var string
-     * @Serializer\Type("string")
+     * @var array
+     * @Serializer\Type("array")
      */
     protected $interval;
 

diff --git a/src/Resource/Agreement/ChargeAgreement.php b/src/Resource/Agreement/ChargeAgreement.php
@@ -18,7 +18,7 @@ class ChargeAgreement extends AgreementResourceBase
     /**
      * @var string
      */
-    protected $path = '/recurring/v2/agreements/{id}/charges';
+    protected $path = '/recurring/v3/agreements/{id}/charges';
 
     /**
      * InitiatePayment constructor.

diff --git a/src/Resource/Agreement/ContinueAgreement.php b/src/Resource/Agreement/ContinueAgreement.php
@@ -14,12 +14,12 @@ class ContinueAgreement extends PaymentResourceBase
     /**
      * @var \SincosSoftware\Vipps\Resource\HttpMethod
      */
-    protected $method = HttpMethod::PUT;
+    protected $method = HttpMethod::PATCH;
 
     /**
      * @var string
      */
-    protected $path = '/recurring/v2/agreements/{id}';
+    protected $path = '/recurring/v3/agreements/{id}';
 
 
     /**

diff --git a/src/Resource/Agreement/GetAgreement.php b/src/Resource/Agreement/GetAgreement.php
@@ -18,7 +18,7 @@ class GetAgreement extends PaymentResourceBase
     /**
      * @var string
      */
-    protected $path = '/recurring/v2/agreements/{id}';
+    protected $path = '/recurring/v3/agreements/{id}';
 
 
     /**

diff --git a/src/Resource/Agreement/GetAllAgreements.php b/src/Resource/Agreement/GetAllAgreements.php
@@ -17,7 +17,7 @@ class GetAllAgreements extends PaymentResourceBase
     /**
      * @var string
      */
-    protected $path = '/recurring/v2/agreements';
+    protected $path = '/recurring/v3/agreements';
 
     /**
      * InitiatePayment constructor.

diff --git a/src/Resource/Agreement/GetChargeStatus.php b/src/Resource/Agreement/GetChargeStatus.php
@@ -16,7 +16,7 @@ class GetChargeStatus extends AgreementResourceBase
     /**
      * @var string
      */
-    protected $path = '/recurring/v2/agreements/{id}/charges/{id2}';
+    protected $path = '/recurring/v3/agreements/{id}/charges/{id2}';
 
     public function __construct(VippsInterface $vipps, $subscription_key, $agreement_id, $charge_id)
     {

diff --git a/src/Resource/Agreement/InitiateAgreement.php b/src/Resource/Agreement/InitiateAgreement.php
@@ -24,7 +24,7 @@ class InitiateAgreement extends AgreementResourceBase
     /**
      * @var string
      */
-    protected $path = '/recurring/v2/agreements';
+    protected $path = '/recurring/v3/agreements';
 
     /**
      * InitiatePayment constructor.

diff --git a/src/Resource/Agreement/PauseAgreement.php b/src/Resource/Agreement/PauseAgreement.php
@@ -14,12 +14,12 @@ class PauseAgreement extends PaymentResourceBase
     /**
      * @var \SincosSoftware\Vipps\Resource\HttpMethod
      */
-    protected $method = HttpMethod::PUT;
+    protected $method = HttpMethod::PATCH;
 
     /**
      * @var string
      */
-    protected $path = '/recurring/v2/agreements/{id}';
+    protected $path = '/recurring/v3/agreements/{id}';
 
 
     /**

diff --git a/src/Resource/Agreement/RefundCharge.php b/src/Resource/Agreement/RefundCharge.php
@@ -17,7 +17,7 @@ class RefundCharge extends AgreementResourceBase
     /**
      * @var string
      */
-    protected $path = '/recurring/v2/agreements/{id}/charges/{id2}/refund';
+    protected $path = '/recurring/v3/agreements/{id}/charges/{id2}/refund';
 
     /**
      * InitiatePayment constructor.
@@ -50,7 +50,11 @@ public function call()
     {
         $response = $this->makeCall();
 
-        if ($response->getStatusCode() == 200) {
+        /*
+         * 204 No Content indicates that the request was successfully processed.
+         * 202 Accepted indicates that the request was accepted for processing, but the processing has not been completed.
+         * */
+        if ($response->getStatusCode() == 204 || $response->getStatusCode() == 202) {
             return true;
         }
 

diff --git a/src/Resource/Agreement/StopAgreement.php b/src/Resource/Agreement/StopAgreement.php
@@ -14,12 +14,12 @@ class StopAgreement extends PaymentResourceBase
     /**
      * @var \SincosSoftware\Vipps\Resource\HttpMethod
      */
-    protected $method = HttpMethod::PUT;
+    protected $method = HttpMethod::PATCH;
 
     /**
      * @var string
      */
-    protected $path = '/recurring/v2/agreements/{id}';
+    protected $path = '/recurring/v3/agreements/{id}';
 
 
     /**

diff --git a/src/Resource/HttpMethod.php b/src/Resource/HttpMethod.php
@@ -17,4 +17,5 @@ class HttpMethod extends AbstractEnumeration
     const POST = 'POST';
     const PUT = 'PUT';
     const DELETE = 'DELETE';
+    const PATCH = 'PATCH';
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ class GetAgreement extends PaymentResourceBase @@
         /**
          * @var string
          */
-        protected $path = '/recurring/v2/agreements/{id}';
+        protected $path = '/recurring/v3/agreements/{id}';
         /**
@@ Expand Down @@