Merge pull request #1669 from magento-engcom/2.1-develop-prs

[EngCom] Public Pull Requests - 2.1-develop
 - MAGETWO-83320: #7903 correct the position of the datepicker when you scroll #12045
 - MAGETWO-83319: [backport 2.1] Magento 2 Store Code validation regex: doesn't support uppercase letters in store code #12040
 - MAGETWO-82948: fix #8846 [Backport 2.1-develop]: avoid duplicated attribute option values #11786
 - MAGETWO-81328: [Fix:5439] Send email to subscribers only when are new 2.1 #11316

Author: ishakhsuvarov

app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php

@@ -40,6 +40,17 @@ public function getItems($attributeCode)
      */
     public function add($attributeCode, $option)
     {
+        /** @var \Magento\Eav\Api\Data\AttributeOptionInterface[] $currentOptions */
+        $currentOptions = $this->getItems($attributeCode);
+        if (is_array($currentOptions)) {
+            array_walk($currentOptions, function (&$attributeOption) {
+                /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
+                $attributeOption = $attributeOption->getLabel();
+            });
+            if (in_array($option->getLabel(), $currentOptions)) {
+                return false;
+            }
+        }
         return $this->eavOptionManagement->add(
             \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE,
             $attributeCode,

app/code/Magento/Newsletter/Model/Subscriber.php

@@ -395,6 +395,10 @@ public function subscribe($email)
     {
         $this->loadByEmail($email);
 
+        if ($this->getId() && $this->getStatus() == self::STATUS_SUBSCRIBED) {
+            return $this->getStatus();
+        }
+
         if (!$this->getId()) {
             $this->setSubscriberConfirmCode($this->randomSequence());
         }

app/code/Magento/Store/Model/ResourceModel/Website.php

@@ -47,7 +47,7 @@ public function readAllWebsites()
             ->select()
             ->from($this->getTable('store_website'));
 
-        foreach($this->getConnection()->fetchAll($select) as $websiteData) {
+        foreach ($this->getConnection()->fetchAll($select) as $websiteData) {
             $websites[$websiteData['code']] = $websiteData;
         }
 
@@ -63,7 +63,7 @@ public function readAllWebsites()
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
-        if (!preg_match('/^[a-z]+[a-z0-9_]*$/', $object->getCode())) {
+        if (!preg_match('/^[a-z]+[a-z0-9_]*$/i', $object->getCode())) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __(
                     'Website code may only contain letters (a-z), numbers (0-9) or underscore (_),'

app/code/Magento/Store/Model/Store.php

@@ -12,10 +12,10 @@
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ScopeInterface as AppScopeInterface;
-use Magento\Framework\Filesystem;
 use Magento\Framework\DataObject\IdentityInterface;
-use Magento\Framework\Url\ScopeInterface as UrlScopeInterface;
+use Magento\Framework\Filesystem;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Framework\Url\ScopeInterface as UrlScopeInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Api\Data\StoreInterface;
 
@@ -459,7 +459,7 @@ protected function _getValidationRulesBeforeSave()
         $storeLabelRule->setMessage(__('Name is required'), \Zend_Validate_NotEmpty::IS_EMPTY);
         $validator->addRule($storeLabelRule, 'name');
 
-        $storeCodeRule = new \Zend_Validate_Regex('/^[a-z]+[a-z0-9_]*$/');
+        $storeCodeRule = new \Zend_Validate_Regex('/^[a-z]+[a-z0-9_]*$/i');
         $storeCodeRule->setMessage(
             __(
                 'The store code may contain only letters (a-z), numbers (0-9) or underscore (_),'

app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less

@@ -122,6 +122,12 @@
         }
     }
 
+    td {
+        .admin__field-control  {
+            position: relative;
+        }
+    }
+
     th {
         color: @color-very-dark-gray-black;
         font-size: @font-size__base;