ENGCOM-6786: 17847 Fixed wrong state title #26569

magento · Feb 4, 2020 · 0b0d98d · 0b0d98d
2 parents 241fa71 + 47ae5a2
commit 0b0d98d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/State.php b/app/code/Magento/Sales/Block/Status/Grid/Column/State.php
@@ -6,6 +6,8 @@
 namespace Magento\Sales\Block\Status\Grid\Column;
 
 /**
+ * Column State class
+ *
  * @api
  * @since 100.0.2
  */
@@ -53,12 +55,15 @@ public function getFrameCallback()
      */
     public function decorateState($value, $row, $column, $isExport)
     {
-        $status = $row->getStatus();
-        if ($value) {
-            $cell = $value . '[' . $this->_config->getStateLabelByStateAndStatus($value, $status) . ']';
-        } else {
-            $cell = $value;
+        $states = $this->_config->getStates();
+        if (isset($states[$value])) {
+            return sprintf(
+                "%s[%s]",
+                $value,
+                $states[$value]
+            );
         }
-        return $cell;
+
+        return $value;
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Status/Grid/Column/StateTest.php b/app/code/Magento/Sales/Test/Unit/Block/Status/Grid/Column/StateTest.php
@@ -55,13 +55,15 @@ public function testDecorateState()
                 [
                     'status' => 'fraud',
                     'state' => 'processing',
+                    'is_default' => '0',
                     'label' => 'Suspected Fraud',
                 ]
             ),
             new \Magento\Framework\DataObject(
                 [
                     'status' => 'processing',
                     'state' => 'processing',
+                    'is_default' => '1',
                     'label' => 'Processing',
                 ]
             )
@@ -78,6 +80,6 @@ public function testDecorateState()
             ->will($this->returnValue($statuses));
 
         $result = $this->stateColumn->decorateState('processing', $rowMock, $columnMock, false);
-        $this->assertSame('processing[Suspected Fraud]', $result);
+        $this->assertSame('processing[Processing]', $result);
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php
@@ -9,7 +9,7 @@
 use Magento\Sales\Model\ResourceModel\Order\Status\Collection;
 
 /**
- * Class ConfigTest
+ * Test for Magento\Sales\Model\Order\Config class
  */
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {