Skip to content

Commit f582ab8

Browse files
author
Joan He
committed
Merge remote-tracking branch 'arcticfoxes/MC-4245' into MC-13747
2 parents b8eb424 + ad74fba commit f582ab8

15 files changed

+1225
-322
lines changed

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

Lines changed: 162 additions & 107 deletions
Large diffs are not rendered by default.

‎app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php

Lines changed: 215 additions & 128 deletions
Large diffs are not rendered by default.

‎app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0"?>
22
<!--
33
/**
44
* Copyright © Magento, Inc. All rights reserved.
@@ -83,7 +83,7 @@
8383
<currency>EUR</currency>
8484
<weight_unit>KG</weight_unit>
8585
<measure_unit>CM</measure_unit>
86-
<region>EA</region>
86+
<region>EU</region>
8787
<name>Austria</name>
8888
<domestic>1</domestic>
8989
</AT>
@@ -132,7 +132,7 @@
132132
<currency>EUR</currency>
133133
<weight_unit>KG</weight_unit>
134134
<measure_unit>CM</measure_unit>
135-
<region>EA</region>
135+
<region>EU</region>
136136
<name>Belgium</name>
137137
<domestic>1</domestic>
138138
</BE>
@@ -146,7 +146,7 @@
146146
<currency>BGN</currency>
147147
<weight_unit>KG</weight_unit>
148148
<measure_unit>CM</measure_unit>
149-
<region>EA</region>
149+
<region>EU</region>
150150
<name>Bulgaria</name>
151151
<domestic>1</domestic>
152152
</BG>
@@ -257,7 +257,7 @@
257257
<currency>CHF</currency>
258258
<weight_unit>KG</weight_unit>
259259
<measure_unit>CM</measure_unit>
260-
<region>EA</region>
260+
<region>EU</region>
261261
<name>Switzerland</name>
262262
</CH>
263263
<CI>
@@ -331,15 +331,15 @@
331331
<currency>CZK</currency>
332332
<weight_unit>KG</weight_unit>
333333
<measure_unit>CM</measure_unit>
334-
<region>EA</region>
334+
<region>EU</region>
335335
<name>Czech Republic, The</name>
336336
<domestic>1</domestic>
337337
</CZ>
338338
<DE>
339339
<currency>EUR</currency>
340340
<weight_unit>KG</weight_unit>
341341
<measure_unit>CM</measure_unit>
342-
<region>EA</region>
342+
<region>EU</region>
343343
<name>Germany</name>
344344
<domestic>1</domestic>
345345
</DE>
@@ -353,7 +353,7 @@
353353
<currency>DKK</currency>
354354
<weight_unit>KG</weight_unit>
355355
<measure_unit>CM</measure_unit>
356-
<region>EA</region>
356+
<region>EU</region>
357357
<name>Denmark</name>
358358
<domestic>1</domestic>
359359
</DK>
@@ -389,7 +389,7 @@
389389
<currency>EEK</currency>
390390
<weight_unit>KG</weight_unit>
391391
<measure_unit>CM</measure_unit>
392-
<region>EA</region>
392+
<region>EU</region>
393393
<name>Estonia</name>
394394
<domestic>1</domestic>
395395
</EE>
@@ -410,7 +410,7 @@
410410
<currency>EUR</currency>
411411
<weight_unit>KG</weight_unit>
412412
<measure_unit>CM</measure_unit>
413-
<region>EA</region>
413+
<region>EU</region>
414414
<name>Spain</name>
415415
<domestic>1</domestic>
416416
</ES>
@@ -424,7 +424,7 @@
424424
<currency>EUR</currency>
425425
<weight_unit>KG</weight_unit>
426426
<measure_unit>CM</measure_unit>
427-
<region>EA</region>
427+
<region>EU</region>
428428
<name>Finland</name>
429429
<domestic>1</domestic>
430430
</FI>
@@ -457,7 +457,7 @@
457457
<currency>EUR</currency>
458458
<weight_unit>KG</weight_unit>
459459
<measure_unit>CM</measure_unit>
460-
<region>EA</region>
460+
<region>EU</region>
461461
<name>France</name>
462462
<domestic>1</domestic>
463463
</FR>
@@ -471,7 +471,7 @@
471471
<currency>GBP</currency>
472472
<weight_unit>KG</weight_unit>
473473
<measure_unit>CM</measure_unit>
474-
<region>EA</region>
474+
<region>EU</region>
475475
<name>United Kingdom</name>
476476
<domestic>1</domestic>
477477
</GB>
@@ -549,7 +549,7 @@
549549
<currency>EUR</currency>
550550
<weight_unit>KG</weight_unit>
551551
<measure_unit>CM</measure_unit>
552-
<region>EA</region>
552+
<region>EU</region>
553553
<name>Greece</name>
554554
<domestic>1</domestic>
555555
</GR>
@@ -612,7 +612,7 @@
612612
<currency>HUF</currency>
613613
<weight_unit>KG</weight_unit>
614614
<measure_unit>CM</measure_unit>
615-
<region>EA</region>
615+
<region>EU</region>
616616
<name>Hungary</name>
617617
<domestic>1</domestic>
618618
</HU>
@@ -633,7 +633,7 @@
633633
<currency>EUR</currency>
634634
<weight_unit>KG</weight_unit>
635635
<measure_unit>CM</measure_unit>
636-
<region>EA</region>
636+
<region>EU</region>
637637
<name>Ireland, Republic Of</name>
638638
<domestic>1</domestic>
639639
</IE>
@@ -668,14 +668,14 @@
668668
<currency>ISK</currency>
669669
<weight_unit>KG</weight_unit>
670670
<measure_unit>CM</measure_unit>
671-
<region>EA</region>
671+
<region>EU</region>
672672
<name>Iceland</name>
673673
</IS>
674674
<IT>
675675
<currency>EUR</currency>
676676
<weight_unit>KG</weight_unit>
677677
<measure_unit>CM</measure_unit>
678-
<region>EA</region>
678+
<region>EU</region>
679679
<name>Italy</name>
680680
<domestic>1</domestic>
681681
</IT>
@@ -834,23 +834,23 @@
834834
<currency>LTL</currency>
835835
<weight_unit>KG</weight_unit>
836836
<measure_unit>CM</measure_unit>
837-
<region>EA</region>
837+
<region>EU</region>
838838
<name>Lithuania</name>
839839
<domestic>1</domestic>
840840
</LT>
841841
<LU>
842842
<currency>EUR</currency>
843843
<weight_unit>KG</weight_unit>
844844
<measure_unit>CM</measure_unit>
845-
<region>EA</region>
845+
<region>EU</region>
846846
<name>Luxembourg</name>
847847
<domestic>1</domestic>
848848
</LU>
849849
<LV>
850850
<currency>LVL</currency>
851851
<weight_unit>KG</weight_unit>
852852
<measure_unit>CM</measure_unit>
853-
<region>EA</region>
853+
<region>EU</region>
854854
<name>Latvia</name>
855855
<domestic>1</domestic>
856856
</LV>
@@ -1039,15 +1039,15 @@
10391039
<currency>EUR</currency>
10401040
<weight_unit>KG</weight_unit>
10411041
<measure_unit>CM</measure_unit>
1042-
<region>EA</region>
1042+
<region>EU</region>
10431043
<name>Netherlands, The</name>
10441044
<domestic>1</domestic>
10451045
</NL>
10461046
<NO>
10471047
<currency>NOK</currency>
10481048
<weight_unit>KG</weight_unit>
10491049
<measure_unit>CM</measure_unit>
1050-
<region>EA</region>
1050+
<region>EU</region>
10511051
<name>Norway</name>
10521052
</NO>
10531053
<NP>
@@ -1127,7 +1127,7 @@
11271127
<currency>PLN</currency>
11281128
<weight_unit>KG</weight_unit>
11291129
<measure_unit>CM</measure_unit>
1130-
<region>EA</region>
1130+
<region>EU</region>
11311131
<name>Poland</name>
11321132
<domestic>1</domestic>
11331133
</PL>
@@ -1142,7 +1142,7 @@
11421142
<currency>EUR</currency>
11431143
<weight_unit>KG</weight_unit>
11441144
<measure_unit>CM</measure_unit>
1145-
<region>EA</region>
1145+
<region>EU</region>
11461146
<name>Portugal</name>
11471147
<domestic>1</domestic>
11481148
</PT>
@@ -1177,7 +1177,7 @@
11771177
<currency>RON</currency>
11781178
<weight_unit>KG</weight_unit>
11791179
<measure_unit>CM</measure_unit>
1180-
<region>EA</region>
1180+
<region>EU</region>
11811181
<name>Romania</name>
11821182
<domestic>1</domestic>
11831183
</RO>
@@ -1231,7 +1231,7 @@
12311231
<currency>SEK</currency>
12321232
<weight_unit>KG</weight_unit>
12331233
<measure_unit>CM</measure_unit>
1234-
<region>EA</region>
1234+
<region>EU</region>
12351235
<name>Sweden</name>
12361236
<domestic>1</domestic>
12371237
</SE>
@@ -1246,15 +1246,15 @@
12461246
<currency>EUR</currency>
12471247
<weight_unit>KG</weight_unit>
12481248
<measure_unit>CM</measure_unit>
1249-
<region>EA</region>
1249+
<region>EU</region>
12501250
<name>Slovenia</name>
12511251
<domestic>1</domestic>
12521252
</SI>
12531253
<SK>
12541254
<currency>EUR</currency>
12551255
<weight_unit>KG</weight_unit>
12561256
<measure_unit>CM</measure_unit>
1257-
<region>EA</region>
1257+
<region>EU</region>
12581258
<name>Slovakia</name>
12591259
<domestic>1</domestic>
12601260
</SK>

‎app/code/Magento/Dhl/Test/Unit/Model/_files/rates_request_data_dhl.php renamed to ‎app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_request_data.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
'limit_carrier' => null,
2525
'base_subtotal_incl_tax' => '5',
2626
'orig_country_id' => 'US',
27-
'country_id' => 'US',
28-
'region_id' => '12',
29-
'city' => 'Fremont',
30-
'postcode' => '94538',
27+
'orig_region_id' => '12',
28+
'orig_city' => 'Fremont',
29+
'orig_postcode' => '94538',
3130
'dhl_id' => 'MAGEN_8501',
3231
'dhl_password' => 'QR2GO1U74X',
3332
'dhl_account' => '799909537',

0 commit comments

Comments
 (0)