File tree Expand file tree Collapse file tree 3 files changed +8
-1
lines changed
app/code/Magento/Ups/Model
dev/tests/integration/testsuite/Magento/Ups Expand file tree Collapse file tree 3 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -1118,6 +1118,7 @@ protected function _getXmlTracking($trackings)
1118
1118
1119
1119
/** @var HttpResponseDeferredInterface[] $trackingResponses */
1120
1120
$ trackingResponses = [];
1121
+ $ tracking = '' ;
1121
1122
foreach ($ trackings as $ tracking ) {
1122
1123
/**
1123
1124
* RequestOption==>'1' to request all activities
@@ -1362,6 +1363,7 @@ public function getAllowedMethods()
1362
1363
protected function _formShipmentRequest (DataObject $ request )
1363
1364
{
1364
1365
$ packages = $ request ->getPackages ();
1366
+ $ shipmentItems = [];
1365
1367
foreach ($ packages as $ package ) {
1366
1368
$ shipmentItems [] = $ package ['items ' ];
1367
1369
}
@@ -1624,6 +1626,7 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
1624
1626
$ xmlResponse = '' ;
1625
1627
}
1626
1628
1629
+ $ response = '' ;
1627
1630
try {
1628
1631
$ response = $ this ->_xmlElFactory ->create (['data ' => $ xmlResponse ]);
1629
1632
} catch (Throwable $ e ) {
@@ -1800,6 +1803,7 @@ protected function _doShipmentRequest(DataObject $request)
1800
1803
$ this ->setXMLAccessRequest ();
1801
1804
$ xmlRequest = $ this ->_xmlAccessRequest . $ rawXmlRequest ;
1802
1805
$ xmlResponse = $ this ->_getCachedQuotes ($ xmlRequest );
1806
+ $ debugData = [];
1803
1807
1804
1808
if ($ xmlResponse === null ) {
1805
1809
$ debugData ['request ' ] = $ this ->filterDebugData ($ this ->_xmlAccessRequest ) . $ rawXmlRequest ;
Original file line number Diff line number Diff line change @@ -252,6 +252,8 @@ public function testRequestToShipment(): void
252
252
'weight ' => '0.55 ' ,
253
253
'customs_value ' => '20.00 ' ,
254
254
'container ' => 'Large Express Box ' ,
255
+ 'delivery_confirmation_level ' => 1 ,
256
+ 'delivery_confirmation ' => 0 ,
255
257
],
256
258
'items ' => [
257
259
'item2 ' => [
@@ -262,6 +264,7 @@ public function testRequestToShipment(): void
262
264
]
263
265
]
264
266
);
267
+ $ request ->setRecipientAddressCountryCode ('UK ' );
265
268
266
269
$ result = $ this ->carrier ->requestToShipment ($ request );
267
270
Original file line number Diff line number Diff line change 27
27
<AddressLine1 />
28
28
<AddressLine2 />
29
29
<City />
30
- <CountryCode / >
30
+ <CountryCode >UK</ CountryCode >
31
31
<PostalCode />
32
32
<ResidentialAddress />
33
33
</Address >
You can’t perform that action at this time.
0 commit comments