Merge remote-tracking branch 'af/MC-13853' into MC-13852

Author: rganin

app/code/Magento/Catalog/Model/Category.php

@@ -72,11 +72,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
 
     const CACHE_TAG = 'cat_c';
 
-    /**
-     * Category Store Id
-     */
-    const STORE_ID = 'store_id';
-
     /**#@-*/
     protected $_eventPrefix = 'catalog_category';
 
@@ -573,8 +568,8 @@ public function getStoreIds()
      */
     public function getStoreId()
     {
-        if ($this->hasData(self::STORE_ID)) {
-            return (int)$this->_getData(self::STORE_ID);
+        if ($this->hasData('store_id')) {
+            return (int)$this->_getData('store_id');
         }
         return (int)$this->_storeManager->getStore()->getId();
     }
@@ -590,7 +585,7 @@ public function setStoreId($storeId)
         if (!is_numeric($storeId)) {
             $storeId = $this->_storeManager->getStore($storeId)->getId();
         }
-        $this->setData(self::STORE_ID, $storeId);
+        $this->setData('store_id', $storeId);
         $this->getResource()->setStoreId($storeId);
         return $this;
     }

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

@@ -71,11 +71,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     const STORE_ID = 'store_id';
 
-    /**
-     * Product Url path.
-     */
-    const URL_PATH = 'url_path';
-
     /**
      * @var string
      */

app/code/Magento/Catalog/Model/Product/Copier.php

@@ -83,7 +83,7 @@ public function copy(Product $product)
                 ? $matches[1] . '-' . ($matches[2] + 1)
                 : $urlKey . '-1';
             $duplicate->setUrlKey($urlKey);
-            $duplicate->setData(Product::URL_PATH, null);
+            $duplicate->setData('url_path', null);
             try {
                 $duplicate->save();
                 $isDuplicateSaved = true;

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -133,16 +133,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     const COL_NAME = 'name';
 
-    /**
-     * Column new_from_date.
-     */
-    const COL_NEW_FROM_DATE = 'new_from_date';
-
-    /**
-     * Column new_to_date.
-     */
-    const COL_NEW_TO_DATE = 'new_to_date';
-
     /**
      * Column product website.
      */
@@ -309,7 +299,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         ValidatorInterface::ERROR_INVALID_WEIGHT => 'Product weight is invalid',
         ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Url key: \'%s\' was already generated for an item with the SKU: \'%s\'. You need to specify the unique URL key manually',
         ValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES => 'Value for multiselect attribute %s contains duplicated values',
-        ValidatorInterface::ERROR_NEW_TO_DATE => 'Make sure new_to_date is later than or the same as new_from_date',
+        'invalidNewToDateValue' => 'Make sure new_to_date is later than or the same as new_from_date',
     ];
     //@codingStandardsIgnoreEnd
 
@@ -331,8 +321,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         Product::COL_TYPE => 'product_type',
         Product::COL_PRODUCT_WEBSITES => 'product_websites',
         'status' => 'product_online',
-        'news_from_date' => self::COL_NEW_FROM_DATE,
-        'news_to_date' => self::COL_NEW_TO_DATE,
+        'news_from_date' => 'new_from_date',
+        'news_to_date' => 'new_to_date',
         'options_container' => 'display_product_options_in',
         'minimal_price' => 'map_price',
         'msrp' => 'msrp_price',
@@ -2564,16 +2554,16 @@ public function validateRow(array $rowData, $rowNum)
             }
         }
 
-        if (!empty($rowData[self::COL_NEW_FROM_DATE]) && !empty($rowData[self::COL_NEW_TO_DATE])
+        if (!empty($rowData['new_from_date']) && !empty($rowData['new_to_date'])
         ) {
-            $newFromTimestamp = strtotime($this->dateTime->formatDate($rowData[self::COL_NEW_FROM_DATE], false));
-            $newToTimestamp = strtotime($this->dateTime->formatDate($rowData[self::COL_NEW_TO_DATE], false));
+            $newFromTimestamp = strtotime($this->dateTime->formatDate($rowData['new_from_date'], false));
+            $newToTimestamp = strtotime($this->dateTime->formatDate($rowData['new_to_date'], false));
             if ($newFromTimestamp > $newToTimestamp) {
                 $this->skipRow(
                     $rowNum,
-                    ValidatorInterface::ERROR_NEW_TO_DATE,
+                    'invalidNewToDateValue',
                     $errorLevel,
-                    $rowData[self::COL_NEW_TO_DATE]
+                    $rowData['new_to_date']
                 );
             }
         }

app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php

@@ -87,8 +87,6 @@ interface RowValidatorInterface extends \Magento\Framework\Validator\ValidatorIn
 
     const ERROR_DUPLICATE_MULTISELECT_VALUES = 'duplicatedMultiselectValues';
 
-    const ERROR_NEW_TO_DATE = 'invalidNewToDateValue';
-
     /**
      * Value that means all entities (e.g. websites, groups etc.)
      */

app/code/Magento/Directory/Model/Config/Source/WeightUnit.php

@@ -14,24 +14,14 @@
  */
 class WeightUnit implements \Magento\Framework\Option\ArrayInterface
 {
-    /**
-     * @var string
-     */
-    const CODE_LBS = 'lbs';
-
-    /**
-     * @var string
-     */
-    const CODE_KGS = 'kgs';
-
     /**
      * @inheritdoc
      */
     public function toOptionArray()
     {
         return [
-            ['value' => self::CODE_LBS, 'label' => __('lbs')],
-            ['value' => self::CODE_KGS, 'label' => __('kgs')]
+            ['value' => 'lbs', 'label' => __('lbs')],
+            ['value' => 'kgs', 'label' => __('kgs')]
         ];
     }
 }

app/code/Magento/Sales/Model/Order/Creditmemo.php

@@ -42,11 +42,6 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
 
     const REPORT_DATE_TYPE_REFUND_CREATED = 'refund_created';
 
-    /**
-     * Allow Zero Grandtotal for Creditmemo path
-     */
-    const XML_PATH_ALLOW_ZERO_GRANDTOTAL = 'sales/zerograndtotal_creditmemo/allow_zero_grandtotal';
-
     /**
      * Identifier for order history item
      *
@@ -658,7 +653,7 @@ public function isValidGrandTotal()
     public function isAllowZeroGrandTotal()
     {
         $isAllowed = $this->scopeConfig->getValue(
-            self::XML_PATH_ALLOW_ZERO_GRANDTOTAL,
+            'sales/zerograndtotal_creditmemo/allow_zero_grandtotal',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return $isAllowed;

app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php

@@ -29,14 +29,6 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
 
     const GUAM_REGION_CODE = 'GU';
 
-    const SPAIN_COUNTRY_ID = 'ES';
-
-    const CANARY_ISLANDS_COUNTRY_ID = 'IC';
-
-    const SANTA_CRUZ_DE_TENERIFE_REGION_ID = 'Santa Cruz de Tenerife';
-
-    const LAS_PALMAS_REGION_ID = 'Las Palmas';
-
     /**
      * Array of quotes
      *

app/code/Magento/Ups/Model/Carrier.php

@@ -333,11 +333,11 @@ public function setRequest(RateRequest $request)
         }
 
         // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
-        if ($destCountry === self::SPAIN_COUNTRY_ID &&
-            ($request->getDestRegionCode() === self::LAS_PALMAS_REGION_ID
-                || $request->getDestRegionCode() === self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
+        if ($destCountry === 'ES' &&
+            ($request->getDestRegionCode() === 'Las Palmas'
+                || $request->getDestRegionCode() === 'Santa Cruz de Tenerife')
         ) {
-            $destCountry = self::CANARY_ISLANDS_COUNTRY_ID;
+            $destCountry = 'IC';
         }
 
         $country = $this->_countryFactory->create()->load($destCountry);