MAGETWO-99592: Discounts of products disappear on storefront after drag & drop via Visual Merchandiser in category

Author: dhorytskyi

app/code/Magento/CatalogRule/Model/Rule.php

@@ -41,6 +41,7 @@
  * @method \Magento\CatalogRule\Model\Rule setFromDate(string $value)
  * @method \Magento\CatalogRule\Model\Rule setToDate(string $value)
  * @method \Magento\CatalogRule\Model\Rule setCustomerGroupIds(string $value)
+ * @method string getWebsiteIds()
  * @method \Magento\CatalogRule\Model\Rule setWebsiteIds(string $value)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -432,9 +433,7 @@ protected function _getWebsitesMap()
     }
 
     /**
-     * @inheritdoc
-     * @param \Magento\Framework\DataObject $dataObject
-     * @return bool|string[]
+     * {@inheritdoc}
      */
     public function validateData(DataObject $dataObject)
     {
@@ -455,6 +454,7 @@ public function validateData(DataObject $dataObject)
      *
      * @param string $action
      * @param string|int|float $discount
+     *
      * @return array Validation errors
      */
     protected function validateDiscount($action, $discount)
@@ -582,7 +582,8 @@ protected function _invalidateCache()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
+     *
      * @return $this
      */
     public function afterSave()
@@ -612,7 +613,8 @@ public function reindex()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
+     *
      * @return $this
      */
     public function afterDelete()
@@ -641,9 +643,9 @@ public function isRuleBehaviorChanged()
 
     /**
      * Get array with data differences
-     *
      * @param array $array1
      * @param array $array2
+     *
      * @return array
      */
     protected function dataDiff($array1, $array2)
@@ -662,8 +664,6 @@ protected function dataDiff($array1, $array2)
     }
 
     /**
-     * Get conditions field set id
-     *
      * @param string $formName
      * @return string
      */
@@ -675,94 +675,79 @@ public function getConditionsFieldSetId($formName = '')
     //@codeCoverageIgnoreStart
 
     /**
-     * @inheritdoc
-     * @return int|null
+     * {@inheritdoc}
      */
     public function getRuleId()
     {
         return $this->getData(self::RULE_ID);
     }
 
     /**
-     * @inheritdoc
-     * @param int $ruleId
-     * @return $this
+     * {@inheritdoc}
      */
     public function setRuleId($ruleId)
     {
         return $this->setData(self::RULE_ID, $ruleId);
     }
 
     /**
-     * @inheritdoc
-     * @return string
+     * {@inheritdoc}
      */
     public function getName()
     {
         return $this->getData(self::NAME);
     }
 
     /**
-     * @inheritdoc
-     * @param string $name
-     * @return $this
+     * {@inheritdoc}
      */
     public function setName($name)
     {
         return $this->setData(self::NAME, $name);
     }
 
     /**
-     * @inheritdoc
-     * @return string|null
+     * {@inheritdoc}
      */
     public function getDescription()
     {
         return $this->getData(self::DESCRIPTION);
     }
 
     /**
-     * @inheritdoc
-     * @param string $description
-     * @return $this
+     * {@inheritdoc}
      */
     public function setDescription($description)
     {
         return $this->setData(self::DESCRIPTION, $description);
     }
 
     /**
-     * @inheritdoc
-     * @return int
+     * {@inheritdoc}
      */
     public function getIsActive()
     {
         return $this->getData(self::IS_ACTIVE);
     }
 
     /**
-     * @inheritdoc
-     * @param int $isActive
-     * @return $this
+     * {@inheritdoc}
      */
     public function setIsActive($isActive)
     {
         return $this->setData(self::IS_ACTIVE, $isActive);
     }
 
     /**
-     * @inheritdoc
-     * @return \Magento\CatalogRule\Api\Data\ConditionInterface|null
+     * {@inheritdoc}
      */
     public function getRuleCondition()
     {
         return $this->getRuleConditionConverter()->arrayToDataModel($this->getConditions()->asArray());
     }
 
     /**
-     * @inheritdoc
-     * @param \Magento\CatalogRule\Api\Data\ConditionInterface $condition
-     * @return $this
+     * {@inheritdoc}
      */
     public function setRuleCondition($condition)
     {
@@ -773,84 +758,70 @@ public function setRuleCondition($condition)
     }
 
     /**
-     * @inheritdoc
-     * @return int|null
+     * {@inheritdoc}
      */
     public function getStopRulesProcessing()
     {
         return $this->getData(self::STOP_RULES_PROCESSING);
     }
 
     /**
-     * @inheritdoc
-     * @param int $isStopProcessing
-     * @return $this
+     * {@inheritdoc}
      */
     public function setStopRulesProcessing($isStopProcessing)
     {
         return $this->setData(self::STOP_RULES_PROCESSING, $isStopProcessing);
     }
 
     /**
-     * @inheritdoc
-     * @return int|null
+     * {@inheritdoc}
      */
     public function getSortOrder()
     {
         return $this->getData(self::SORT_ORDER);
     }
 
     /**
-     * @inheritdoc
-     * @param int $sortOrder
-     * @return $this
+     * {@inheritdoc}
      */
     public function setSortOrder($sortOrder)
     {
         return $this->setData(self::SORT_ORDER, $sortOrder);
     }
 
     /**
-     * @inheritdoc
-     * @return string
+     * {@inheritdoc}
      */
     public function getSimpleAction()
     {
         return $this->getData(self::SIMPLE_ACTION);
     }
 
     /**
-     * @inheritdoc
-     * @param string $action
-     * @return $this
+     * {@inheritdoc}
      */
     public function setSimpleAction($action)
     {
         return $this->setData(self::SIMPLE_ACTION, $action);
     }
 
     /**
-     * @inheritdoc
-     * @return float
+     * {@inheritdoc}
      */
     public function getDiscountAmount()
     {
         return $this->getData(self::DISCOUNT_AMOUNT);
     }
 
     /**
-     * @inheritdoc
-     * @param float $amount
-     * @return $this
+     * {@inheritdoc}
      */
     public function setDiscountAmount($amount)
     {
         return $this->setData(self::DISCOUNT_AMOUNT, $amount);
     }
 
     /**
-     * Get from date
-     *
      * @return string
      */
     public function getFromDate()
@@ -859,8 +830,6 @@ public function getFromDate()
     }
 
     /**
-     * Get to date
-     *
      * @return string
      */
     public function getToDate()
@@ -869,7 +838,8 @@ public function getToDate()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
+     *
      * @return \Magento\CatalogRule\Api\Data\RuleExtensionInterface|null
      */
     public function getExtensionAttributes()
@@ -878,7 +848,8 @@ public function getExtensionAttributes()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
+     *
      * @param \Magento\CatalogRule\Api\Data\RuleExtensionInterface $extensionAttributes
      * @return $this
      */
@@ -888,8 +859,6 @@ public function setExtensionAttributes(RuleExtensionInterface $extensionAttribut
     }
 
     /**
-     * Get rule condition converter
-     *
      * @return Data\Condition\Converter
      * @deprecated 100.1.0
      */