Skip to content

Commit

Permalink
Version 1.0.11
Browse files Browse the repository at this point in the history
- Added option "Use parent image in simple products"
- Added "addStoreFilter()" in product collection
- Code refactoring
- "Checkout success" layout update
  • Loading branch information
mauromm committed Feb 9, 2022
1 parent ad41f4a commit 3312ffb
Show file tree
Hide file tree
Showing 38 changed files with 364 additions and 315 deletions.
12 changes: 6 additions & 6 deletions Block/Adminhtml/Button/Generate.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* Class Generate
*
* @version 1.0.10
* @version 1.0.11
* @author Improntus <http://www.improntus.com> - Ecommerce done right
* @copyright Copyright (c) 2020 Improntus
* @package Improntus\RetailRocket\Block\Adminhtml\Button
Expand All @@ -23,21 +23,21 @@ class Generate extends Field
public function _getElementHtml(AbstractElement $element)
{
$element = null;

/** @var Button $buttonBlock */
$buttonBlock = $this->getForm()->getLayout()
->createBlock('Magento\Backend\Block\Widget\Button');

$url = $this->getUrl("retailrocket/generator/generate");

$data = [
'class' => 'improntus-retailrocket-generate-feed',
'label' => __('Generate Retail Rocket Feed Manually'),
'onclick' => "setLocation('" . $url . "')",
];

$html = $buttonBlock->setData($data)->toHtml();

return $html;
}
}
6 changes: 3 additions & 3 deletions Block/Adminhtml/CronExecution.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* Class Links
*
* @version 1.0.10
* @version 1.0.11
* @author Improntus <http://www.improntus.com> - Ecommerce done right
* @copyright Copyright (c) 2020 Improntus
* @package Improntus\RetailRocket\Block\Adminhtml
Expand Down Expand Up @@ -48,7 +48,7 @@ public function _getElementHtml(AbstractElement $element)
$cronSchedule->getSelect()->limit(10);

$links = [];

$html = '<div>';
$html .= '<table>';

Expand Down Expand Up @@ -97,7 +97,7 @@ public function _getElementHtml(AbstractElement $element)

$html .= '</tbody></table>';
$html .= '</div>';

return $html;
}
}
12 changes: 6 additions & 6 deletions Block/Adminhtml/Links.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* Class Links
*
* @version 1.0.10
* @version 1.0.11
* @author Improntus <http://www.improntus.com> - Ecommerce done right
* @copyright Copyright (c) 2020 Improntus
* @package Improntus\RetailRocket\Block\Adminhtml
Expand Down Expand Up @@ -41,19 +41,19 @@ public function __construct(
public function _getElementHtml(AbstractElement $element)
{
$element = null;

$links = $this->_retailRocketHelper->getRetailRocketFeedLinks();

$html = '<div>';

foreach ($links as $_link)
{
$html .= "<p><span>{$_link['store_name']}:</span><br />";
$html .= "<a href='{$_link['link']}' download='{$_link['file']}' target='_blank'>{$_link['link']}</a></p>";
}

$html .= '</div>';

return $html;
}
}
2 changes: 1 addition & 1 deletion Block/Adminhtml/System/Config/Form/Date.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* Class Date
*
* @version 1.0.10
* @version 1.0.11
* @author Improntus <http://www.improntus.com> - Ecommerce done right
* @copyright Copyright (c) 2020 Improntus
* @package Improntus\RetailRocket\Block\Adminhtml\System\Config\Form
Expand Down
2 changes: 1 addition & 1 deletion Block/Adminhtml/System/Config/Form/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/**
* Class Version
*
* @version 1.0.10
* @version 1.0.11
* @author Improntus <http://www.improntus.com> - Ecommerce done right
* @copyright Copyright (c) 2020 Improntus
* @package Improntus\RetailRocket\Block\Adminhtml\System\Config\Form
Expand Down
4 changes: 2 additions & 2 deletions Block/Category.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/**
* Class Category
*
* @version 1.0.10
* @version 1.0.11
* @author Improntus <http://www.improntus.com> - Ecommerce done right
* @copyright Copyright (c) 2020 Improntus
* @package Improntus\RetailRocket\Block
Expand Down Expand Up @@ -71,4 +71,4 @@ public function getPixelHtml()

return $html;
}
}
}
4 changes: 2 additions & 2 deletions Block/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* Class Product
*
* @version 1.0.10
* @version 1.0.11
* @author Improntus <http://www.improntus.com> - Ecommerce done right
* @copyright Copyright (c) 2020 Improntus
* @package Improntus\RetailRocket\Block
Expand Down Expand Up @@ -85,4 +85,4 @@ public function getPixelHtml()

return $html;
}
}
}
4 changes: 2 additions & 2 deletions Block/Tracker.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
* Class Tracker
*
* @version 1.0.10
* @version 1.0.11
* @author Improntus <http://www.improntus.com> - Ecommerce done right
* @copyright Copyright (c) 2020 Improntus
* @package Improntus\RetailRocket\Block
Expand Down Expand Up @@ -155,4 +155,4 @@ public function getAlwaysSubscribeCustomerEmail()
{
return $this->_helper->getAlwaysSubscribeCustomerEmail();
}
}
}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
CHANGELOG
---------
### 1.0.11

- Added option "Use parent image in simple products"
- Added "addStoreFilter()" in product collection
- Code refactoring
- "Checkout success" layout update

### 1.0.10

Expand Down
4 changes: 2 additions & 2 deletions Controller/Addtocart/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/**
* Class Index
*
* @version 1.0.10
* @version 1.0.11
* @author Improntus <http://www.improntus.com> - Ecommerce done right
* @copyright Copyright (c) 2020 Improntus
* @package Improntus\RetailRocket\Controller\Index
Expand Down Expand Up @@ -360,4 +360,4 @@ protected function goBack($backUrl = null, $product = null)
$this->_objectManager->get(Data::class)->jsonEncode($result)
);
}
}
}
10 changes: 5 additions & 5 deletions Controller/Adminhtml/Generator/Generate.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/**
* Class Generate
*
* @version 1.0.10
* @version 1.0.11
* @author Improntus <http://www.improntus.com> - Ecommerce done right
* @copyright Copyright (c) 2020 Improntus
* @package Apptrian\FacebookCatalog\Controller\Adminhtml\Generator
Expand Down Expand Up @@ -53,7 +53,7 @@ public function __construct(
public function execute()
{
set_time_limit(18000);

try {
$feedGenerated = false;

Expand Down Expand Up @@ -85,13 +85,13 @@ public function execute()
$this->messageManager->addErrorMessage($message);
$this->messageManager->addErrorMessage($e->getMessage());
}

/** @var Redirect $resultRedirect */
$resultRedirect = $this->resultRedirectFactory->create();

return $resultRedirect->setPath(
'adminhtml/system_config/edit',
['section' => 'retailrocket']
);
}
}
}
Loading

0 comments on commit 3312ffb

Please sign in to comment.