Skip to content

Commit

Permalink
Merge pull request #182 from sendsmaily/release/2.2.x-1.5.1
Browse files Browse the repository at this point in the history
Release 1.5.1 for 2.2.x
  • Loading branch information
tomkabel authored Jan 5, 2021
2 parents 648ce61 + 5f9de72 commit 5a45941
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

### 1.5.1

- Fix RSS feed not displaying product pictures - [[#168](https://github.com/sendsmaily/smaily-opencart-module/issues/168)]

### 1.5.0

- Add admin page for managing abandoned carts - [[#65](https://github.com/sendsmaily/smaily-opencart-module/issues/65)]
Expand Down
Binary file modified assets/screenshot-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 2 additions & 2 deletions upload/admin/controller/module/smaily_for_opencart.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -32,7 +32,7 @@
require_once(DIR_SYSTEM . 'library/smailyforopencart/request.php');
class ControllerModuleSmailyForOpencart extends Controller {
private $error = array();
private $version = '1.5.0';
private $version = '1.5.1';

public function index() {
// Add language file.
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions upload/admin/view/template/module/smaily_for_opencart.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@
</div>
<?php echo $footer; ?>
</div>
<link rel="stylesheet" type="text/css" href="view/stylesheet/smailyforopencart/abandoned_carts_table.css " />
<script type="text/javascript">
(function($) {
$(window).on("load", function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<guid isPermalink="True"><?php echo $item['link']; ?></guid>
<pubDate><?php echo $item['pubDate']; ?></pubDate>
<description><![CDATA[ <?php echo html_entity_decode($item['description']); ?> ]]></description>
<enclosure><?php echo $item['enclosure']; ?></enclosure>
<enclosure url="<?php echo $item['enclosure']; ?>"/>
<smly:price><?php echo $item['price']; echo $currency; ?></smly:price>
<?php if (isset($item['discount'])) : ?>
<smly:old_price><?php echo $item['old_price']; echo $currency; ?></smly:old_price>
Expand Down
2 changes: 1 addition & 1 deletion upload/modman
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ admin/controller/smailyforopencart/upgrade.php admin/control
admin/language/en-gb/module/smaily_for_opencart.php admin/language/en-gb/module/smaily_for_opencart.php
admin/model/smailyforopencart/admin.php admin/model/smailyforopencart/admin.php
admin/view/template/module/smaily_for_opencart.tpl admin/view/template/module/smaily_for_opencart.tpl
admin/view/stylesheet/smaily_oc.css admin/view/stylesheet/smaily_oc.css
admin/view/stylesheet/smailyforopencart/abandoned_carts_table.css admin/view/stylesheet/smailyforopencart/abandoned_carts_table.css
catalog/controller/module/smaily_for_opencart.php catalog/controller/module/smaily_for_opencart.php
catalog/controller/smailyforopencart/cron_cart.php catalog/controller/smailyforopencart/cron_cart.php
catalog/controller/smailyforopencart/cron_customers.php catalog/controller/smailyforopencart/cron_customers.php
Expand Down

0 comments on commit 5a45941

Please sign in to comment.