[FEATURE] Added addon prices to products api

Api/AddonPrice.php

@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\ProductBundle\Api;
+
+use JMS\Serializer\Annotation\ExclusionPolicy;
+use JMS\Serializer\Annotation\SerializedName;
+use JMS\Serializer\Annotation\VirtualProperty;
+use Sulu\Bundle\ProductBundle\Entity\AddonPrice as AddonPriceEntity;
+use Sulu\Bundle\ProductBundle\Util\PriceFormatter;
+use Sulu\Component\Rest\ApiWrapper;
+
+/**
+ * @ExclusionPolicy("all")
+ */
+class AddonPrice extends ApiWrapper
+{
+    /**
+     * @var PriceFormatter
+     */
+    private $priceFormatter;
+
+    /**
+     * @param AddonPriceEntity $entity
+     * @param string $locale
+     * @param PriceFormatter $priceFormatter
+     */
+    public function __construct(AddonPriceEntity $entity, $locale, PriceFormatter $priceFormatter)
+    {
+        $this->entity = $entity;
+        $this->locale = $locale;
+        $this->priceFormatter = $priceFormatter;
+    }
+
+    /**
+     * @VirtualProperty
+     * @SerializedName("id")
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->entity->getId();
+    }
+
+    /**
+     * @VirtualProperty
+     * @SerializedName("currency")
+     *
+     * @return string
+     */
+    public function getCurrency()
+    {
+        return new Currency($this->entity->getCurrency(), $this->locale);
+    }
+
+    /**
+     * @VirtualProperty
+     * @SerializedName("price")
+     *
+     * @return float
+     */
+    public function getPrice()
+    {
+        return $this->entity->getPrice();
+    }
+
+    /**
+     * @VirtualProperty
+     * @SerializedName("priceFormatted")
+     *
+     * @return string
+     */
+    public function getPriceFormatted()
+    {
+        return $this->priceFormatter->format($this->entity->getPrice(), null, $this->locale);
+    }
+}

Api/AddonProduct.php

@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\ProductBundle\Api;
+
+use JMS\Serializer\Annotation\ExclusionPolicy;
+use JMS\Serializer\Annotation\SerializedName;
+use JMS\Serializer\Annotation\VirtualProperty;
+use Sulu\Bundle\ContactBundle\Contact\AccountManager;
+use Sulu\Bundle\ProductBundle\Entity\AddonPrice as AddonPriceEntity;
+use Sulu\Bundle\ProductBundle\Entity\ProductInterface;
+use Sulu\Bundle\ProductBundle\Product\ProductFactory;
+use Sulu\Bundle\ProductBundle\Product\ProductLocaleManager;
+use Sulu\Bundle\ProductBundle\Util\PriceFormatter;
+
+/**
+ * @ExclusionPolicy("all")
+ */
+class AddonProduct extends Product implements ApiAddonProductInterface
+{
+    /**
+     * @var AddonPriceEntity[]
+     */
+    private $addonPrices;
+
+    /**
+     * @param ProductInterface $product The product to wrap
+     * @param string $locale The locale of this product
+     * @param PriceFormatter $priceFormatter
+     * @param ProductLocaleManager $productLocaleManager
+     * @param ProductFactory $productFactory
+     * @param AccountManager|null $accountManager
+     * @param array $addonPrices
+     */
+    public function __construct(
+        ProductInterface $product,
+        $locale,
+        PriceFormatter $priceFormatter,
+        ProductLocaleManager $productLocaleManager,
+        ProductFactory $productFactory,
+        AccountManager $accountManager = null,
+        array $addonPrices = []
+    ) {
+        parent::__construct(
+            $product,
+            $locale,
+            $priceFormatter,
+            $productLocaleManager,
+            $productFactory,
+            $accountManager
+        );
+
+        $this->setAddonPrices($addonPrices);
+    }
+
+    /**
+     * @param array $addonPrices
+     *
+     * @return $this
+     */
+    public function setAddonPrices(array $addonPrices)
+    {
+        $this->addonPrices = $addonPrices;
+
+        return $this;
+    }
+
+    /**
+     * @VirtualProperty
+     * @SerializedName("addonPrices")
+     *
+     * {@inheritdoc}
+     */
+    public function getAddonPrices()
+    {
+        $addonPrices = [];
+        if ($this->addonPrices) {
+            foreach ($this->addonPrices as $addonPrice) {
+                $addonPrices[] = new AddonPrice($addonPrice, $this->locale, $this->priceFormatter);
+            }
+        }
+
+        return $addonPrices;
+    }
+}

Api/ApiAddonProductInterface.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\ProductBundle\Api;
+
+/**
+ * Interface for Addon-Product Api Objects.
+ */
+interface ApiAddonProductInterface
+{
+    /**
+     * @return AddonPrice[]
+     */
+    public function getAddonPrices();
+}

Api/Product.php

@@ -34,6 +34,7 @@
 use Sulu\Bundle\ProductBundle\Entity\TaxClass as TaxClassEntity;
 use Sulu\Bundle\ProductBundle\Entity\Type as TypeEntity;
 use Sulu\Bundle\ProductBundle\Entity\Unit as UnitEntity;
+use Sulu\Bundle\ProductBundle\Product\ProductFactory;
 use Sulu\Bundle\ProductBundle\Product\ProductLocaleManager;
 use Sulu\Bundle\ProductBundle\Util\PriceFormatter;
 use Sulu\Component\Rest\ApiWrapper;
@@ -67,23 +68,31 @@ class Product extends ApiWrapper implements ApiProductInterface
      */
     protected $productLocaleManager;
 
+    /**
+     * @var ProductFactory
+     */
+    protected $productFactory;
+
     /**
      * @param Entity $product The product to wrap
      * @param string $locale The locale of this product
      * @param PriceFormatter $priceFormatter
      * @param ProductLocaleManager $productLocaleManager
+     * @param ProductFactory $productFactory
      * @param AccountManager|null $accountManager
      */
     public function __construct(
         Entity $product,
         $locale,
         PriceFormatter $priceFormatter,
         ProductLocaleManager $productLocaleManager,
+        ProductFactory $productFactory,
         AccountManager $accountManager = null
     ) {
         $this->entity = $product;
         $this->priceFormatter = $priceFormatter;
         $this->productLocaleManager = $productLocaleManager;
+        $this->productFactory = $productFactory;
         $this->accountManager = $accountManager;
 
         $this->locale = $locale;
@@ -487,17 +496,11 @@ public function getParent()
     {
         $parent = $this->entity->getParent();
 
-        if ($parent) {
-            return new static(
-                $parent,
-                $this->locale,
-                $this->priceFormatter,
-                $this->productLocaleManager,
-                $this->accountManager
-            );
+        if (!$parent) {
+            return null;
         }
 
-        return null;
+        return $this->productFactory->createApiEntity($parent, $this->locale);
     }
 
     /**
@@ -1329,12 +1332,13 @@ public function getAddons()
         $addons = $this->entity->getAddons();
         /** @var AddonEntity $addon */
         foreach ($addons as $addon) {
-            $apiAddons[] = new static(
+            $apiAddon = $this->productFactory->createAddonProductApiEntity(
                 $addon->getAddon(),
                 $this->locale,
-                $this->priceFormatter,
-                $this->productLocaleManager
+                iterator_to_array($addon->getAddonPrices())
             );
+
+            $apiAddons[] = $apiAddon;
         }
 
         return $apiAddons;

CHANGELOG.md

@@ -1,6 +1,10 @@
 CHANGELOG for Sulu Product Bundle
 =================================
 
+* dev-develop
+    * BUGFIX      Resolved wrong locale in xliff file.
+    * FEATURE     Added property `addonPrices` to addons in products api.
+
 * 0.16.1 (2016-10-27)
 
     * BUGFIX      Fixed deleting of variant attributes.

Entity/AddonPrice.php

@@ -48,7 +48,7 @@ public function getId()
     /**
      * @param int $id
      *
-     * @return self
+     * @return $this
      */
     public function setId($id)
     {
@@ -68,7 +68,7 @@ public function getCurrency()
     /**
      * @param Currency $currency
      *
-     * @return self
+     * @return $this
      */
     public function setCurrency(Currency $currency)
     {
@@ -88,7 +88,7 @@ public function getPrice()
     /**
      * @param float $price
      *
-     * @return self
+     * @return $this
      */
     public function setPrice($price)
     {
@@ -108,7 +108,7 @@ public function getAddon()
     /**
      * @param Addon $addon
      *
-     * @return self
+     * @return $this
      */
     public function setAddon(Addon $addon)
     {

Product/ProductFactory.php

@@ -12,6 +12,7 @@
 namespace Sulu\Bundle\ProductBundle\Product;
 
 use Sulu\Bundle\ContactBundle\Contact\AccountManager;
+use Sulu\Bundle\ProductBundle\Api\AddonProduct as ApiAddonProduct;
 use Sulu\Bundle\ProductBundle\Api\Product as ApiProduct;
 use Sulu\Bundle\ProductBundle\Entity\Product;
 use Sulu\Bundle\ProductBundle\Entity\ProductInterface;
@@ -67,7 +68,24 @@ public function createApiEntity(ProductInterface $product, $locale)
             $locale,
             $this->priceFormatter,
             $this->productLocaleManager,
+            $this,
             $this->accountManager
         );
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createAddonProductApiEntity(ProductInterface $product, $locale, array $addonPrices = [])
+    {
+        return new ApiAddonProduct(
+            $product,
+            $locale,
+            $this->priceFormatter,
+            $this->productLocaleManager,
+            $this,
+            $this->accountManager,
+            $addonPrices
+        );
+    }
 }

Product/ProductFactoryInterface.php

@@ -11,6 +11,7 @@
 
 namespace Sulu\Bundle\ProductBundle\Product;
 
+use Sulu\Bundle\ProductBundle\Api\ApiAddonProductInterface;
 use Sulu\Bundle\ProductBundle\Api\ApiProductInterface;
 use Sulu\Bundle\ProductBundle\Entity\ProductInterface;
 
@@ -32,4 +33,12 @@ public function createEntity();
      * @return ApiProductInterface
      */
     public function createApiEntity(ProductInterface $product, $locale);
+
+    /**
+     * @param ProductInterface $product
+     * @param string $locale
+     *
+     * @return ApiAddonProductInterface
+     */
+    public function createAddonProductApiEntity(ProductInterface $product, $locale);
 }