Merge pull request #35 from styladev/release

Release

Author: ssachtleben

CHANGELOG.md

@@ -1,3 +1,8 @@
+* 0.2.1.1 (2019-03-12)
+  * moved seo content in div container
+  * improved error message on connect failure
+  * updated cdn.styla.com to client-scripts.styla.com
+
 * 0.2.1.0 (2018-12-18)
   * added support for multiple paths
   * added support for bundle and grouped products

README.md

@@ -1,4 +1,4 @@
-# Styla Connect (v 0.2.1.0)
+# Styla Connect (v 0.2.1.1)
 ---
 
 Requires:

app/code/community/Styla/Connect/Helper/Data.php

@@ -19,7 +19,7 @@ class Styla_Connect_Helper_Data extends Mage_Core_Helper_Abstract
     protected $_apiVersion;
 
     const URL_SEO_PROD    = 'http://seo.styla.com/';
-    const URL_ASSETS_PROD = '//cdn.styla.com/';
+    const URL_ASSETS_PROD = '//client-scripts.styla.com/';
 
     const URL_PART_JS  = 'scripts/clients/%s.js?v=%s';
     const URL_PART_CSS = 'styles/clients/%s.css?v=%s';

app/code/community/Styla/Connect/Model/Styla/Api/Oauth/Connector.php

@@ -153,7 +153,8 @@ public function sendRegistrationRequest($loginData, $consumer, $token)
         if (!$apiResponse->isOk()) {
             throw new Exception(
                 "Couldn't connect to Styla API. Error result: " . $apiResponse->getHttpStatus()
-                . ($apiResponse->getError() ? ' - ' . $apiResponse->getError() : '')
+                . ($apiResponse->getError() ? ' - ' . $apiResponse->getError() : '') .
+                ". Please check the Email and password used and try connecting one more time. In case still no success, contact Styla."
             );
         }
 

app/code/community/Styla/Connect/Model/Styla/Api/Request/Type/Seo.php

@@ -23,7 +23,7 @@ public function getApiUrl()
         $apiBaseUrl  = $this->getHelper()->getApiSeoUrl();
         $clientName  = $this->getHelper()->getClientName();
 
-        $requestPath = $this->getRequestPath();
+        $requestPath = $this->getPath();
 
         if (strlen($requestPath) > 1) {
             $requestPath = rtrim($requestPath, '/');
@@ -33,4 +33,14 @@ public function getApiUrl()
 
         return $apiUrl;
     }
+
+    public function getPath()
+    {
+        $helper   = Mage::helper('styla_connect');
+        $magazine = $helper->getCurrentMagazine();
+        $requestPath = $this->getRequestPath();
+        $fullPath = '/' . $magazine->getFrontName() . '/' . $requestPath;
+        $cleanedPath = preg_replace('#/+#','/', $fullPath);
+        return $cleanedPath;
+    }
 }

app/code/community/Styla/Connect/etc/config.xml

@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Styla_Connect>
-            <version>0.2.1.0</version>
+            <version>0.2.1.1</version>
         </Styla_Connect>
     </modules>
 
@@ -110,7 +110,7 @@
             </frontend>
             <developer>
                 <override_seo_url>http://seo.styla.com/</override_seo_url>
-                <override_cdn_url>//cdn.styla.com/</override_cdn_url>
+                <override_cdn_url>//client-scripts.styla.com/</override_cdn_url>
                 <override_api_url>http://live.styla.com/</override_api_url>
             </developer>
 

app/code/community/Styla/Connect/etc/system.xml

@@ -115,7 +115,7 @@
 
                         <override_cdn_url translate="label">
                             <label>Override Url for CDN/Assets</label>
-                            <comment>If filled, use this url instead of the automatically-acquired one. Eg. //cdn.styla.com/</comment>
+                            <comment>If filled, use this url instead of the automatically-acquired one. Eg. //client-scripts.styla.com/</comment>
                             <frontend_type>text</frontend_type>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>

app/design/frontend/base/default/template/styla/connect/content.phtml

@@ -1,10 +1,11 @@
 <?php /** @var $this Styla_Connect_Block_Magazine_Content */ ?>
 
 <?php $page = $this->getPage(); ?>
-<?php echo $this->getNoscript() ?>
 
 <div id="stylaMagazine"
     data-language="<?php echo $page->getLanguageCode() ?>"
-    data-pluginversion="<?php echo $this->getPluginVersion()?>"></div>
+    data-pluginversion="<?php echo $this->getPluginVersion()?>">
+    <?php echo $this->getNoscript() ?>
+</div>
 <script src="<?php echo $page->getScriptUrl()?>" async></script>
 <link rel="stylesheet" type="text/css" href="<?php echo $page->getCssUrl() ?>">