Skip to content

Commit 6d2e167

Browse files
committed
ACP2E-2129: customer is reporting their table rates are not updating via CSV any longer
- addressed bugs
1 parent cda5fab commit 6d2e167

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

app/code/Magento/OfflineShipping/Model/Plugin/AsyncConfig/Model/AsyncConfigPublisherPlugin.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ public function beforeSaveConfigData(AsyncConfigPublisher $subject, array $confi
5757
{
5858
$request = $this->requestFactory->create();
5959
$files = (array)$request->getFiles();
60-
if (!empty($files['groups']['tablerate']['fields']['import']['value'])) {
60+
61+
if (!empty($files['groups']['tablerate']['fields']['import']['value']['name'])) {
6162
$varDir = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
6263
$randomizedName = $this->rand->getRandomString(6) . '_' .
6364
$configData['groups']['tablerate']['fields']['import']['value']['name'];

app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Magento\AsyncConfig\Setup\ConfigOptionsList;
1616
use Magento\Framework\App\Config\ScopeConfigInterface;
1717
use Magento\Framework\App\DeploymentConfig;
18+
use Magento\Framework\App\Filesystem\DirectoryList;
1819
use Magento\Framework\App\ObjectManager;
1920
use Magento\Framework\App\RequestFactory;
2021
use Magento\Framework\DataObject;
@@ -417,11 +418,10 @@ private function getCsvFile($filePath)
417418
private function removeFile(string $filePath): bool
418419
{
419420
$pathInfo = $this->ioFile->getPathInfo($filePath);
420-
$dirName = $pathInfo['dirname'] ?? '';
421421
$fileName = $pathInfo['basename'] ?? '';
422422

423423
try {
424-
$directoryWrite = $this->filesystem->getDirectoryWrite($dirName);
424+
$directoryWrite = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
425425
return $directoryWrite->delete($fileName);
426426
} catch (FileSystemException $exception) {
427427
return false;

app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/Import.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ public function getColumns()
131131
public function getData(ReadInterface $file, $websiteId, $conditionShortName, $conditionFullName, $bunchSize = 5000)
132132
{
133133
$this->errors = [];
134+
$this->uniqueHash = [];
134135

135136
$headers = $this->getHeaders($file);
136137
/** @var ColumnResolver $columnResolver */

0 commit comments

Comments
 (0)