Skip to content

Commit 756a8f1

Browse files
ameysarameysar
committed
MAGETWO-59660: [Backport] - [GITHUB] Outdated USPS container type list #6798 - for 2.1
1 parent 7fa17f3 commit 756a8f1

File tree

3 files changed

+123
-109
lines changed

3 files changed

+123
-109
lines changed

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

Lines changed: 103 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,13 @@ protected function _getXmlQuotes()
416416
if (!$service) {
417417
$service = $r->getService();
418418
}
419-
if ($r->getContainer() == 'FLAT RATE BOX' || $r->getContainer() == 'FLAT RATE ENVELOPE') {
419+
420+
if (strpos($r->getContainer(), 'FLAT RATE ENVELOPE') !== false ||
421+
strpos($r->getContainer(), 'FLAT RATE BOX') !== false
422+
) {
420423
$service = 'Priority';
421424
}
425+
422426
$package->addChild('Service', $service);
423427

424428
// no matter Letter, Flat or Parcel, use Parcel
@@ -783,8 +787,15 @@ public function getCode($type, $code = '')
783787
'first_class_mail_type' => ['LETTER' => __('Letter'), 'FLAT' => __('Flat'), 'PARCEL' => __('Parcel')],
784788
'container' => [
785789
'VARIABLE' => __('Variable'),
786-
'FLAT RATE BOX' => __('Flat-Rate Box'),
790+
'SM FLAT RATE BOX' => __('Small Flat-Rate Box'),
791+
'MD FLAT RATE BOX' => __('Medium Flat-Rate Box'),
792+
'LG FLAT RATE BOX' => __('Large Flat-Rate Box'),
787793
'FLAT RATE ENVELOPE' => __('Flat-Rate Envelope'),
794+
'SM FLAT RATE ENVELOPE' => __('Small Flat-Rate Envelope'),
795+
'WINDOW FLAT RATE ENVELOPE' => __('Window Flat-Rate Envelope'),
796+
'GIFT CARD FLAT RATE ENVELOPE' => __('Gift Card Flat-Rate Envelope'),
797+
'LEGAL FLAT RATE ENVELOPE' => __('Legal Flat-Rate Envelope'),
798+
'PADDED FLAT RATE ENVELOPE' => __('Padded Flat-Rate Envelope'),
788799
'RECTANGULAR' => __('Rectangular'),
789800
'NONRECTANGULAR' => __('Non-rectangular'),
790801
],
@@ -794,104 +805,115 @@ public function getCode($type, $code = '')
794805
'filters' => [
795806
'within_us' => [
796807
'method' => [
797-
'Priority Mail Express Flat Rate Envelope',
798-
'Priority Mail Express Flat Rate Envelope Hold For Pickup',
799-
'Priority Mail Flat Rate Envelope',
800-
'Priority Mail Large Flat Rate Box',
801-
'Priority Mail Medium Flat Rate Box',
802-
'Priority Mail Small Flat Rate Box',
803-
'Priority Mail Express Hold For Pickup',
804-
'Priority Mail Express',
805-
'Priority Mail',
806-
'Priority Mail Hold For Pickup',
807-
'Priority Mail Large Flat Rate Box Hold For Pickup',
808-
'Priority Mail Medium Flat Rate Box Hold For Pickup',
809-
'Priority Mail Small Flat Rate Box Hold For Pickup',
810-
'Priority Mail Flat Rate Envelope Hold For Pickup',
811-
'Priority Mail Small Flat Rate Envelope',
812-
'Priority Mail Small Flat Rate Envelope Hold For Pickup',
813-
'First-Class Package Service Hold For Pickup',
814-
'Retail Ground',
815-
'Media Mail',
816-
'First-Class Mail Large Envelope',
817-
'Priority Mail Express Sunday/Holiday Delivery',
818-
'Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope',
819-
'Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes',
808+
'13', '27', '16', '22', '17', '28', '2', '3', '1', '33', '34', '35',
809+
'36', '37', '42', '43', '53', '4', '6', '15', '23', '25', '57',
820810
],
821811
],
822812
'from_us' => [
823813
'method' => [
824-
'Priority Mail Express International Flat Rate Envelope',
825-
'Priority Mail International Flat Rate Envelope',
826-
'Priority Mail International Large Flat Rate Box',
827-
'Priority Mail International Medium Flat Rate Box',
828-
'Priority Mail International Small Flat Rate Box',
829-
'Priority Mail International Small Flat Rate Envelope',
830-
'Priority Mail Express International Flat Rate Boxes',
831-
'Global Express Guaranteed (GXG)',
832-
'USPS GXG Envelopes',
833-
'Priority Mail Express International',
834-
'Priority Mail International',
835-
'First-Class Mail International Letter',
836-
'First-Class Mail International Large Envelope',
837-
'First-Class Package International Service',
814+
'INT_10', 'INT_8', 'INT_11', 'INT_9', 'INT_16', 'INT_20', 'INT_4',
815+
'INT_12', 'INT_1', 'INT_2', 'INT_13', 'INT_14', 'INT_15',
838816
],
839817
],
840818
],
841819
],
842820
[
843-
'containers' => ['FLAT RATE BOX'],
821+
'containers' => ['SM FLAT RATE BOX'],
844822
'filters' => [
845823
'within_us' => [
846-
'method' => [
847-
'Priority Mail Large Flat Rate Box',
848-
'Priority Mail Medium Flat Rate Box',
849-
'Priority Mail Small Flat Rate Box',
850-
'Priority Mail International Large Flat Rate Box',
851-
'Priority Mail International Medium Flat Rate Box',
852-
'Priority Mail International Small Flat Rate Box',
853-
'Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes',
854-
],
824+
'method' => ['28', '57'],
855825
],
856826
'from_us' => [
857-
'method' => [
858-
'Priority Mail International Large Flat Rate Box',
859-
'Priority Mail International Medium Flat Rate Box',
860-
'Priority Mail International Small Flat Rate Box',
861-
'Priority Mail International DVD Flat Rate priced box',
862-
'Priority Mail International Large Video Flat Rate priced box',
863-
],
827+
'method' => ['INT_16', 'INT_24'],
828+
],
829+
]
830+
],
831+
[
832+
'containers' => ['MD FLAT RATE BOX'],
833+
'filters' => [
834+
'within_us' => [
835+
'method' => ['17', '57'],
836+
],
837+
'from_us' => [
838+
'method' => ['INT_9', 'INT_24'],
839+
],
840+
]
841+
],
842+
[
843+
'containers' => ['LG FLAT RATE BOX'],
844+
'filters' => [
845+
'within_us' => [
846+
'method' => ['22', '57'],
847+
],
848+
'from_us' => [
849+
'method' => ['INT_11', 'INT_24', 'INT_25'],
850+
],
851+
]
852+
],
853+
[
854+
'containers' => ['SM FLAT RATE ENVELOPE'],
855+
'filters' => [
856+
'within_us' => [
857+
'method' => ['42', '43'],
858+
],
859+
'from_us' => [
860+
'method' => ['INT_20'],
861+
],
862+
]
863+
],
864+
[
865+
'containers' => ['WINDOW FLAT RATE ENVELOPE'],
866+
'filters' => [
867+
'within_us' => [
868+
'method' => ['40', '41'],
869+
],
870+
'from_us' => [
871+
'method' => ['INT_19'],
872+
],
873+
]
874+
],
875+
[
876+
'containers' => ['GIFT CARD FLAT RATE ENVELOPE'],
877+
'filters' => [
878+
'within_us' => [
879+
'method' => ['38', '39'],
880+
],
881+
'from_us' => [
882+
'method' => ['INT_18'],
883+
],
884+
]
885+
],
886+
[
887+
'containers' => ['PADDED FLAT RATE ENVELOPE'],
888+
'filters' => [
889+
'within_us' => [
890+
'method' => ['62', '63', '64', '46', '29'],
891+
],
892+
'from_us' => [
893+
'method' => ['INT_27', 'INT_23'],
894+
],
895+
]
896+
],
897+
[
898+
'containers' => ['LEGAL FLAT RATE ENVELOPE'],
899+
'filters' => [
900+
'within_us' => [
901+
'method' => ['44', '45', '30', '31', '32'],
902+
],
903+
'from_us' => [
904+
'method' => ['INT_17', 'INT_22'],
864905
],
865906
]
866907
],
867908
[
868909
'containers' => ['FLAT RATE ENVELOPE'],
869910
'filters' => [
870911
'within_us' => [
871-
'method' => [
872-
'Priority Mail Flat Rate Envelope',
873-
'Priority Mail Express Flat Rate Envelope',
874-
'Priority Mail Express Flat Rate Envelope Hold For Pickup',
875-
'Priority Mail Flat Rate Envelope',
876-
'First-Class Mail Large Envelope',
877-
'Priority Mail Flat Rate Envelope Hold For Pickup',
878-
'Priority Mail Small Flat Rate Envelope',
879-
'Priority Mail Small Flat Rate Envelope Hold For Pickup',
880-
'Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope',
881-
'Priority Mail Express Padded Flat Rate Envelope',
882-
],
912+
'method' => ['16', '13', '27', '16', '15', '37', '42', '43', '25', '62'],
883913
],
884914
'from_us' => [
885915
'method' => [
886-
'Priority Mail Express International Flat Rate Envelope',
887-
'Priority Mail International Flat Rate Envelope',
888-
'First-Class Mail International Large Envelope',
889-
'Priority Mail International Small Flat Rate Envelope',
890-
'Priority Mail Express International Legal Flat Rate Envelope',
891-
'Priority Mail International Gift Card Flat Rate Envelope',
892-
'Priority Mail International Window Flat Rate Envelope',
893-
'Priority Mail International Legal Flat Rate Envelope',
894-
'Priority Mail Express International Padded Flat Rate Envelope',
916+
'INT_10', 'INT_8', 'INT_14', 'INT_20', 'INT_17', 'INT_18', 'INT_19', 'INT_22', 'INT_27'
895917
],
896918
],
897919
]
@@ -900,44 +922,21 @@ public function getCode($type, $code = '')
900922
'containers' => ['RECTANGULAR'],
901923
'filters' => [
902924
'within_us' => [
903-
'method' => [
904-
'Priority Mail Express',
905-
'Priority Mail',
906-
'Retail Ground',
907-
'Media Mail',
908-
'Library Mail',
909-
'First-Class Package Service',
910-
],
925+
'method' => ['3', '1', '4', '6', '7', '61'],
911926
],
912927
'from_us' => [
913-
'method' => [
914-
'USPS GXG Envelopes',
915-
'Priority Mail Express International',
916-
'Priority Mail International',
917-
'First-Class Package International Service',
918-
],
928+
'method' => ['INT_12', 'INT_1', 'INT_2', 'INT_15'],
919929
],
920930
]
921931
],
922932
[
923933
'containers' => ['NONRECTANGULAR'],
924934
'filters' => [
925935
'within_us' => [
926-
'method' => [
927-
'Priority Mail Express',
928-
'Priority Mail',
929-
'Retail Ground',
930-
'Media Mail',
931-
'Library Mail',
932-
],
936+
'method' => ['3', '1', '4', '6', '7'],
933937
],
934938
'from_us' => [
935-
'method' => [
936-
'Global Express Guaranteed (GXG)',
937-
'Priority Mail Express International',
938-
'Priority Mail International',
939-
'First-Class Package International Service',
940-
],
939+
'method' => ['INT_4', 'INT_1', 'INT_2', 'INT_15'],
941940
],
942941
]
943942
],

