V1.13.0

Api/ProductGalleryManagementInterface.php

@@ -15,9 +15,10 @@ interface ProductGalleryManagementInterface
      * @param  string|null   $roles
      * @param  string|null   $label
      * @param  bool|int|null $disabled
+     * @param  string        $cldspinset
      * @return string
      */
-    public function addItem($url, $sku, $publicId = null, $roles = null, $label = null, $disabled = 0);
+    public function addItem($url = null, $sku = null, $publicId = null, $roles = null, $label = null, $disabled = 0, $cldspinset = null);
 
     /**
      * Add multiple gallery items to one or more products from Cloudinary URLs.

Api/ResourcesManagementInterface.php

@@ -18,4 +18,11 @@ public function getImage();
      * @return string
      */
     public function getVideo();
+
+    /**
+     * GET for getSpinestFirstImage api
+     *
+     * @return string
+     */
+    public function getResourcesByTag();
 }

Block/Adminhtml/Product/Helper/Form/Gallery/Content.php

@@ -14,8 +14,10 @@
 namespace Cloudinary\Cloudinary\Block\Adminhtml\Product\Helper\Form\Gallery;
 
 use Cloudinary\Cloudinary\Helper\MediaLibraryHelper;
+use Cloudinary\Cloudinary\Model\ProductSpinsetMapFactory;
 use Magento\Backend\Block\Template\Context;
 use Magento\Catalog\Model\Product\Media\Config;
+use Magento\Framework\Json\DecoderInterface;
 use Magento\Framework\Json\EncoderInterface;
 
 /**
@@ -29,27 +31,43 @@ class Content extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Galle
     protected $_template = 'Cloudinary_Cloudinary::catalog/product/helper/gallery.phtml';
 
     /**
-     * MediaLibraryHelper
-     * @var array|null
+     * @var DecoderInterface
      */
-    protected $mediaLibraryHelper;
+    protected $_jsonDecoder;
 
     /**
-     * @param Context $context
-     * @param EncoderInterface $jsonEncoder
-     * @param Config $mediaConfig
-     * @param MediaLibraryHelper $mediaLibraryHelper
-     * @param array $data
+     * @var MediaLibraryHelper
+     */
+    protected $_mediaLibraryHelper;
+
+    /**
+     * @var ProductSpinsetMapFactory
+     */
+    protected $_productSpinsetMapFactory;
+
+    /**
+     * @method __construct
+     * @param  Context                  $context
+     * @param  EncoderInterface         $jsonEncoder
+     * @param  DecoderInterface         $jsonDecoder
+     * @param  Config                   $mediaConfig
+     * @param  MediaLibraryHelper       $mediaLibraryHelper
+     * @param  ProductSpinsetMapFactory $productSpinsetMapFactory
+     * @param  array                    $data
      */
     public function __construct(
         Context $context,
         EncoderInterface $jsonEncoder,
+        DecoderInterface $jsonDecoder,
         Config $mediaConfig,
         MediaLibraryHelper $mediaLibraryHelper,
+        ProductSpinsetMapFactory $productSpinsetMapFactory,
         array $data = []
     ) {
         parent::__construct($context, $jsonEncoder, $mediaConfig, $data);
-        $this->mediaLibraryHelper = $mediaLibraryHelper;
+        $this->_jsonDecoder = $jsonDecoder;
+        $this->_mediaLibraryHelper = $mediaLibraryHelper;
+        $this->_productSpinsetMapFactory = $productSpinsetMapFactory;
     }
 
     /**
@@ -61,7 +79,7 @@ public function __construct(
      */
     public function getCloudinaryMediaLibraryWidgetOptions($multiple = true, $refresh = false)
     {
-        if (!($cloudinaryMLoptions = $this->mediaLibraryHelper->getCloudinaryMLOptions($multiple, $refresh))) {
+        if (!($cloudinaryMLoptions = $this->_mediaLibraryHelper->getCloudinaryMLOptions($multiple, $refresh))) {
             return null;
         }
 
@@ -83,7 +101,7 @@ public function getCloudinaryMediaLibraryWidgetOptions($multiple = true, $refres
             'useDerived' => false,
             'addTmpExtension' => true,
             'cloudinaryMLoptions' => $cloudinaryMLoptions,
-            'cloudinaryMLshowOptions' => $this->mediaLibraryHelper->getCloudinaryMLshowOptions(null),
+            'cloudinaryMLshowOptions' => $this->_mediaLibraryHelper->getCloudinaryMLshowOptions(null),
             ]
         );
     }
