Merge remote-tracking branch 'origin/MAGETWO-28011' into MAGETWO-28011

Author: nsyvokonenko

app/code/Magento/Customer/Api/Data/CustomerInterface.php

@@ -32,6 +32,7 @@ interface CustomerInterface extends \Magento\Framework\Api\CustomAttributesDataI
     const DEFAULT_BILLING = 'default_billing';
     const DEFAULT_SHIPPING = 'default_shipping';
     const KEY_ADDRESSES = 'addresses';
+    const DISABLE_AUTO_GROUP_CHANGE = 'disable_auto_group_change';
     /**#@-*/
 
     /**
@@ -357,6 +358,23 @@ public function getAddresses();
      */
     public function setAddresses(array $addresses = null);
 
+    /**
+     * Get disable auto group change flag.
+     *
+     * @api
+     * @return int|null
+     */
+    public function getDisableAutoGroupChange();
+
+    /**
+     * Set disable auto group change flag.
+     *
+     * @api
+     * @param int $disableAutoGroupChange
+     * @return $this
+     */
+    public function setDisableAutoGroupChange($disableAutoGroupChange);
+
     /**
      * Retrieve existing extension attributes object or create a new one.
      *

app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

@@ -45,7 +45,10 @@ protected function _extractCustomerData()
         }
 
         if (isset($customerData['disable_auto_group_change'])) {
-            $customerData['disable_auto_group_change'] = (int)$customerData['disable_auto_group_change'];
+            $customerData['disable_auto_group_change'] = (int) filter_var(
+                $customerData['disable_auto_group_change'],
+                FILTER_VALIDATE_BOOLEAN
+            );
         }
 
         return $customerData;

app/code/Magento/Customer/Model/Data/Customer.php

@@ -237,6 +237,16 @@ public function getAddresses()
         return $this->_get(self::KEY_ADDRESSES);
     }
 
+    /**
+     * Get disable auto group change flag.
+     *
+     * @return int|null
+     */
+    public function getDisableAutoGroupChange()
+    {
+        return $this->_get(self::DISABLE_AUTO_GROUP_CHANGE);
+    }
+
     /**
      * Set customer id
      *
@@ -446,6 +456,17 @@ public function setAddresses(array $addresses = null)
         return $this->setData(self::KEY_ADDRESSES, $addresses);
     }
 
+    /**
+     * Set disable auto group change flag.
+     *
+     * @param int $disableAutoGroupChange
+     * @return $this
+     */
+    public function setDisableAutoGroupChange($disableAutoGroupChange)
+    {
+        return $this->setData(self::DISABLE_AUTO_GROUP_CHANGE, $disableAutoGroupChange);
+    }
+
     /**
      * {@inheritdoc}
      *