‎dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<item name="value" xsi:type="number">1</item>
5555
</field>
5656
</dataset>
57-
5857
<dataset name="usps_rollback">
5958
<field name="carriers/usps/active" xsi:type="array">
6059
<item name="scope" xsi:type="string">carriers</item>
@@ -63,5 +62,21 @@
6362
<item name="value" xsi:type="number">0</item>
6463
</field>
6564
</dataset>
65+
<dataset name="usps_container_sm_flat_rate_box">
66+
<field name="carriers/usps/container" xsi:type="array">
67+
<item name="scope" xsi:type="string">carriers</item>
68+
<item name="scope_id" xsi:type="number">1</item>
69+
<item name="label" xsi:type="string">Small Flat-Rate Box</item>
70+
<item name="value" xsi:type="string">SM FLAT RATE BOX</item>
71+
</field>
72+
</dataset>
73+
<dataset name="usps_container_sm_flat_rate_box_rollback">
74+
<field name="carriers/usps/container" xsi:type="array">
75+
<item name="scope" xsi:type="string">carriers</item>
76+
<item name="scope_id" xsi:type="number">1</item>
77+
<item name="label" xsi:type="string">Variable</item>
78+
<item name="value" xsi:type="string">VARIABLE</item>
79+
</field>
80+
</dataset>
6681
</repository>
6782
</config>

‎dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="OnePageCheckout within Offline Payment Methods and USPS shipping method.">
10-
<variation name="OnePageCheckoutUspsTestVariation1" summary="Use USPS Online Shipping Carrier on Checkout as a Registered Customer" ticketId="MAGETWO-12444">
10+
<variation name="OnePageCheckoutUspsTestVariation1" summary="Use USPS Online Shipping Carrier on Checkout as a Registered Customer" ticketId="MAGETWO-87620">
1111
<data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
1212
<data name="checkoutMethod" xsi:type="string">login</data>
1313
<data name="customer/dataset" xsi:type="string">default</data>
1414
<data name="address/dataset" xsi:type="string">US_address_1</data>
1515
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
1616
<data name="shipping/shipping_service" xsi:type="string">United States Postal Service</data>
17-
<data name="shipping/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
18-
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
17+
<data name="shipping/shipping_method" xsi:type="string">Priority Mail 1-Day Small Flat Rate Box</data>
18+
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail 1-Day Small Flat Rate Box</data>
1919
<data name="payment/method" xsi:type="string">checkmo</data>
20-
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
20+
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA, usps_container_sm_flat_rate_box</data>
2121
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
2222
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
2323
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />

0 commit comments

Comments
 (0)