Merge remote-tracking branch 'origin/develop' into S60PR

Author: Viktor Paladiychuk

app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php

@@ -3,42 +3,45 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 namespace Magento\Dhl\Block\Adminhtml;
 
+use Magento\Dhl\Model;
+use Magento\Shipping\Helper;
+use Magento\Backend\Block\Template\Context;
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
 /**
  * Frontend model for DHL shipping methods for documentation
  */
-class Unitofmeasure extends \Magento\Config\Block\System\Config\Form\Field
+class Unitofmeasure extends Field
 {
     /**
      * Carrier helper
      *
-     * @var \Magento\Shipping\Helper\Carrier
+     * @var Helper\Carrier
      */
-    protected $_carrierHelper;
+    protected $carrierHelper;
 
     /**
-     * @var \Magento\Dhl\Model\Carrier
+     * @var Model\Carrier
      */
     protected $carrierDhl;
 
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Dhl\Model\Carrier $carrierDhl
-     * @param \Magento\Shipping\Helper\Carrier $carrierHelper
+     * @param Context $context
+     * @param Model\Carrier $carrierDhl
+     * @param Helper\Carrier $carrierHelper
      * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Dhl\Model\Carrier $carrierDhl,
-        \Magento\Shipping\Helper\Carrier $carrierHelper,
+        Context $context,
+        Model\Carrier $carrierDhl,
+        Helper\Carrier $carrierHelper,
         array $data = []
     ) {
         $this->carrierDhl = $carrierDhl;
-        $this->_carrierHelper = $carrierHelper;
+        $this->carrierHelper = $carrierHelper;
         parent::__construct($context, $data);
     }
 
