diff --git a/app/code/Magento/Authorizenet/i18n/en_US.csv b/app/code/Magento/Authorizenet/i18n/en_US.csv
index 7183c706dc0a2ed264e7e73d0e11743cbf450b40..45025304c4e4423d77f60e1e26af4f2da6a8a569 100644
--- a/app/code/Magento/Authorizenet/i18n/en_US.csv
+++ b/app/code/Magento/Authorizenet/i18n/en_US.csv
@@ -64,3 +64,4 @@ Debug,Debug
"Minimum Order Total","Minimum Order Total"
"Maximum Order Total","Maximum Order Total"
"Sort Order","Sort Order"
+"Sorry, but something went wrong. Please contact the seller.","Sorry, but something went wrong. Please contact the seller."
diff --git a/app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js b/app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js
index cd05960c17633844fb1c57e92794066186a45965..86ec8e0c3922109170e19f4191fdbf7e27dc43d5 100644
--- a/app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js
+++ b/app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js
@@ -5,15 +5,16 @@
define(
[
'jquery',
- 'Magento_Payment/js/view/payment/iframe'
+ 'Magento_Payment/js/view/payment/iframe',
+ 'mage/translate'
],
- function ($, Component) {
+ function ($, Component, $t) {
'use strict';
return Component.extend({
defaults: {
template: 'Magento_Authorizenet/payment/authorizenet-directpost',
- timeoutMessage: 'Sorry, but something went wrong. Please contact the seller.'
+ timeoutMessage: $t('Sorry, but something went wrong. Please contact the seller.')
},
placeOrderHandler: null,
validateHandler: null,
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index d12341659cb6d8ad1fc4acabe0b8052e346ca102..b2345a86bff4d6349035950373d1e7975076f513 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -426,9 +426,14 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
if (!$service) {
$service = $r->getService();
}
- if ($r->getContainer() == 'FLAT RATE BOX' || $r->getContainer() == 'FLAT RATE ENVELOPE') {
+
+ 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
@@ -794,8 +799,15 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
'first_class_mail_type' => ['LETTER' => __('Letter'), 'FLAT' => __('Flat'), 'PARCEL' => __('Parcel')],
'container' => [
'VARIABLE' => __('Variable'),
- 'FLAT RATE BOX' => __('Flat-Rate Box'),
+ 'SM FLAT RATE BOX' => __('Small Flat-Rate Box'),
+ 'MD FLAT RATE BOX' => __('Medium Flat-Rate Box'),
+ 'LG FLAT RATE BOX' => __('Large Flat-Rate Box'),
'FLAT RATE ENVELOPE' => __('Flat-Rate Envelope'),
+ 'SM FLAT RATE ENVELOPE' => __('Small Flat-Rate Envelope'),
+ 'WINDOW FLAT RATE ENVELOPE' => __('Window Flat-Rate Envelope'),
+ 'GIFT CARD FLAT RATE ENVELOPE' => __('Gift Card Flat-Rate Envelope'),
+ 'LEGAL FLAT RATE ENVELOPE' => __('Legal Flat-Rate Envelope'),
+ 'PADDED FLAT RATE ENVELOPE' => __('Padded Flat-Rate Envelope'),
'RECTANGULAR' => __('Rectangular'),
'NONRECTANGULAR' => __('Non-rectangular'),
],
@@ -805,73 +817,103 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
'filters' => [
'within_us' => [
'method' => [
- 'Priority Mail Express Flat Rate Envelope',
- 'Priority Mail Express Flat Rate Envelope Hold For Pickup',
- 'Priority Mail Flat Rate Envelope',
- 'Priority Mail Large Flat Rate Box',
- 'Priority Mail Medium Flat Rate Box',
- 'Priority Mail Small Flat Rate Box',
- 'Priority Mail Express Hold For Pickup',
- 'Priority Mail Express',
- 'Priority Mail',
- 'Priority Mail Hold For Pickup',
- 'Priority Mail Large Flat Rate Box Hold For Pickup',
- 'Priority Mail Medium Flat Rate Box Hold For Pickup',
- 'Priority Mail Small Flat Rate Box Hold For Pickup',
- 'Priority Mail Flat Rate Envelope Hold For Pickup',
- 'Priority Mail Small Flat Rate Envelope',
- 'Priority Mail Small Flat Rate Envelope Hold For Pickup',
- 'First-Class Package Service Hold For Pickup',
- 'Retail Ground',
- 'Media Mail',
- 'First-Class Mail Large Envelope',
- 'Priority Mail Express Sunday/Holiday Delivery',
- 'Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope',
- 'Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes',
+ '13', '27', '16', '22', '17', '28', '2', '3', '1', '33', '34', '35',
+ '36', '37', '42', '43', '53', '4', '6', '15', '23', '25', '57'
],
],
'from_us' => [
'method' => [
- 'Priority Mail Express International Flat Rate Envelope',
- 'Priority Mail International Flat Rate Envelope',
- 'Priority Mail International Large Flat Rate Box',
- 'Priority Mail International Medium Flat Rate Box',
- 'Priority Mail International Small Flat Rate Box',
- 'Priority Mail International Small Flat Rate Envelope',
- 'Priority Mail Express International Flat Rate Boxes',
- 'Global Express Guaranteed (GXG)',
- 'USPS GXG Envelopes',
- 'Priority Mail Express International',
- 'Priority Mail International',
- 'First-Class Mail International Letter',
- 'First-Class Mail International Large Envelope',
- 'First-Class Package International Service',
+ 'INT_10', 'INT_8', 'INT_11', 'INT_9', 'INT_16', 'INT_20', 'INT_4',
+ 'INT_12', 'INT_1', 'INT_2', 'INT_13', 'INT_14', 'INT_15'
],
],
],
],
[
- 'containers' => ['FLAT RATE BOX'],
+ 'containers' => ['SM FLAT RATE BOX'],
'filters' => [
'within_us' => [
- 'method' => [
- 'Priority Mail Large Flat Rate Box',
- 'Priority Mail Medium Flat Rate Box',
- 'Priority Mail Small Flat Rate Box',
- 'Priority Mail International Large Flat Rate Box',
- 'Priority Mail International Medium Flat Rate Box',
- 'Priority Mail International Small Flat Rate Box',
- 'Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes',
- ],
+ 'method' => ['28', '57'],
],
'from_us' => [
- 'method' => [
- 'Priority Mail International Large Flat Rate Box',
- 'Priority Mail International Medium Flat Rate Box',
- 'Priority Mail International Small Flat Rate Box',
- 'Priority Mail International DVD Flat Rate priced box',
- 'Priority Mail International Large Video Flat Rate priced box',
- ],
+ 'method' => ['INT_16', 'INT_24'],
+ ],
+ ]
+ ],
+ [
+ 'containers' => ['MD FLAT RATE BOX'],
+ 'filters' => [
+ 'within_us' => [
+ 'method' => ['17', '57'],
+ ],
+ 'from_us' => [
+ 'method' => ['INT_9', 'INT_24'],
+ ],
+ ]
+ ],
+ [
+ 'containers' => ['LG FLAT RATE BOX'],
+ 'filters' => [
+ 'within_us' => [
+ 'method' => ['22', '57'],
+ ],
+ 'from_us' => [
+ 'method' => ['INT_11', 'INT_24', 'INT_25'],
+ ],
+ ]
+ ],
+ [
+ 'containers' => ['SM FLAT RATE ENVELOPE'],
+ 'filters' => [
+ 'within_us' => [
+ 'method' => ['42', '43'],
+ ],
+ 'from_us' => [
+ 'method' => ['INT_20'],
+ ],
+ ]
+ ],
+ [
+ 'containers' => ['WINDOW FLAT RATE ENVELOPE'],
+ 'filters' => [
+ 'within_us' => [
+ 'method' => ['40', '41'],
+ ],
+ 'from_us' => [
+ 'method' => ['INT_19'],
+ ],
+ ]
+ ],
+ [
+ 'containers' => ['GIFT CARD FLAT RATE ENVELOPE'],
+ 'filters' => [
+ 'within_us' => [
+ 'method' => ['38', '39'],
+ ],
+ 'from_us' => [
+ 'method' => ['INT_18'],
+ ],
+ ]
+ ],
+ [
+ 'containers' => ['PADDED FLAT RATE ENVELOPE'],
+ 'filters' => [
+ 'within_us' => [
+ 'method' => ['62', '63', '64', '46', '29'],
+ ],
+ 'from_us' => [
+ 'method' => ['INT_27', 'INT_23'],
+ ],
+ ]
+ ],
+ [
+ 'containers' => ['LEGAL FLAT RATE ENVELOPE'],
+ 'filters' => [
+ 'within_us' => [
+ 'method' => ['44', '45', '30', '31', '32'],
+ ],
+ 'from_us' => [
+ 'method' => ['INT_17', 'INT_22'],
],
]
],
@@ -879,30 +921,11 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
'containers' => ['FLAT RATE ENVELOPE'],
'filters' => [
'within_us' => [
- 'method' => [
- 'Priority Mail Flat Rate Envelope',
- 'Priority Mail Express Flat Rate Envelope',
- 'Priority Mail Express Flat Rate Envelope Hold For Pickup',
- 'Priority Mail Flat Rate Envelope',
- 'First-Class Mail Large Envelope',
- 'Priority Mail Flat Rate Envelope Hold For Pickup',
- 'Priority Mail Small Flat Rate Envelope',
- 'Priority Mail Small Flat Rate Envelope Hold For Pickup',
- 'Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope',
- 'Priority Mail Express Padded Flat Rate Envelope',
- ],
+ 'method' => ['16', '13', '27', '16', '15', '37', '42', '43', '25', '62'],
],
'from_us' => [
'method' => [
- 'Priority Mail Express International Flat Rate Envelope',
- 'Priority Mail International Flat Rate Envelope',
- 'First-Class Mail International Large Envelope',
- 'Priority Mail International Small Flat Rate Envelope',
- 'Priority Mail Express International Legal Flat Rate Envelope',
- 'Priority Mail International Gift Card Flat Rate Envelope',
- 'Priority Mail International Window Flat Rate Envelope',
- 'Priority Mail International Legal Flat Rate Envelope',
- 'Priority Mail Express International Padded Flat Rate Envelope',
+ 'INT_10', 'INT_8', 'INT_14', 'INT_20', 'INT_17', 'INT_18', 'INT_19', 'INT_22', 'INT_27'
],
],
]
@@ -911,22 +934,10 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
'containers' => ['RECTANGULAR'],
'filters' => [
'within_us' => [
- 'method' => [
- 'Priority Mail Express',
- 'Priority Mail',
- 'Retail Ground',
- 'Media Mail',
- 'Library Mail',
- 'First-Class Package Service',
- ],
+ 'method' => ['3', '1', '4', '6', '7', '61'],
],
'from_us' => [
- 'method' => [
- 'USPS GXG Envelopes',
- 'Priority Mail Express International',
- 'Priority Mail International',
- 'First-Class Package International Service',
- ],
+ 'method' => ['INT_12', 'INT_1', 'INT_2', 'INT_15'],
],
]
],
@@ -934,21 +945,10 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
'containers' => ['NONRECTANGULAR'],
'filters' => [
'within_us' => [
- 'method' => [
- 'Priority Mail Express',
- 'Priority Mail',
- 'Retail Ground',
- 'Media Mail',
- 'Library Mail',
- ],
+ 'method' => ['3', '1', '4', '6', '7'],
],
'from_us' => [
- 'method' => [
- 'Global Express Guaranteed (GXG)',
- 'Priority Mail Express International',
- 'Priority Mail International',
- 'First-Class Package International Service',
- ],
+ 'method' => ['INT_4', 'INT_1', 'INT_2', 'INT_15'],
],
]
],
diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml
index 85c6a6fd80eecc69cc945d96a908f40dcfb1a356..83b50205387d5da98401799e7486aba04368c355 100644
--- a/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml
@@ -54,7 +54,6 @@
<item name="value" xsi:type="number">1</item>
</field>
</dataset>
-
<dataset name="usps_rollback">
<field name="carriers/usps/active" xsi:type="array">
<item name="scope" xsi:type="string">carriers</item>
@@ -63,5 +62,21 @@
<item name="value" xsi:type="number">0</item>
</field>
</dataset>
+ <dataset name="usps_container_sm_flat_rate_box">
+ <field name="carriers/usps/container" xsi:type="array">
+ <item name="scope" xsi:type="string">carriers</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Small Flat-Rate Box</item>
+ <item name="value" xsi:type="string">SM FLAT RATE BOX</item>
+ </field>
+ </dataset>
+ <dataset name="usps_container_sm_flat_rate_box_rollback">
+ <field name="carriers/usps/container" xsi:type="array">
+ <item name="scope" xsi:type="string">carriers</item>
+ <item name="scope_id" xsi:type="number">1</item>
+ <item name="label" xsi:type="string">Variable</item>
+ <item name="value" xsi:type="string">VARIABLE</item>
+ </field>
+ </dataset>
</repository>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
index 0bd219bab3bfff2103ea9f7a1ff2934ca8e1ad59..8081b485c27d5c0e803a051f9126bdf6599e6781 100644
--- a/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml
@@ -16,10 +16,10 @@
<data name="address/dataset" xsi:type="string">US_address_1</data>
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
<data name="shipping/shipping_service" xsi:type="string">United States Postal Service</data>
- <data name="shipping/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
- <data name="cart/data/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
+ <data name="shipping/shipping_method" xsi:type="string">Priority Mail 1-Day Small Flat Rate Box</data>
+ <data name="cart/data/shipping_method" xsi:type="string">Priority Mail 1-Day Small Flat Rate Box</data>
<data name="payment/method" xsi:type="string">checkmo</data>
- <data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
+ <data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA, usps_container_sm_flat_rate_box</data>
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />