Merge remote-tracking branch 'origin/AC-9139' into Hammer_Platform_Health_Scope_21082023

glo71317 · glo71317 · commit ca149320ce23 · 2023-08-24T12:03:45.000+05:30
diff --git a/app/code/Magento/Usps/Helper/Data.php b/app/code/Magento/Usps/Helper/Data.php
@@ -13,29 +13,37 @@
 class Data extends AbstractHelper
 {
     /**
-     * Available shipping methods
+     * USPS Allowed shipping methods
      *
      * @var array
      */
     protected $availableShippingMethods = [
-        'usps_0_FCLE', // First-Class Mail Large Envelope
-        'usps_1',      // Priority Mail
-        'usps_2',      // Priority Mail Express Hold For Pickup
-        'usps_3',      // Priority Mail Express
-        'usps_4',      // Retail Ground
-        'usps_6',      // Media Mail
-        'usps_INT_1',  // Priority Mail Express International
-        'usps_INT_2',  // Priority Mail International
-        'usps_INT_4',  // Global Express Guaranteed (GXG)
-        'usps_INT_7',  // Global Express Guaranteed Non-Document Non-Rectangular
-        'usps_INT_8',  // Priority Mail International Flat Rate Envelope
-        'usps_INT_9',  // Priority Mail International Medium Flat Rate Box
-        'usps_INT_10', // Priority Mail Express International Flat Rate Envelope
-        'usps_INT_11', // Priority Mail International Large Flat Rate Box
-        'usps_INT_12', // USPS GXG Envelopes
-        'usps_INT_14', // First-Class Mail International Large Envelope
-        'usps_INT_16', // Priority Mail International Small Flat Rate Box
-        'usps_INT_20', // Priority Mail International Small Flat Rate Envelope
+        'usps_0_FCLE',  // First-Class Mail Large Envelope
+        'usps_1',       // Priority Mail
+        'usps_2',       // Priority Mail Express Hold For Pickup
+        'usps_3',       // Priority Mail Express
+        'usps_4',       // Retail Ground
+        'usps_6',       // Media Mail
+        'usps_INT_1',   // Priority Mail Express International
+        'usps_INT_2',   // Priority Mail International
+        'usps_INT_4',   // Global Express Guaranteed (GXG)
+        'usps_INT_7',   // Global Express Guaranteed Non-Document Non-Rectangular
+        'usps_INT_8',   // Priority Mail International Flat Rate Envelope
+        'usps_INT_9',   // Priority Mail International Medium Flat Rate Box
+        'usps_INT_10',  // Priority Mail Express International Flat Rate Envelope
+        'usps_INT_11',  // Priority Mail International Large Flat Rate Box
+        'usps_INT_12',  // USPS GXG Envelopes
+        'usps_INT_14',  // First-Class Mail International Large Envelope
+        'usps_INT_16',  // Priority Mail International Small Flat Rate Box
+        'usps_INT_20',  // Priority Mail International Small Flat Rate Envelope
+        '1058',         // Ground Advantage™
+        '4058',         // Ground Advantage™ HAZMAT
+        '6058',         // Ground Advantage™ Parcel locker
+        '2058',         // Ground Advantage™ Hold for pickup
+        '4096',         // Ground Advantage™ Cubic HAZMAT
+        '1096',         // Ground Advantage™ Cubic
+        '2096',         // Ground Advantage™ Cubic Hold for pickup
+        '6096',         // Ground Advantage™ Cubic Parcel locker
     ];
 
     /**
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
@@ -815,6 +815,14 @@ public function getCode($type, $code = '')
                 'INT_24' => __('Priority Mail International DVD Flat Rate priced box'),
                 'INT_25' => __('Priority Mail International Large Video Flat Rate priced box'),
                 'INT_27' => __('Priority Mail Express International Padded Flat Rate Envelope'),
+                '1058' => __('Ground Advantage™'),
+                '4058' => __('Ground Advantage™ HAZMAT'),
+                '6058' => __('Ground Advantage™ Parcel locker'),
+                '2058' => __('Ground Advantage™ Hold for pickup'),
+                '4096' => __('Ground Advantage™ Cubic HAZMAT'),
+                '1096' => __('Ground Advantage™ Cubic'),
+                '2096' => __('Ground Advantage™ Cubic Hold for pickup'),
+                '6096' => __('Ground Advantage™ Cubic Parcel locker')
             ],
             'service_to_code' => [
                 '0_FCLE' => 'First Class',
@@ -891,6 +899,14 @@ public function getCode($type, $code = '')
                 'INT_24' => 'Priority',
                 'INT_25' => 'Priority',
                 'INT_27' => 'Priority Express',
+                '1058' => 'Ground Advantage',
+                '4058' => 'Ground Advantage',
+                '6058' => 'Ground Advantage',
+                '2058' => 'Ground Advantage',
+                '4096' => 'Ground Advantage',
+                '1096' => 'Ground Advantage',
+                '2096' => 'Ground Advantage',
+                '6096' => 'Ground Advantage',
             ],
             'method_to_code' => [
                 'First-Class Mail Large Envelope' => '0_FCLE',
diff --git a/app/code/Magento/Usps/Setup/Patch/Data/UpdateAllowedMethods.php b/app/code/Magento/Usps/Setup/Patch/Data/UpdateAllowedMethods.php
@@ -11,8 +11,7 @@
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class UpdateAllowedMethods
- * @package Magento\Usps\Setup\Patch
+ * Updates all methods on the configuration
  */
 class UpdateAllowedMethods implements DataPatchInterface, PatchVersionInterface
 {
@@ -23,6 +22,7 @@ class UpdateAllowedMethods implements DataPatchInterface, PatchVersionInterface
 
     /**
      * UpdateAllowedMethods constructor.
+     *
      * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
      */
     public function __construct(
@@ -32,7 +32,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -113,26 +113,27 @@ public function apply()
                 $connection->update($configDataTable, ['value' => $newValue], $whereConfigId);
             }
         }
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
         return [];
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
         return '2.0.1';
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Usps/Test/Unit/Helper/DataTest.php b/app/code/Magento/Usps/Test/Unit/Helper/DataTest.php
@@ -70,6 +70,14 @@ public function shippingMethodDataProvider()
             ['usps_INT_14'],   // First-Class Mail International Large Envelope
             ['usps_INT_16'],   // Priority Mail International Small Flat Rate Box
             ['usps_INT_20'],   // Priority Mail International Small Flat Rate Envelope
+            ['1058'],          // Ground Advantage™
+            ['4058'],          // Ground Advantage™ HAZMAT
+            ['6058'],          // Ground Advantage™ Parcel locker
+            ['2058'],          // Ground Advantage™ Hold for pickup
+            ['4096'],          // Ground Advantage™ Cubic HAZMAT
+            ['1096'],          // Ground Advantage™ Cubic
+            ['2096'],          // Ground Advantage™ Cubic Hold for pickup
+            ['6096'],          // Ground Advantage™ Cubic Parcel locker
         ];
     }
 }