@@ -106,4 +124,24 @@ public function escapeHtmlAttr($string, $escapeSingleQuote = true)
         }
         return htmlspecialchars((string)$string, ENT_COMPAT, 'UTF-8', false);
     }
+
+    /**
+     * Returns image json
+     *
+     * @return string
+     */
+    public function getImagesJson()
+    {
+        $images = $this->_jsonDecoder->decode(parent::getImagesJson());
+        if ($images) {
+            foreach ($images as &$image) {
+                if ($image['media_type'] === 'image') {
+                    $cldspinset = $this->_productSpinsetMapFactory->create()->getCollection()->addFieldToFilter("image_name", $image['file'])->setPageSize(1)->getFirstItem();
+                    $image['cldspinset'] = $cldspinset ? $cldspinset->getCldspinset() : "";
+                }
+            }
+            return $this->_jsonEncoder->encode($images);
+        }
+        return '[]';
+    }
 }

Command/ProductGalleryApiQueueProcess.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Cloudinary\Cloudinary\Command;
+
+use Cloudinary\Cloudinary\Cron\ProductGalleryApiQueue;
+use Magento\Framework\App\State as AppState;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ProductGalleryApiQueueProcess extends Command
+{
+    /**
+     * @var AppState
+     */
+    private $appState;
+
+    /**
+     * @var ProductGalleryApiQueue
+     */
+    private $job;
+
+    /**
+     * @method __construct
+     * @param  AppState               $appState
+     * @param  ProductGalleryApiQueue $job
+     */
+    public function __construct(
+        AppState $appState,
+        ProductGalleryApiQueue $job
+    ) {
+        parent::__construct('cloudinary:product-gallery-api-queue:process');
+
+        $this->appState = $appState;
+        $this->job = $job;
+    }
+
+    /**
+     * Configure the command
+     *
+     * @return void
+     */
+    protected function configure()
+    {
+        $this->setName('cloudinary:product-gallery-api-queue:process');
+        $this->setDescription('Process queued items for product gallery API');
+    }
+
+    /**
+     * @param InputInterface  $input
+     * @param OutputInterface $output
+     *
+     * @return void
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->appState->setAreaCode(\Magento\Framework\App\Area::AREA_CRONTAB);
+        return $this->job
+            ->setOutput($output)
+            ->execute();
+    }
+}

Controller/Adminhtml/Ajax/RetrieveImage.php

@@ -3,13 +3,13 @@
 namespace Cloudinary\Cloudinary\Controller\Adminhtml\Ajax;
 
 use Cloudinary\Cloudinary\Core\ConfigurationInterface;
+use Cloudinary\Cloudinary\Model\Framework\File\Uploader;
 use Cloudinary\Cloudinary\Model\MediaLibraryMapFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Catalog\Model\Product\Media\Config as ProductMediaConfig;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Controller\Result\RawFactory as ResultRawFactory;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\File\Uploader;
 use Magento\Framework\Filesystem;
 use Magento\Framework\HTTP\Adapter\Curl;
 use Magento\Framework\Image\AdapterFactory as ImageAdapterFactory;

Controller/Adminhtml/Cms/Wysiwyg/Images/Upload.php

@@ -9,7 +9,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\File\Uploader;
+use Cloudinary\Cloudinary\Model\Framework\File\Uploader;
 use Magento\Framework\Filesystem;
 use Magento\Framework\HTTP\Adapter\Curl;
 use Magento\Framework\Image\AdapterFactory;