Merge pull request #23 from Plasma-Platform/feature/TMONE-894/checkout1

TMONE-894 - return invoice url for order

Author: dimanovoseltsev

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.1] - 2025-02-11
+### Added
+- return invoice url for order
+- add customer_id for subscription
+
 ## [1.1.0] - 2025-02-07
 ### Added
 - Add parameters discounts, products and cartId list in subscriptions

README.md

@@ -272,5 +272,5 @@ catch (\API2Client\Client\APIException $e)
 
 [CHANGELOG]: ./CHANGELOG.md
 
-[version-badge]: https://img.shields.io/badge/version-1.1.0-green.svg
+[version-badge]: https://img.shields.io/badge/version-1.1.1-green.svg
 [php-version]:https://img.shields.io/static/v1?label=php&message=>=5.3&color=green

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "templatemonster/api2-client",
   "description": "TemplateMonster API client",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "license": "Apache License, Version 2.0",
   "authors": [
     {

src/API2Client/Api.php

@@ -14,6 +14,7 @@
 use API2Client\Entities\Order\Links;
 use API2Client\Entities\Order\Status;
 use API2Client\Entities\OrderCreated;
+use API2Client\Entities\OrderItem;
 use API2Client\Entities\Subscription;
 use API2Client\Setters\BillingPortalFactory;
 use API2Client\Setters\CustomerPortalFactory;
@@ -226,7 +227,7 @@ public function getOrderLinks($order_id, $template_id)
     /**
      * Get all Statuses
      *
-     * @return array [\API2Client\Entities\Order\Status]
+     * @return OrderItem
      * @throws ApiException
      */
     public function getOrder($order_id)
@@ -240,8 +241,7 @@ public function getOrder($order_id)
         }
         $factory = new OrderItemFactory ();
 
-        return $factory
-            ->create($response->getResult());
+        return $factory->create($response->getResult());
     }
 
     /**

src/API2Client/Entities/OrderItem.php

@@ -1,6 +1,6 @@
 <?php
 /***********************************************************************************************************************
- * @author: <[email protected]> 
+ * @author: <[email protected]>
  **********************************************************************************************************************/
 
 namespace API2Client\Entities;
@@ -38,7 +38,10 @@ class OrderItem
     /**
      * @var array
      */
-    protected $productInfoList = array ();
+    protected $productInfoList = array();
+
+    /** @var string */
+    protected $invoiceUrl;
 
     /**
      * @var string
@@ -181,8 +184,24 @@ public function setProductInfoList($productInfoList)
     /**
      * @param ProductInfo $productInfoList
      */
-    public function addProductInfo (ProductInfo $productInfoList)
+    public function addProductInfo(ProductInfo $productInfoList)
     {
         $this->productInfoList [] = $productInfoList;
     }
-}
+
+    /**
+     * @param string $invoiceUrl
+     */
+    public function setInvoiceUrl($invoiceUrl)
+    {
+        $this->invoiceUrl = $invoiceUrl;
+    }
+
+    /**
+     * @return string
+     */
+    public function getInvoiceUrl()
+    {
+        return $this->invoiceUrl;
+    }
+}

src/API2Client/Entities/Subscription.php

@@ -155,6 +155,9 @@ class Subscription
      */
     protected $cartId;
 
+    /** @var string */
+    protected $customerId;
+
     /**
      * @return string
      */
@@ -664,6 +667,25 @@ public function getCartId()
         return $this->cartId;
     }
 
+    /**
+     * @return string
+     */
+    public function getCustomerId()
+    {
+        return $this->customerId;
+    }
+
+    /**
+     * @param $customerId
+     * @return $this
+     */
+    public function setCustomerId($customerId)
+    {
+        $this->customerId = $customerId;
+        return $this;
+    }
+
+
     /**
      * @return array
      */
@@ -694,6 +716,7 @@ public function toArray()
             'affiliate_name' => $this->getAffiliateName(),
             'payment_options' => $this->getPaymentOptions(),
             'cartId' => $this->getCartId(),
+            'customer_id' => $this->getCustomerId(),
             'discountInfoList' => array(),
             'productInfoList' => array(),
         );

src/API2Client/Setters/OrderItemFactory.php

@@ -31,7 +31,7 @@ public function create ($data)
         $order->setEmail($this->getValue ('email', $data, 0));
         $order->setMerchantMethodId($this->getValue ('merchant_method_id', $data, 0));
         $order->setMerchantTransactionId($this->getValue ('merchant_transaction_id', $data, ''));
-
+        $order->setInvoiceUrl($this->getValue ('invoiceUrl', $data, ''));
 
         foreach ($this->getValue ('productInfoList', $data, array ()) as $product)
         {
@@ -47,4 +47,4 @@ public function create ($data)
 
         return $order;
     }
-}
+}