B2B-1875:Cannot import table rates CSV when S3 Remote Storage is enabled

avattam06 · avattam06 · commit 54ecb8e22f6d · 2021-08-18T16:21:15.000-05:00
- Added bug fix changes to import table rates
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
@@ -321,10 +321,10 @@ public function getConditionName(\Magento\Framework\DataObject $object)
     private function getCsvFile($filePath)
     {
         $pathInfo = pathinfo($filePath);
-        $dirName = isset($pathInfo['dirname']) ? $pathInfo['dirname'] : '';
-        $fileName = isset($pathInfo['basename']) ? $pathInfo['basename'] : '';
+        $dirName = $pathInfo['dirname'] ?? '';
+        $fileName = $pathInfo['basename'] ?? '';
 
-        $directoryRead = $this->filesystem->getDirectoryReadByPath($dirName);
+        $directoryRead = $this->filesystem->getDirectoryReadByPath($dirName, Filesystem\DriverPool::FILE);
 
         return $directoryRead->openFile($fileName);
     }

Original file line number	Diff line number	Diff line change
`@@ -321,10 +321,10 @@ public function getConditionName(\Magento\Framework\DataObject $object)`
`321`	`321`	`private function getCsvFile($filePath)`
`322`	`322`	`{`
`323`	`323`	`$pathInfo = pathinfo($filePath);`
`324`		`- $dirName = isset($pathInfo['dirname']) ? $pathInfo['dirname'] : '';`
`325`		`- $fileName = isset($pathInfo['basename']) ? $pathInfo['basename'] : '';`
	`324`	`+ $dirName = $pathInfo['dirname'] ?? '';`
	`325`	`+ $fileName = $pathInfo['basename'] ?? '';`
`326`	`326`
`327`		`- $directoryRead = $this->filesystem->getDirectoryReadByPath($dirName);`
	`327`	`+ $directoryRead = $this->filesystem->getDirectoryReadByPath($dirName, Filesystem\DriverPool::FILE);`
`328`	`328`
`329`	`329`	`return $directoryRead->openFile($fileName);`
`330`	`330`	`}`