Merge remote-tracking branch 'origin/MAGETWO-72305' into MPI-PR-Regression2

Author: iivashchenko

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

@@ -643,7 +643,7 @@ public function getCode($type, $code = '')
             'method' => [
                 '0_FCLE' => __('First-Class Mail Large Envelope'),
                 '0_FCL' => __('First-Class Mail Letter'),
-                '0_FCP' => __('First-Class Mail Parcel'),
+                '0_FCP' => __('First-Class Package Service - Retail'),
                 '0_FCPC' => __('First-Class Mail Postcards'),
                 '1' => __('Priority Mail'),
                 '2' => __('Priority Mail Express Hold For Pickup'),
@@ -795,7 +795,7 @@ public function getCode($type, $code = '')
             'method_to_code' => [
                 'First-Class Mail Large Envelope' => '0_FCLE',
                 'First-Class Mail Letter' => '0_FCL',
-                'First-Class Mail Parcel' => '0_FCP',
+                'First-Class Package Service - Retail' => '0_FCP',
             ],
             'first_class_mail_type' => ['LETTER' => __('Letter'), 'FLAT' => __('Flat'), 'PARCEL' => __('Parcel')],
             'container' => [

app/code/Magento/Usps/Setup/InstallData.php renamed to app/code/Magento/Usps/Setup/UpgradeData.php

@@ -6,19 +6,29 @@
 
 namespace Magento\Usps\Setup;
 
-use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 
-/**
- * @codeCoverageIgnore
- */
-class InstallData implements InstallDataInterface
+class UpgradeData implements UpgradeDataInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        if (version_compare($context->getVersion(), '2.0.1', '<')) {
+            $this->updateAllowedMethods($setup);
+        }
+    }
+
+    /**
+     * Replaces titles of allowed shipping methods to their codes.
+     *
+     * @param ModuleDataSetupInterface $setup
+     * @return void
      */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    private function updateAllowedMethods(ModuleDataSetupInterface $setup)
     {
         $installer = $setup;
         $configDataTable = $installer->getTable('core_config_data');
@@ -39,6 +49,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
             'First-Class Mail Letter' => '0_FCL',
             'First-Class Mail Parcel' => '0_FCP',
             'First-Class Mail Package' => '0_FCP',
+            'First-Class Package Service - Retail' => '0_FCP',
             'Parcel Post' => '4',
             'Retail Ground' => '4',
             'Media Mail' => '6',
@@ -68,12 +79,12 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
             'Priority Mail International Large Flat Rate Box' => 'INT_11',
         ];
 
-        $select = $connection->select()->from(
-            $configDataTable
-        )->where(
-            'path IN (?)',
-            ['carriers/usps/free_method', 'carriers/usps/allowed_methods']
-        );
+        $select = $connection->select()
+            ->from($configDataTable)
+            ->where(
+                'path IN (?)',
+                ['carriers/usps/free_method', 'carriers/usps/allowed_methods']
+            );
         $oldConfigValues = $connection->fetchAll($select);
 
         foreach ($oldConfigValues as $oldValue) {

app/code/Magento/Usps/etc/module.xml

@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Usps" setup_version="2.0.0">
+    <module name="Magento_Usps" setup_version="2.0.1">
     </module>
 </config>

app/code/Magento/Usps/i18n/en_US.csv

@@ -1,6 +1,6 @@
 "First-Class Mail Large Envelope","First-Class Mail Large Envelope"
 "First-Class Mail Letter","First-Class Mail Letter"
-"First-Class Mail Parcel","First-Class Mail Parcel"
+"First-Class Package Service - Retail","First-Class Package Service - Retail"
 "First-Class Mail Postcards","First-Class Mail Postcards"
 "Priority Mail","Priority Mail"
 "Priority Mail Express Hold For Pickup","Priority Mail Express Hold For Pickup"