File tree Expand file tree Collapse file tree 4 files changed +3
-31
lines changed
app/code/Magento/ImportExport/Model Expand file tree Collapse file tree 4 files changed +3
-31
lines changed Original file line number Diff line number Diff line change @@ -523,14 +523,7 @@ public function importSource()
523
523
} else {
524
524
$ this ->importHistoryModel ->invalidateReport ($ this );
525
525
}
526
- try {
527
- if ($ this ->_getEntityAdapter ()->getSource () instanceof Base64EncodedCsvData) {
528
- //$this->getDataSourceModel()->cleanBunchesWithId($ids);
529
- }
530
- // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
531
- } catch (LocalizedException $ e ) {
532
- //Do nothing if Source is not set
533
- }
526
+
534
527
return $ result ;
535
528
}
536
529
Original file line number Diff line number Diff line change 14
14
use Magento \ImportExport \Model \Import ;
15
15
use Magento \ImportExport \Model \Import \ErrorProcessing \ProcessingError ;
16
16
use Magento \ImportExport \Model \Import \ErrorProcessing \ProcessingErrorAggregatorInterface ;
17
- use Magento \ImportExport \Model \Import \Source \Base64EncodedCsvData ;
18
17
use Magento \ImportExport \Model \ImportFactory ;
19
18
use Magento \ImportExport \Model \ResourceModel \Helper ;
20
19
use Magento \Store \Model \ScopeInterface ;
@@ -421,9 +420,7 @@ protected function _saveValidatedBunches()
421
420
$ startNewBunch = false ;
422
421
423
422
$ source ->rewind ();
424
- if (!$ source instanceof Base64EncodedCsvData) {
425
- $ this ->_dataSourceModel ->cleanBunches ();
426
- }
423
+ $ this ->_dataSourceModel ->cleanProcessedBunches ();
427
424
$ mainAttributeCode = $ this ->getMasterAttributeCode ();
428
425
429
426
while ($ source ->valid () || count ($ bunchRows ) || isset ($ entityGroup )) {
Original file line number Diff line number Diff line change 13
13
use Magento \ImportExport \Model \Import as ImportExport ;
14
14
use Magento \ImportExport \Model \Import \ErrorProcessing \ProcessingError ;
15
15
use Magento \ImportExport \Model \Import \ErrorProcessing \ProcessingErrorAggregatorInterface ;
16
- use Magento \ImportExport \Model \Import \Source \Base64EncodedCsvData ;
17
16
18
17
/**
19
18
* Import entity abstract model
@@ -395,9 +394,7 @@ protected function _saveValidatedBunches()
395
394
$ skuSet = [];
396
395
397
396
$ source ->rewind ();
398
- if (!$ source instanceof Base64EncodedCsvData) {
399
- $ this ->_dataSourceModel ->cleanBunches ();
400
- }
397
+ $ this ->_dataSourceModel ->cleanProcessedBunches ();
401
398
402
399
while ($ source ->valid () || $ bunchRows ) {
403
400
if ($ startNewBunch || !$ source ->valid ()) {
Original file line number Diff line number Diff line change @@ -116,21 +116,6 @@ public function cleanBunches()
116
116
return $ this ->getConnection ()->delete ($ this ->getMainTable ());
117
117
}
118
118
119
- /**
120
- * Clean bunches with specific Ids
121
- *
122
- * @param array $ids
123
- * @return void
124
- */
125
- public function cleanBunchesWithId (array $ ids )
126
- {
127
- $ this ->getConnection ()->delete (
128
- $ this ->getMainTable (),
129
- [
130
- 'id IN (?) ' => $ ids ,
131
- ]
132
- );
133
- }
134
119
135
120
/**
136
121
* Clean all bunches from table.
You can’t perform that action at this time.
0 commit comments