Skip to content
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

* Update states labels in Order Status grid. #24750

Closed
wants to merge 2 commits into from
Closed

* Update states labels in Order Status grid. #24750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afb437b
* Update states labels in Order Status grid.
madbounce Sep 27, 2019
8520993
* Fix issue with double calculation of stock item during
madbounce Sep 27, 2019
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
2 changes: 0 additions & 2 deletions app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ public function getItems()
$oldSuperMode = $this->getQuote()->getIsSuperMode();
$this->getQuote()->setIsSuperMode(false);
foreach ($items as $item) {
// To dispatch inventory event sales_quote_item_qty_set_after, set item qty
$item->setQty($item->getQty());

if (!$item->getMessage()) {
//Getting product ids for stock item last quantity validation before grid display
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Sales/Block/Status/Grid/Column/State.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ public function getFrameCallback()
*/
public function decorateState($value, $row, $column, $isExport)
{
$status = $row->getStatus();
if ($value) {
$cell = $value . '[' . $this->_config->getStateLabelByStateAndStatus($value, $status) . ']';
$states = $this->_config->getStates();
if (isset($states[$value])) {
$cell = $value . '[' . $states[$value] . ']';
} else {
$cell = $value;
}
Expand Down