Merge branch 'v1.20.1' of https://github.com/GiritInteractive/magento2-module-cloudinary

Author: Ronen-Michaeli-22

Helper/ProductGalleryHelper.php

@@ -73,6 +73,7 @@ public function getCloudinaryPGOptions($refresh = false, $ignoreDisabled = false
                 $transformation = [];
                 $videoSettings = $this->configuration->getAllVideoSettings();
                 $videoFreeParams = $videoSettings['video_free_params'] ?? null;
+                $videoControls = $videoSettings['controls'] ?? null;
                 if ($videoFreeParams) {
                     $config = json_decode($videoFreeParams, true);
                     $config = array_shift($config);
@@ -86,13 +87,13 @@ public function getCloudinaryPGOptions($refresh = false, $ignoreDisabled = false
                 if (!$videoFreeParams || $videoFreeParams == "{}") {
                     $config = [
                         'playerType' => 'cloudinary',
-                        'controls' => $videoSettings['controls'],
+                        'controls' => $videoControls,
                         'chapters' => false,
                         'muted' => false
 
                     ];
                     $autoplayMode = $videoSettings['autoplay'] ?? null;
-                    $config['autoplayMode'] = $videoSettings['autoplay'];
+                    $config['autoplayMode'] = $autoplayMode;
                     if ($autoplayMode && $autoplayMode != 'never') {
                         $config['autoplay'] = true;
 

Plugin/Catalog/Block/Product/View/Gallery.php

@@ -78,7 +78,11 @@ public function beforeToHtml(\Magento\Catalog\Block\Product\View\Gallery $produc
             $productGalleryBlock->setCldPGid($this->getCldPGid());
         }
     }
-
+    public function getCname()
+    {
+        $config = $this->configuration->getCredentials();
+        return ($config['cname']) ?? '';
+    }
     public function getHtmlId()
     {
         if (!$this->htmlId) {
@@ -167,7 +171,7 @@ protected function getCloudinaryPGOptions($refresh = false, $ignoreDisabled = fa
                 } elseif ($value['type'] === 'video') {
                     $url = $value['videoUrl'];
                 }
-                if (\strpos($url, '.cloudinary.com/') !== false && (strpos($url, '/' . $this->productGalleryHelper->getCloudName() . '/') !== false || strpos($url, '://' . $this->productGalleryHelper->getCloudName()) !== false)) {
+                if ((strpos($url, '.cloudinary.com/') !== false)  && (strpos($url, '/' . $this->productGalleryHelper->getCloudName() . '/') !== false || strpos($url, '://' . $this->productGalleryHelper->getCloudName()) !== false) ||  strpos($url, $this->getCname()) !== false) {
                     $parsed = $this->configuration->parseCloudinaryUrl($url);
                     $publicId = ($value['type'] === 'image') ? $parsed['publicId'] . '.' . $parsed['extension'] : $parsed['publicId'];
                     $transformation = \str_replace('/', ',', $parsed['transformations_string']);

composer.json

@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.20.0",
+    "version": "1.20.1",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": ">=2.7 <=2.11.0"

etc/adminhtml/system.xml

@@ -27,7 +27,7 @@
                 <field id="cloudinary_environment_variable" translate="label comment" type="obscure" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Cloudinary Account Credentials</label>
                     <comment>
-                        <![CDATA[Set your Cloudinary account credentials. Copy the "Environment variable" string from the dashboard of <a href="https://cloudinary.com/console" target="_blank" title="Cloudinary's Management Console">Cloudinary's Management Console</a>.<br>Format should be: cloudinary://API_Key:API_Secret@Cloud_Name]]>
+                        <![CDATA[Copy the <b>API environment variable</b> format from the <a href="https://console.cloudinary.com/settings/api-keys" target="_blank">API Keys</a> page. Replace [your_api_key] and [your_api_secret] with your actual values, while your cloud name is already correctly included in the format.]]>
                     </comment>
                     <backend_model>Cloudinary\Cloudinary\Model\Config\Backend\Credentials</backend_model>
                 </field>

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Cloudinary_Cloudinary" setup_version="1.20.0">
+  <module name="Cloudinary_Cloudinary" setup_version="1.20.1">
       <sequence>
           <module name="Magento_ProductVideo"/>
           <module name="Magento_PageBuilder"/>