diff --git a/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php
@@ -90,7 +90,8 @@ class CarrierTest extends TestCase
     private $config = [
         'carriers/usps/allowed_methods' => '0_FCLE,0_FCL,0_FCP,1,2,3,4,6,7,13,16,17,22,23,25,27,28,33,' .
             '34,35,36,37,42,43,53,55,56,57,61,INT_1,INT_2,INT_4,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,' .
-            'INT_12,INT_13,INT_14,INT_15,INT_16,INT_20,INT_26',
+            'INT_12,INT_13,INT_14,INT_15,INT_16,INT_20,INT_26,1058,4058,6058,2058,4096,' .
+            '1096,2096,6096',
         'carriers/usps/showmethod' => 1,
         'carriers/usps/debug' => 1,
         'carriers/usps/userid' => 'test',
diff --git a/app/code/Magento/Usps/etc/config.xml b/app/code/Magento/Usps/etc/config.xml
@@ -11,7 +11,7 @@
             <usps>
                 <active>0</active>
                 <sallowspecific>0</sallowspecific>
-                <allowed_methods>0_FCLE,0_FCL,0_FCP,1,2,3,4,6,7,13,16,17,22,23,25,27,28,33,34,35,36,37,42,43,53,57,61,INT_1,INT_2,INT_4,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,INT_12,INT_13,INT_14,INT_15,INT_16,INT_20</allowed_methods>
+                <allowed_methods>0_FCLE,0_FCL,0_FCP,1,2,3,4,6,7,13,16,17,22,23,25,27,28,33,34,35,36,37,42,43,53,57,61,INT_1,INT_2,INT_4,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,INT_12,INT_13,INT_14,INT_15,INT_16,INT_20,1058,4058,6058,2058,4096,1096,2096,6096</allowed_methods>
                 <container>VARIABLE</container>
                 <cutoff_cost />
                 <free_method />
diff --git a/app/code/Magento/Usps/i18n/en_US.csv b/app/code/Magento/Usps/i18n/en_US.csv
@@ -72,6 +72,14 @@
 "Priority Mail International DVD Flat Rate priced box","Priority Mail International DVD Flat Rate priced box"
 "Priority Mail International Large Video Flat Rate priced box","Priority Mail International Large Video Flat Rate priced box"
 "Priority Mail Express International Padded Flat Rate Envelope","Priority Mail Express International Padded Flat Rate Envelope"
+"Ground Advantage™","Ground Advantage™"
+"Ground Advantage™ HAZMAT","Ground Advantage™ HAZMAT"
+"Ground Advantage™ Parcel locker","Ground Advantage™ Parcel locker"
+"Ground Advantage™ Hold for pickup","Ground Advantage™ Hold for pickup"
+"Ground Advantage™ Cubic HAZMAT","Ground Advantage™ Cubic HAZMAT"
+"Ground Advantage™ Cubic","Ground Advantage™ Cubic"
+"Ground Advantage™ Cubic Hold for pickup","Ground Advantage™ Cubic Hold for pickup"
+"Ground Advantage™ Cubic Parcel locker","Ground Advantage™ Cubic Parcel locker"
 Letter,Letter
 Flat,Flat
 Parcel,Parcel

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@`
`11`	`11`	`use Magento\Framework\Setup\Patch\PatchVersionInterface;`
`12`	`12`
`13`	`13`	`/**`
`14`		`- * Class UpdateAllowedMethods`
`15`		`- * @package Magento\Usps\Setup\Patch`
	`14`	`+ * Updates all methods on the configuration`
`16`	`15`	`*/`
`17`	`16`	`class UpdateAllowedMethods implements DataPatchInterface, PatchVersionInterface`
`18`	`17`	`{`
`@@ -23,6 +22,7 @@ class UpdateAllowedMethods implements DataPatchInterface, PatchVersionInterface`
`23`	`22`
`24`	`23`	`/**`
`25`	`24`	`* UpdateAllowedMethods constructor.`
	`25`	`+ *`
`26`	`26`	`* @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup`
`27`	`27`	`*/`
`28`	`28`	`public function __construct(`
`@@ -32,7 +32,7 @@ public function __construct(`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/**`
`35`		`- * {@inheritdoc}`
	`35`	`+ * @inheritdoc`
`36`	`36`	`*/`
`37`	`37`	`public function apply()`
`38`	`38`	`{`
`@@ -113,26 +113,27 @@ public function apply()`
`113`	`113`	`$connection->update($configDataTable, ['value' => $newValue], $whereConfigId);`
`114`	`114`	`}`
`115`	`115`	`}`
	`116`	`+ return $this;`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`/**`
`119`		`- * {@inheritdoc}`
	`120`	`+ * @inheritdoc`
`120`	`121`	`*/`
`121`	`122`	`public static function getDependencies()`
`122`	`123`	`{`
`123`	`124`	`return [];`
`124`	`125`	`}`
`125`	`126`
`126`	`127`	`/**`
`127`		`- * {@inheritdoc}`
	`128`	`+ * @inheritdoc`
`128`	`129`	`*/`
`129`	`130`	`public static function getVersion()`
`130`	`131`	`{`
`131`	`132`	`return '2.0.1';`
`132`	`133`	`}`
`133`	`134`
`134`	`135`	`/**`
`135`		`- * {@inheritdoc}`
	`136`	`+ * @inheritdoc`
`136`	`137`	`*/`
`137`	`138`	`public function getAliases()`
`138`	`139`	`{`