@@ -1661,7 +1661,7 @@ protected function _doRequest()
1661
1661
$ nodeDutiable ->addChild ('TermsOfTrade ' , 'DAP ' );
1662
1662
1663
1663
/** Export Declaration */
1664
- $ this ->getExportDeclaration ($ xml , $ rawRequest );
1664
+ $ this ->addExportDeclaration ($ xml , $ rawRequest );
1665
1665
1666
1666
}
1667
1667
/**
@@ -2195,7 +2195,7 @@ private function getGatewayURL(): string
2195
2195
* @param RateRequest $rawRequest
2196
2196
* @return void
2197
2197
*/
2198
- private function getExportDeclaration ( $ xml , $ rawRequest )
2198
+ private function addExportDeclaration ( \ Magento \ Shipping \ Model \ Simplexml \ Element $ xml , RateRequest $ rawRequest ): void
2199
2199
{
2200
2200
$ nodeExportDeclaration = $ xml ->addChild ('ExportDeclaration ' , '' , '' );
2201
2201
$ nodeExportDeclaration ->addChild (
@@ -2228,7 +2228,7 @@ private function getExportDeclaration($xml, $rawRequest)
2228
2228
$ nodeItemGrossWeight = $ nodeExportItem ->addChild ('GrossWeight ' );
2229
2229
$ nodeItemGrossWeight ->addChild ('Weight ' , $ itemData ['weight ' ]);
2230
2230
$ nodeItemGrossWeight ->addChild ('WeightUnit ' , $ itemWeightUnit );
2231
- $ nodeExportItem ->addChild ('ManufactureCountryCode ' , ' US ' );
2231
+ $ nodeExportItem ->addChild ('ManufactureCountryCode ' , $ rawRequest -> getShipperAddressCountryCode () );
2232
2232
}
2233
2233
}
2234
2234
}
@@ -2239,7 +2239,7 @@ private function getExportDeclaration($xml, $rawRequest)
2239
2239
* @param RateRequest $rawRequest
2240
2240
* @return string
2241
2241
*/
2242
- private function getInvoiceNumbers ($ rawRequest )
2242
+ private function getInvoiceNumbers (RateRequest $ rawRequest ): string
2243
2243
{
2244
2244
$ invoiceNumbers = [];
2245
2245
$ order = $ rawRequest ->getOrderShipment ()->getOrder ();
0 commit comments