From e3f5962ad2f4e7e6951eb81c1437ba4684ff8a79 Mon Sep 17 00:00:00 2001
From: Bassel <info@basselalaraaj.com>
Date: Thu, 2 Mar 2017 09:38:36 +0100
Subject: [PATCH] Fixing issue #8196

---
 .../ConfigurableProduct/Model/AttributeOptionProvider.php  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php b/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php
index 1b51481948f4a..8d81d265ac8ba 100644
--- a/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php
+++ b/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php
@@ -77,6 +77,7 @@ private function getAttributeOptionsSelect(AbstractAttribute $superAttribute, $p
                     'default_option_value.value'
                 ),
                 'default_title' => 'default_option_value.value',
+                'sort_order' => 'option.sort_order',
             ]
         )->joinInner(
             ['product_entity' => $this->attributeResource->getTable('catalog_product_entity')],
@@ -106,6 +107,10 @@ private function getAttributeOptionsSelect(AbstractAttribute $superAttribute, $p
                 ]
             ),
             []
+        )->joinInner(
+            ['option' => $this->getTable('eav_attribute_option')],
+            'option.option_id = entity_value.value',
+            []
         )->joinLeft(
             ['option_value' => $this->attributeResource->getTable('eav_attribute_option_value')],
             implode(
@@ -132,7 +137,7 @@ private function getAttributeOptionsSelect(AbstractAttribute $superAttribute, $p
         )->where(
             'attribute.attribute_id = ?',
             $superAttribute->getAttributeId()
-        );
+        )->order('option.sort_order ASC');
 
         return $select;
     }