Merge pull request #178 from sendsmaily/release/3.0.x-1.5.1

Release 1.5.1 for 3.0.x

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 1.5.1
+
+- Fix RSS feed not displaying product title and description correctly - [[#167](https://github.com/sendsmaily/smaily-opencart-module/issues/167)]
+- Fix RSS feed not displaying product pictures - [[#168](https://github.com/sendsmaily/smaily-opencart-module/issues/168)]
+- Fix stylesheet directory layout, which caused error when installing module using extension uploader - [[#169](https://github.com/sendsmaily/smaily-opencart-module/issues/169)]
+
 ### 1.5.0
 
 - Add admin page for managing abandoned carts - [[#65](https://github.com/sendsmaily/smaily-opencart-module/issues/65)]

install.xml

@@ -2,7 +2,7 @@
 <modification>
     <code>smaily_for_opencart_extension</code>
     <name>Smaily for OpenCart</name>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <author>Smaily</author>
     <link>https://github.com/sendsmaily/smaily-opencart-module</link>
 </modification>

upload/admin/controller/extension/module/smaily_for_opencart.php

@@ -11,7 +11,7 @@
  *
  * Plugin Name: Smaily for OpenCart
  * Description: Smaily email marketing and automation extension plugin for OpenCart.
- * Version: 1.5.0
+ * Version: 1.5.1
  * License: GPL3
  * Author: Smaily
  * Author URI: https://smaily.com/
@@ -32,7 +32,7 @@
 require_once(DIR_SYSTEM . 'library/smailyforopencart/request.php');
 class ControllerExtensionModuleSmailyForOpencart extends Controller {
     private $error = array();
-    private $version = '1.5.0';
+    private $version = '1.5.1';
 
     public function index() {
         // Add language file.

upload/admin/view/template/extension/module/smaily_for_opencart.twig

@@ -463,6 +463,6 @@
   <script type="text/javascript">
     var smaily_rss_url_base = '{{ smaily_rss_url_base }}';
   </script>
-  <link rel="stylesheet" type="text/css" href="view/theme/default/stylesheet/smaily_oc.css" />
+  <link rel="stylesheet" type="text/css" href="view/stylesheet/smailyforopencart/abandoned_carts_table.css" />
 {{ footer }}
 </div>

upload/catalog/controller/extension/smailyforopencart/rss.php

@@ -62,13 +62,13 @@ public function index() {
         foreach ($products as $product) {
             $item = [];
             // Title.
-            $item['title'] = $product['name'];
+            $item['title'] = html_entity_decode($product['name']);
             // Link, guid
             $item['link'] = $this->url->link('product/product', 'product_id=' . $product['product_id']);
             // Created date.
             $item['pubDate'] = $product['date_available'];
             // Description.
-            $item['description'] = $product['description'];
+            $item['description'] = html_entity_decode($product['description']);
             // Enclosure.
             $item['enclosure'] = $this->model_tool_image->resize($product['image'], 300, 300);
             // Price.

upload/catalog/view/theme/default/template/extension/smailyforopencart/rss.twig

@@ -10,8 +10,8 @@
     <link>{{ item.link }}</link>
     <guid isPermalink="True">{{ item.link }}</guid>
     <pubDate>{{ item.pubDate }}</pubDate>
-    <description><![CDATA[ {{ item.description }} ]]></description>
-    <enclosure>{{ item.enclosure }}</enclosure>
+    <description><![CDATA[ {{ item.description|raw }} ]]></description>
+    <enclosure url="{{ item.enclosure }}"/>
     <smly:price>{{ item.price }}{{ currency }}</smly:price>
     {% if item.discount %}
         <smly:old_price>{{ item.old_price }}{{ currency }}</smly:old_price>
@@ -20,4 +20,4 @@
     </item>
 {% endfor %}
 </channel>
-</rss>
+</rss>

upload/modman

@@ -4,7 +4,7 @@ admin/language/en-gb/extension/module/smaily_for_opencart.php                 ad
 admin/model/extension/smailyforopencart/admin.php                             admin/model/extension/smailyforopencart/admin.php
 admin/view/javascript/smailyforopencart/smaily_admin.js                       admin/view/javascript/smailyforopencart/smaily_admin.js
 admin/view/template/extension/module/smaily_for_opencart.twig                 admin/view/template/extension/module/smaily_for_opencart.twig
-admin/view/theme/default/stylesheet/smaily_oc.css                             admin/view/theme/default/stylesheet/smaily_oc.css
+admin/view/stylesheet/smailyforopencart/abandoned_carts_table.css             admin/view/stylesheet/smailyforopencart/abandoned_carts_table.css
 catalog/controller/extension/module/smaily_for_opencart.php                   catalog/controller/extension/module/smaily_for_opencart.php
 catalog/controller/extension/smailyforopencart/cron_cart.php                  catalog/controller/extension/smailyforopencart/cron_cart.php
 catalog/controller/extension/smailyforopencart/cron_customers.php             catalog/controller/extension/smailyforopencart/cron_customers.php