Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
XigenDominic committed May 7, 2020
2 parents 4c61ca5 + dcf5f2d commit afc31bf
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Block/Widget/Special.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ protected function _getSpecialProductsCollection()
)
->addAttributeToFilter('special_price', ['gt' => '0.1'])
->addAttributeToFilter('price', ['gt' => '0.1'])
->addAttributeToFilter('special_price', ['lt' => new \Zend_Db_Expr('at_price.value')])
// ->addAttributeToFilter('special_price', ['lt' => new \Zend_Db_Expr('at_price.value')])
->addAttributeToSort('created_at', 'desc')
->setPageSize($this->getPageSize())
->setCurPage($this->getCurrentPage());
Expand Down
2 changes: 1 addition & 1 deletion Model/Layer.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public function getProductCollection()

$collection->addAttributeToFilter('special_price', ['gt' => '0.1']);
$collection->addAttributeToFilter('price', ['gt' => '0.1']);
$collection->addAttributeToFilter('special_price', ['lt' => new \Zend_Db_Expr('at_price.value')]);
// $collection->addAttributeToFilter('special_price', ['lt' => new \Zend_Db_Expr('at_price.value')]);

$this->prepareProductCollection($collection);
$this->_productCollections['xigen_custom'] = $collection;
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Special offers landing page with layered navigation and widget",
"type": "magento2-module",
"license": "proprietary",
"version": "1.1.7",
"version": "1.1.8",
"authors": [
{
"name": "Dominic Xigen",
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?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="Xigen_Special" setup_version="1.1.7">
<module name="Xigen_Special" setup_version="1.1.8">
</module>
</config>

0 comments on commit afc31bf

Please sign in to comment.