Skip to content

Commit f78b8ee

Browse files
author
Alex Bomko
committed
MAGETWO-42918: Deploy SD to public
1 parent 3cc5bb6 commit f78b8ee

File tree

2 files changed

+20
-23
lines changed

2 files changed

+20
-23
lines changed

app/code/Magento/ConfigurableSampleData/Model/Product.php

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
*/
66
namespace Magento\ConfigurableSampleData\Model;
77

8-
use Magento\Framework\App\Filesystem\DirectoryList;
8+
use Magento\Framework\Component\ComponentRegistrar;
9+
use Magento\Framework\Filesystem\Directory\ReadFactory;
910
use Magento\ImportExport\Model\Import;
1011
use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
1112

@@ -25,34 +26,42 @@ class Product
2526
private $csvSourceFactory;
2627

2728
/**
28-
* @var \Magento\Framework\Filesystem
29+
* @var \Magento\Framework\Filesystem\Directory\ReadFactory
2930
*/
30-
private $filesystem;
31+
private $readFactory;
3132

3233
/**
3334
* @var \Magento\Indexer\Model\Indexer\CollectionFactory
3435
*/
3536
private $indexerCollectionFactory;
3637

38+
/**
39+
* @var \Magento\Framework\Component\ComponentRegistrar
40+
*/
41+
private $componentRegistrar;
42+
3743
/**
3844
* @param \Magento\Eav\Model\Config $eavConfig
3945
* @param \Magento\ImportExport\Model\Import $importModel
4046
* @param \Magento\ImportExport\Model\Import\Source\CsvFactory $csvSourceFactory
4147
* @param \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory
42-
* @param \Magento\Framework\Filesystem $filesystem
48+
* @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
49+
* @param \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
4350
*/
4451
public function __construct(
4552
\Magento\Eav\Model\Config $eavConfig,
4653
\Magento\ImportExport\Model\Import $importModel,
4754
\Magento\ImportExport\Model\Import\Source\CsvFactory $csvSourceFactory,
4855
\Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory,
49-
\Magento\Framework\Filesystem $filesystem
56+
\Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
57+
\Magento\Framework\Component\ComponentRegistrar $componentRegistrar
5058
) {
5159
$this->eavConfig = $eavConfig;
5260
$this->importModel = $importModel;
5361
$this->csvSourceFactory = $csvSourceFactory;
5462
$this->indexerCollectionFactory = $indexerCollectionFactory;
55-
$this->filesystem = $filesystem;
63+
$this->filesystem = $readFactory;
64+
$this->componentRegistrar = $componentRegistrar;
5665
}
5766

5867
/**
@@ -73,14 +82,15 @@ public function install()
7382

7483
$source = $this->csvSourceFactory->create(
7584
[
76-
'file' => 'Magento/ConfigurableSampleData/fixtures/products.csv',
77-
'directory' => $this->filesystem->getDirectoryWrite(DirectoryList::MODULES)
85+
'file' => 'fixtures/products.csv',
86+
'directory' => $this->readFactory->create(
87+
$this->componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_SampleData')
88+
)
7889
]
7990
);
8091

8192
$currentPath = getcwd();
82-
chdir($this->filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath());
83-
93+
chdir(BP);
8494
$importModel->validateSource($source);
8595
$importModel->importSource();
8696

app/code/Magento/SalesSampleData/Model/Order/Processor.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,6 @@ protected function refundOrder(\Magento\Sales\Model\Order\Item $orderItem)
262262
if ($creditmemo && $creditmemo->isValidGrandTotal()) {
263263
$creditmemo->setOfflineRequested(true);
264264
$this->creditmemoManagement->refund($creditmemo, true);
265-
$creditmemoTransaction = $this->transactionFactory->create()
266-
->addObject($creditmemo)
267-
->addObject($creditmemo->getOrder());
268-
$creditmemoTransaction->save();
269265
}
270266
}
271267

@@ -276,15 +272,6 @@ protected function refundOrder(\Magento\Sales\Model\Order\Item $orderItem)
276272
public function getCreditmemoData(\Magento\Sales\Model\Order\Item $orderItem)
277273
{
278274
$data = [$orderItem->getId() => $orderItem->getQtyToRefund()];
279-
// foreach ($this->observerManager->getObservers() as $observer) {
280-
// if (is_callable([$observer, 'getCreditmemoData'])) {
281-
// $params = new DataObject([
282-
// 'order_item' => $orderItem,
283-
// 'credit_memo' => $data
284-
// ]);
285-
// $data = $observer->getCreditmemoData($params);
286-
// }
287-
// }
288275

289276
return $data;
290277
}

0 commit comments

Comments
 (0)