Skip to content

Fix: Exception Error in Catalog Price Rule while Backend language is not English #18419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 4 commits into from
Oct 31, 2018
Merged

Fix: Exception Error in Catalog Price Rule while Backend language is not English #18419

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f36157
fix issue 12399
Mardl Oct 6, 2018
0d97a16
fix documentation for phpcs
Mardl Oct 7, 2018
ba703d7
fix one line for static test
Mardl Oct 7, 2018
d11ef56
fix: add SuppressWarnings again
Mardl Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
use Magento\Framework\App\Request\DataPersistorInterface;

/**
* Save action for catalog rule
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Save extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog implements HttpPostActionInterface
Expand All @@ -40,7 +42,9 @@ public function __construct(
}

/**
* @return void
* Execute save action from catalog rule
*
* @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
Expand All @@ -61,6 +65,17 @@ public function execute()
['request' => $this->getRequest()]
);
$data = $this->getRequest()->getPostValue();

$filterValues = ['from_date' => $this->_dateFilter];
if ($this->getRequest()->getParam('to_date')) {
$filterValues['to_date'] = $this->_dateFilter;
}
$inputFilter = new \Zend_Filter_Input(
$filterValues,
[],
$data
);
$data = $inputFilter->getUnescaped();
$id = $this->getRequest()->getParam('rule_id');
if ($id) {
$model = $ruleRepository->get($id);
Expand Down