MAGETWO-59149: [GITHUB] Outdated USPS container type list #6798

viktym · viktym · commit bdc97a08f368 · 2016-10-17T19:36:53.000+03:00
- Condition improvement
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
@@ -427,9 +427,13 @@ protected function _getXmlQuotes()
                 $service = $r->getService();
             }
 
-            if (preg_match('/(FLAT RATE ENVELOPE|FLAT RATE BOX)$/', $r->getContainer())) {
+            if (
+                strpos($r->getContainer(), 'FLAT RATE ENVELOPE') !== false ||
+                strpos($r->getContainer(), 'FLAT RATE BOX') !== false
+            ) {
                 $service = 'Priority';
             }
+
             $package->addChild('Service', $service);
 
             // no matter Letter, Flat or Parcel, use Parcel

Original file line number	Diff line number	Diff line change
`@@ -427,9 +427,13 @@ protected function _getXmlQuotes()`
`427`	`427`	`$service = $r->getService();`
`428`	`428`	`}`
`429`	`429`
`430`		`- if (preg_match('/(FLAT RATE ENVELOPE\|FLAT RATE BOX)$/', $r->getContainer())) {`
	`430`	`+ if (`
	`431`	`+ strpos($r->getContainer(), 'FLAT RATE ENVELOPE') !== false \|\|`
	`432`	`+ strpos($r->getContainer(), 'FLAT RATE BOX') !== false`
	`433`	`+ ) {`
`431`	`434`	`$service = 'Priority';`
`432`	`435`	`}`
	`436`	`+`
`433`	`437`	`$package->addChild('Service', $service);`
`434`	`438`
`435`	`439`	`// no matter Letter, Flat or Parcel, use Parcel`