Skip to content

Commit d7a3849

Browse files
author
Yaroslav Onischenko
authored
Merge pull request #527 from magento-mpi/PR-bugfixes
[MPI] Bugfixes
2 parents 0c6227d + 926b902 commit d7a3849

File tree

5 files changed

+128
-111
lines changed

5 files changed

+128
-111
lines changed

‎app/code/Magento/Authorizenet/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,4 @@ Debug,Debug
6464
"Minimum Order Total","Minimum Order Total"
6565
"Maximum Order Total","Maximum Order Total"
6666
"Sort Order","Sort Order"
67+
"Sorry, but something went wrong. Please contact the seller.","Sorry, but something went wrong. Please contact the seller."

‎app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
define(
66
[
77
'jquery',
8-
'Magento_Payment/js/view/payment/iframe'
8+
'Magento_Payment/js/view/payment/iframe',
9+
'mage/translate'
910
],
10-
function ($, Component) {
11+
function ($, Component, $t) {
1112
'use strict';
1213

1314
return Component.extend({
1415
defaults: {
1516
template: 'Magento_Authorizenet/payment/authorizenet-directpost',
16-
timeoutMessage: 'Sorry, but something went wrong. Please contact the seller.'
17+
timeoutMessage: $t('Sorry, but something went wrong. Please contact the seller.')
1718
},
1819
placeOrderHandler: null,
1920
validateHandler: null,

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

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,14 @@ protected function _getXmlQuotes()
426426
if (!$service) {
427427
$service = $r->getService();
428428
}
429-
if ($r->getContainer() == 'FLAT RATE BOX' || $r->getContainer() == 'FLAT RATE ENVELOPE') {
429+
430+
if (
431+
strpos($r->getContainer(), 'FLAT RATE ENVELOPE') !== false ||
432+
strpos($r->getContainer(), 'FLAT RATE BOX') !== false
433+
) {
430434
$service = 'Priority';
431435
}
436+
432437
$package->addChild('Service', $service);
433438

434439
// no matter Letter, Flat or Parcel, use Parcel
@@ -794,8 +799,15 @@ public function getCode($type, $code = '')
794799
'first_class_mail_type' => ['LETTER' => __('Letter'), 'FLAT' => __('Flat'), 'PARCEL' => __('Parcel')],
795800
'container' => [
796801
'VARIABLE' => __('Variable'),
797-
'FLAT RATE BOX' => __('Flat-Rate Box'),
802+
'SM FLAT RATE BOX' => __('Small Flat-Rate Box'),
803+
'MD FLAT RATE BOX' => __('Medium Flat-Rate Box'),
804+
'LG FLAT RATE BOX' => __('Large Flat-Rate Box'),
798805
'FLAT RATE ENVELOPE' => __('Flat-Rate Envelope'),
806+
'SM FLAT RATE ENVELOPE' => __('Small Flat-Rate Envelope'),
807+
'WINDOW FLAT RATE ENVELOPE' => __('Window Flat-Rate Envelope'),
808+
'GIFT CARD FLAT RATE ENVELOPE' => __('Gift Card Flat-Rate Envelope'),
809+
'LEGAL FLAT RATE ENVELOPE' => __('Legal Flat-Rate Envelope'),
810+
'PADDED FLAT RATE ENVELOPE' => __('Padded Flat-Rate Envelope'),
799811
'RECTANGULAR' => __('Rectangular'),
800812
'NONRECTANGULAR' => __('Non-rectangular'),
801813
],
@@ -805,104 +817,115 @@ public function getCode($type, $code = '')
805817
'filters' => [
806818
'within_us' => [
807819
'method' => [
808-
'Priority Mail Express Flat Rate Envelope',
809-
'Priority Mail Express Flat Rate Envelope Hold For Pickup',
810-
'Priority Mail Flat Rate Envelope',
811-
'Priority Mail Large Flat Rate Box',
812-
'Priority Mail Medium Flat Rate Box',
813-
'Priority Mail Small Flat Rate Box',
814-
'Priority Mail Express Hold For Pickup',
815-
'Priority Mail Express',
816-
'Priority Mail',
817-
'Priority Mail Hold For Pickup',
818-
'Priority Mail Large Flat Rate Box Hold For Pickup',
819-
'Priority Mail Medium Flat Rate Box Hold For Pickup',
820-
'Priority Mail Small Flat Rate Box Hold For Pickup',
821-
'Priority Mail Flat Rate Envelope Hold For Pickup',
822-
'Priority Mail Small Flat Rate Envelope',
823-
'Priority Mail Small Flat Rate Envelope Hold For Pickup',
824-
'First-Class Package Service Hold For Pickup',
825-
'Retail Ground',
826-
'Media Mail',
827-
'First-Class Mail Large Envelope',
828-
'Priority Mail Express Sunday/Holiday Delivery',
829-
'Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope',
830-
'Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes',
820+
'13', '27', '16', '22', '17', '28', '2', '3', '1', '33', '34', '35',
821+
'36', '37', '42', '43', '53', '4', '6', '15', '23', '25', '57'
831822
],
832823
],
833824
'from_us' => [
834825
'method' => [
835-
'Priority Mail Express International Flat Rate Envelope',
836-
'Priority Mail International Flat Rate Envelope',
837-
'Priority Mail International Large Flat Rate Box',
838-
'Priority Mail International Medium Flat Rate Box',
839-
'Priority Mail International Small Flat Rate Box',
840-
'Priority Mail International Small Flat Rate Envelope',
841-
'Priority Mail Express International Flat Rate Boxes',
842-
'Global Express Guaranteed (GXG)',
843-
'USPS GXG Envelopes',
844-
'Priority Mail Express International',
845-
'Priority Mail International',
846-
'First-Class Mail International Letter',
847-
'First-Class Mail International Large Envelope',
848-
'First-Class Package International Service',
826+
'INT_10', 'INT_8', 'INT_11', 'INT_9', 'INT_16', 'INT_20', 'INT_4',
827+
'INT_12', 'INT_1', 'INT_2', 'INT_13', 'INT_14', 'INT_15'
849828
],
850829
],
851830
],
852831
],
853832
[
854-
'containers' => ['FLAT RATE BOX'],
833+
'containers' => ['SM FLAT RATE BOX'],
855834
'filters' => [
856835
'within_us' => [
857-
'method' => [
858-
'Priority Mail Large Flat Rate Box',
859-
'Priority Mail Medium Flat Rate Box',
860-
'Priority Mail Small Flat Rate Box',
861-
'Priority Mail International Large Flat Rate Box',
862-
'Priority Mail International Medium Flat Rate Box',
863-
'Priority Mail International Small Flat Rate Box',
864-
'Priority Mail Express Sunday/Holiday Delivery Flat Rate Boxes',
865-
],
836+
'method' => ['28', '57'],
866837
],
867838
'from_us' => [
868-
'method' => [
869-
'Priority Mail International Large Flat Rate Box',
870-
'Priority Mail International Medium Flat Rate Box',
871-
'Priority Mail International Small Flat Rate Box',
872-
'Priority Mail International DVD Flat Rate priced box',
873-
'Priority Mail International Large Video Flat Rate priced box',
874-
],
839+
'method' => ['INT_16', 'INT_24'],
840+
],
841+
]
842+
],
843+
[
844+
'containers' => ['MD FLAT RATE BOX'],
845+
'filters' => [
846+
'within_us' => [
847+
'method' => ['17', '57'],
848+
],
849+
'from_us' => [
850+
'method' => ['INT_9', 'INT_24'],
851+
],
852+
]
853+
],
854+
[
855+
'containers' => ['LG FLAT RATE BOX'],
856+
'filters' => [
857+
'within_us' => [
858+
'method' => ['22', '57'],
859+
],
860+
'from_us' => [
861+
'method' => ['INT_11', 'INT_24', 'INT_25'],
862+
],
863+
]
864+
],
865+
[
866+
'containers' => ['SM FLAT RATE ENVELOPE'],
867+
'filters' => [
868+
'within_us' => [
869+
'method' => ['42', '43'],
870+
],
871+
'from_us' => [
872+
'method' => ['INT_20'],
873+
],
874+
]
875+
],
876+
[
877+
'containers' => ['WINDOW FLAT RATE ENVELOPE'],
878+
'filters' => [
879+
'within_us' => [
880+
'method' => ['40', '41'],
881+
],
882+
'from_us' => [
883+
'method' => ['INT_19'],
884+
],
885+
]
886+
],
887+
[
888+
'containers' => ['GIFT CARD FLAT RATE ENVELOPE'],
889+
'filters' => [
890+
'within_us' => [
891+
'method' => ['38', '39'],
892+
],
893+
'from_us' => [
894+
'method' => ['INT_18'],
895+
],
896+
]
897+
],
898+
[
899+
'containers' => ['PADDED FLAT RATE ENVELOPE'],
900+
'filters' => [
901+
'within_us' => [
902+
'method' => ['62', '63', '64', '46', '29'],
903+
],
904+
'from_us' => [
905+
'method' => ['INT_27', 'INT_23'],
906+
],
907+
]
908+
],
909+
[
910+
'containers' => ['LEGAL FLAT RATE ENVELOPE'],
911+
'filters' => [
912+
'within_us' => [
913+
'method' => ['44', '45', '30', '31', '32'],
914+
],
915+
'from_us' => [
916+
'method' => ['INT_17', 'INT_22'],
875917
],
876918
]
877919
],
878920
[
879921
'containers' => ['FLAT RATE ENVELOPE'],
880922
'filters' => [
881923
'within_us' => [
882-
'method' => [
883-
'Priority Mail Flat Rate Envelope',
884-
'Priority Mail Express Flat Rate Envelope',
885-
'Priority Mail Express Flat Rate Envelope Hold For Pickup',
886-
'Priority Mail Flat Rate Envelope',
887-
'First-Class Mail Large Envelope',
888-
'Priority Mail Flat Rate Envelope Hold For Pickup',
889-
'Priority Mail Small Flat Rate Envelope',
890-
'Priority Mail Small Flat Rate Envelope Hold For Pickup',
891-
'Priority Mail Express Sunday/Holiday Delivery Flat Rate Envelope',
892-
'Priority Mail Express Padded Flat Rate Envelope',
893-
],
924+
'method' => ['16', '13', '27', '16', '15', '37', '42', '43', '25', '62'],
894925
],
895926
'from_us' => [
896927
'method' => [
897-
'Priority Mail Express International Flat Rate Envelope',
898-
'Priority Mail International Flat Rate Envelope',
899-
'First-Class Mail International Large Envelope',
900-
'Priority Mail International Small Flat Rate Envelope',
901-
'Priority Mail Express International Legal Flat Rate Envelope',
902-
'Priority Mail International Gift Card Flat Rate Envelope',
903-
'Priority Mail International Window Flat Rate Envelope',
904-
'Priority Mail International Legal Flat Rate Envelope',
905-
'Priority Mail Express International Padded Flat Rate Envelope',
928+
'INT_10', 'INT_8', 'INT_14', 'INT_20', 'INT_17', 'INT_18', 'INT_19', 'INT_22', 'INT_27'
906929
],
907930
],
908931
]
@@ -911,44 +934,21 @@ public function getCode($type, $code = '')
911934
'containers' => ['RECTANGULAR'],
912935
'filters' => [
913936
'within_us' => [
914-
'method' => [
915-
'Priority Mail Express',
916-
'Priority Mail',
917-
'Retail Ground',
918-
'Media Mail',
919-
'Library Mail',
920-
'First-Class Package Service',
921-
],
937+
'method' => ['3', '1', '4', '6', '7', '61'],
922938
],
923939
'from_us' => [
924-
'method' => [
925-
'USPS GXG Envelopes',
926-
'Priority Mail Express International',
927-
'Priority Mail International',
928-
'First-Class Package International Service',
929-
],
940+
'method' => ['INT_12', 'INT_1', 'INT_2', 'INT_15'],
930941
],
931942
]
932943
],
933944
[
934945
'containers' => ['NONRECTANGULAR'],
935946
'filters' => [
936947
'within_us' => [
937-
'method' => [
938-
'Priority Mail Express',
939-
'Priority Mail',
940-
'Retail Ground',
941-
'Media Mail',
942-
'Library Mail',
943-
],
948+
'method' => ['3', '1', '4', '6', '7'],
944949
],
945950
'from_us' => [
946-
'method' => [
947-
'Global Express Guaranteed (GXG)',
948-
'Priority Mail Express International',
949-
'Priority Mail International',
950-
'First-Class Package International Service',
951-
],
951+
'method' => ['INT_4', 'INT_1', 'INT_2', 'INT_15'],
952952
],
953953
]
954954
],

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<data name="address/dataset" xsi:type="string">US_address_1</data>
1717
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
1818
<data name="shipping/shipping_service" xsi:type="string">United States Postal Service</data>
19-
<data name="shipping/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
20-
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
19+
<data name="shipping/shipping_method" xsi:type="string">Priority Mail 1-Day Small Flat Rate Box</data>
20+
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail 1-Day Small Flat Rate Box</data>
2121
<data name="payment/method" xsi:type="string">checkmo</data>
22-
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
22+
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA, usps_container_sm_flat_rate_box</data>
2323
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
2424
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
2525
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />

0 commit comments

Comments
 (0)