@@ -51,29 +54,25 @@ public function _construct()
     {
         parent::_construct();
 
-        $carrierModel = $this->carrierDhl;
+        $this->setInch($this->carrierDhl->getCode('unit_of_dimension_cut', 'I'));
+        $this->setCm($this->carrierDhl->getCode('unit_of_dimension_cut', 'C'));
 
-        $this->setInch($this->escapeJsQuote($carrierModel->getCode('unit_of_dimension_cut', 'I')));
-        $this->setCm($this->escapeJsQuote($carrierModel->getCode('unit_of_dimension_cut', 'C')));
-
-        $this->setHeight($this->escapeJsQuote($carrierModel->getCode('dimensions', 'height')));
-        $this->setDepth($this->escapeJsQuote($carrierModel->getCode('dimensions', 'depth')));
-        $this->setWidth($this->escapeJsQuote($carrierModel->getCode('dimensions', 'width')));
+        $this->setHeight($this->carrierDhl->getCode('dimensions', 'height'));
+        $this->setDepth($this->carrierDhl->getCode('dimensions', 'depth'));
+        $this->setWidth($this->carrierDhl->getCode('dimensions', 'width'));
 
         $kgWeight = 70;
 
         $this->setDivideOrderWeightNoteKg(
-            $this->escapeJsQuote(
-                __(
-                    'Select this to allow DHL to optimize shipping charges by splitting the order if it exceeds %1 %2.',
-                    $kgWeight,
-                    'kg'
-                )
+            __(
+                'Select this to allow DHL to optimize shipping charges by splitting the order if it exceeds %1 %2.',
+                $kgWeight,
+                'kg'
             )
         );
 
         $weight = round(
-            $this->_carrierHelper->convertMeasureWeight(
+            $this->carrierHelper->convertMeasureWeight(
                 $kgWeight,
                 \Zend_Measure_Weight::KILOGRAM,
                 \Zend_Measure_Weight::POUND
@@ -82,12 +81,10 @@ public function _construct()
         );
 
         $this->setDivideOrderWeightNoteLbp(
-            $this->escapeJsQuote(
-                __(
-                    'Select this to allow DHL to optimize shipping charges by splitting the order if it exceeds %1 %2.',
-                    $weight,
-                    'pounds'
-                )
+            __(
+                'Select this to allow DHL to optimize shipping charges by splitting the order if it exceeds %1 %2.',
+                $weight,
+                'pounds'
             )
         );
 
@@ -97,10 +94,10 @@ public function _construct()
     /**
      * Retrieve Element HTML fragment
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
-    protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    protected function _getElementHtml(AbstractElement $element)
     {
         return parent::_getElementHtml($element) . $this->_toHtml();
     }

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

@@ -39,6 +39,11 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
     const DIMENSION_MIN_IN = 1;
     /**#@-*/
 
+    /**
+     * Config path to UE country list
+     */
+    const XML_PATH_EU_COUNTRIES_LIST = 'general/country/eu_countries';
+
     /**
      * Container types that could be customized
      *
@@ -924,7 +929,7 @@ protected function _getQuotes()
                 $bodyXml = $this->_xmlElFactory->create(['data' => $responseBody]);
                 $code = $bodyXml->xpath('//GetQuoteResponse/Note/Condition/ConditionCode');
                 if (isset($code[0]) && (int)$code[0] == self::CONDITION_CODE_SERVICE_DATE_UNAVAILABLE) {
-                    $debugPoint['info'] = sprintf(__('DHL service is not available on %s.'), $date);
+                    $debugPoint['info'] = sprintf(__("DHL service is not available at %s date"), $date);
                 } else {
                     break;
                 }
@@ -1001,9 +1006,7 @@ protected function _buildQuotesRequestXml()
         $nodeTo->addChild('Postalcode', $rawRequest->getDestPostal());
         $nodeTo->addChild('City', $rawRequest->getDestCity());
 
-        $this->_checkDomesticStatus($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId());
-
-        if ($this->getConfigData('content_type') == self::DHL_CONTENT_TYPE_NON_DOC && !$this->_isDomestic) {
+        if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
             // IsDutiable flag and Dutiable node indicates that cargo is not a documentation
             $nodeBkgDetails->addChild('IsDutiable', 'Y');
             $nodeDutiable = $nodeGetQuote->addChild('Dutiable');
@@ -1042,7 +1045,7 @@ protected function _setQuotesRequestXmlDate(\SimpleXMLElement $requestXml, $date
      */
     protected function _parseResponse($response)
     {
-        $responseError = __('Please enter a response in the correct format.');
+        $responseError = __('The response is in wrong format.');
 
         if (strlen(trim($response)) > 0) {
             if (strpos(trim($response), '<?xml') === 0) {
@@ -1162,7 +1165,7 @@ protected function _addRate(\SimpleXMLElement $shipmentDetails)
                     if (!isset($rates[$currencyCode]) || !$totalEstimate) {
                         $totalEstimate = false;
                         $this->_errors[] = __(
-                            'We had to skip DHL method %1 because we can\'t find exchange rate %2 (Base Currency).',
+                            'We had to skip DHL method %1 because we couldn\'t find exchange rate %2 (Base Currency).',
                             $currencyCode,
                             $baseCurrencyCode
                         );
@@ -1284,7 +1287,7 @@ public function proccessAdditionalValidation(\Magento\Framework\DataObject $requ
     {
         //Skip by item validation if there is no items in request
         if (!count($this->getAllItems($request))) {
-            $this->_errors[] = __('There are no items in this order.');
+            $this->_errors[] = __('There is no items in this order');
         }
 
         $countryParams = $this->getCountryParams(
@@ -1295,7 +1298,7 @@ public function proccessAdditionalValidation(\Magento\Framework\DataObject $requ
             )
         );
         if (!$countryParams->getData()) {
-            $this->_errors[] = __('Please specify an origin country.');
+            $this->_errors[] = __('Please, specify origin country');
         }
 
         if (!empty($this->_errors)) {
@@ -1342,7 +1345,7 @@ protected function _mapRequestToShipment(\Magento\Framework\DataObject $request)
             if ($params['width'] || $params['length'] || $params['height']) {
                 $minValue = $this->_getMinDimension($params['dimension_units']);
                 if ($params['width'] < $minValue || $params['length'] < $minValue || $params['height'] < $minValue) {
-                    $message = __('Height, width and length should be equal or greater than %1.', $minValue);
+                    $message = __('Height, width and length should be equal or greater than %1', $minValue);
                     throw new \Magento\Framework\Exception\LocalizedException($message);
                 }
             }
@@ -1487,13 +1490,11 @@ protected function _doRequest()
         $nodeCommodity = $xml->addChild('Commodity', '', '');
         $nodeCommodity->addChild('CommodityCode', '1');
 
-        $this->_checkDomesticStatus(
+        /** Dutiable */
+        if ($this->isDutiable(
             $rawRequest->getShipperAddressCountryCode(),
             $rawRequest->getRecipientAddressCountryCode()
-        );
-
-        /** Dutiable */
-        if ($this->getConfigData('content_type') == self::DHL_CONTENT_TYPE_NON_DOC && !$this->_isDomestic) {
+        )) {
             $nodeDutiable = $xml->addChild('Dutiable', '', '');
             $nodeDutiable->addChild(
                 'DeclaredValue',
@@ -1651,7 +1652,7 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
                 $packageType = 'CP';
             }
             $nodeShipmentDetails->addChild('PackageType', $packageType);
-            if ($this->getConfigData('content_type') == self::DHL_CONTENT_TYPE_NON_DOC) {
+            if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
                 $nodeShipmentDetails->addChild('IsDutiable', 'Y');
             }
             $nodeShipmentDetails->addChild(
@@ -1775,7 +1776,7 @@ protected function _getXMLTracking($trackings)
      */
     protected function _parseXmlTrackingResponse($trackings, $response)
     {
-        $errorTitle = __('For some reason we can\'t retrieve tracking info right now.');
+        $errorTitle = __('Unable to retrieve tracking');
         $resultArr = [];
 
         if (strlen(trim($response)) > 0) {
@@ -1799,7 +1800,7 @@ protected function _parseXmlTrackingResponse($trackings, $response)
                     $awbinfoData = [];
                     $trackNum = isset($awbinfo->AWBNumber) ? (string)$awbinfo->AWBNumber : '';
                     if (!is_object($awbinfo) || !$awbinfo->ShipmentInfo) {
-                        $this->_errors[$trackNum] = __('For some reason we can\'t retrieve tracking info right now.');
+                        $this->_errors[$trackNum] = __('Unable to retrieve tracking');
                         continue;
                     }
                     $shipmentInfo = $awbinfo->ShipmentInfo;
@@ -1920,7 +1921,11 @@ protected function _checkDomesticStatus($origCountryCode, $destCountryCode)
         $destCountry = (string)$this->getCountryParams($destCountryCode)->getData('name');
         $isDomestic = (string)$this->getCountryParams($destCountryCode)->getData('domestic');
 
-        if ($origCountry == $destCountry && $isDomestic) {
+        if (($origCountry == $destCountry && $isDomestic)
+            || ($this->_carrierHelper->isCountryInEU($origCountryCode)
+                && $this->_carrierHelper->isCountryInEU($destCountryCode)
+            )
+        ) {
             $this->_isDomestic = true;
         }
 
@@ -1950,4 +1955,19 @@ protected function _prepareShippingLabelContent(\SimpleXMLElement $xml)
 
         return $result;
     }
+
+    /**
+     * @param string $origCountryId
+     * @param string $destCountryId
+     *
+     * @return bool
+     */
+    protected function isDutiable($origCountryId, $destCountryId)
+    {
+        $this->_checkDomesticStatus($origCountryId, $destCountryId);
+
+        return
+            self::DHL_CONTENT_TYPE_NON_DOC == $this->getConfigData('content_type')
+            && !$this->_isDomestic;
+    }
 }

app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml

@@ -3,40 +3,34 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-?>
-<?php
 /**
- * @var $block \Magento\Dhl\Block\Adminhtml\Unitofmeasure
+ * @var \Magento\Dhl\Block\Adminhtml\Unitofmeasure $block
  */
 ?>
 <script>
-require(['prototype'], function(){
-
     //<![CDATA[
-    function changeDimensions()
-    {
-        var dimensionUnit = '(<?php /* @escapeNotVerified */ echo $block->getInch(); ?>)';
-        var dhlUnitOfMeasureNote = '<?php /* @escapeNotVerified */ echo $block->getDivideOrderWeightNoteLbp(); ?>';
-        if ($("carriers_dhl_unit_of_measure").value == "K") {
-            dimensionUnit = '(<?php /* @escapeNotVerified */ echo $block->getCm(); ?>)';
-            dhlUnitOfMeasureNote = '<?php /* @escapeNotVerified */ echo $block->getDivideOrderWeightNoteKg(); ?>';
-        }
-        $$('[for="carriers_dhl_height"]')[0].innerHTML = '<?php /* @escapeNotVerified */ echo $block->getHeight(); ?> ' + dimensionUnit;
-        $$('[for="carriers_dhl_depth"]')[0].innerHTML = '<?php /* @escapeNotVerified */ echo $block->getDepth(); ?> ' + dimensionUnit;
-        $$('[for="carriers_dhl_width"]')[0].innerHTML = '<?php /* @escapeNotVerified */ echo $block->getWidth(); ?> ' + dimensionUnit;
+    require(["prototype"], function(){
+        function changeDimensions() {
+            var dimensionUnit = "(<?php echo $block->escapeHtml($block->getInch()); ?>)";
+            var dhlUnitOfMeasureNote = "<?php echo $block->escapeHtml($block->getDivideOrderWeightNoteLbp()); ?>";
+            if ($("carriers_dhl_unit_of_measure").value == "K") {
+                dimensionUnit = "(<?php echo $block->escapeHtml($block->getCm()); ?>)";
+                dhlUnitOfMeasureNote = "<?php echo $block->escapeHtml($block->getDivideOrderWeightNoteKg()); ?>";
+            }
+            $$('[for="carriers_dhl_height"]')[0].innerHTML = "<?php
+                echo $block->escapeHtml($block->getHeight()); ?> " + dimensionUnit;
+            $$('[for="carriers_dhl_depth"]')[0].innerHTML = "<?php
+                echo $block->escapeHtml($block->getDepth()); ?> " + dimensionUnit;
+            $$('[for="carriers_dhl_width"]')[0].innerHTML = "<?php
+                echo $block->escapeHtml($block->getWidth()); ?> " + dimensionUnit;
 
-        $('carriers_dhl_divide_order_weight').next().down().innerHTML = dhlUnitOfMeasureNote;
-    }
-
-    window.changeDimensions = changeDimensions;
-
-    document.observe("dom:loaded", function() {
-        $("carriers_dhl_unit_of_measure").observe("change", changeDimensions);
-        changeDimensions();
+            $("carriers_dhl_divide_order_weight").next().down().innerHTML = dhlUnitOfMeasureNote;
+        }
+        window.changeDimensions = changeDimensions;
+        document.observe("dom:loaded", function() {
+            $("carriers_dhl_unit_of_measure").observe("change", changeDimensions);
+            changeDimensions();
+        });
     });
     //]]>
-
-});
 </script>

app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php

@@ -33,10 +33,21 @@ class Csv extends \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter
      */
     protected $_fileHandler;
 
+    /**
+     * {@inheritdoc }
+     */
+    public function __construct(\Magento\Framework\Filesystem $filesystem, $destination = null)
+    {
+        register_shutdown_function([$this, 'destruct']);
+        parent::__construct($filesystem, $destination);
+    }
+
     /**
      * Object destructor.
+     *
+     * @return void
      */
-    public function __destruct()
+    public function destruct()
     {
         if (is_object($this->_fileHandler)) {
             $this->_fileHandler->close();

app/code/Magento/ImportExport/Model/Import/Source/Csv.php

@@ -44,6 +44,7 @@ public function __construct(
         $delimiter = ',',
         $enclosure = '"'
     ) {
+        register_shutdown_function([$this, 'destruct']);
         try {
             $this->_file = $directory->openFile($directory->getRelativePath($file), 'r');
         } catch (\Magento\Framework\Exception\FileSystemException $e) {
@@ -58,8 +59,10 @@ public function __construct(
 
     /**
      * Close file handle
+     *
+     * @return void
      */
-    public function __destruct()
+    public function destruct()
     {
         if (is_object($this->_file)) {
             $this->_file->close();