@@ -905,7 +905,7 @@ protected function getExportData()
905
905
$ dataRow = array_merge ($ dataRow , $ stockItemRows [$ productId ]);
906
906
}
907
907
$ this ->appendMultirowData ($ dataRow , $ multirawData );
908
- if ($ dataRow && ! $ this -> skipRow ( $ dataRow ) ) {
908
+ if ($ dataRow ) {
909
909
$ exportData [] = $ dataRow ;
910
910
}
911
911
}
@@ -1169,14 +1169,17 @@ private function appendMultirowData(&$dataRow, $multiRawData)
1169
1169
$ productLinkId = $ dataRow ['product_link_id ' ];
1170
1170
$ storeId = $ dataRow ['store_id ' ];
1171
1171
$ sku = $ dataRow [self ::COL_SKU ];
1172
+ $ type = $ dataRow [self ::COL_TYPE ];
1173
+ $ attributeSet = $ dataRow [self ::COL_ATTR_SET ];
1172
1174
1173
1175
unset($ dataRow ['product_id ' ]);
1174
1176
unset($ dataRow ['product_link_id ' ]);
1175
1177
unset($ dataRow ['store_id ' ]);
1176
1178
unset($ dataRow [self ::COL_SKU ]);
1177
-
1179
+ unset($ dataRow [self ::COL_STORE ]);
1180
+ unset($ dataRow [self ::COL_ATTR_SET ]);
1181
+ unset($ dataRow [self ::COL_TYPE ]);
1178
1182
if (Store::DEFAULT_STORE_ID == $ storeId ) {
1179
- unset($ dataRow [self ::COL_STORE ]);
1180
1183
$ this ->updateDataWithCategoryColumns ($ dataRow , $ multiRawData ['rowCategories ' ], $ productId );
1181
1184
if (!empty ($ multiRawData ['rowWebsites ' ][$ productId ])) {
1182
1185
$ websiteCodes = [];
@@ -1274,6 +1277,9 @@ private function appendMultirowData(&$dataRow, $multiRawData)
1274
1277
$ dataRow [self ::COL_STORE ] = $ this ->_storeIdToCode [$ storeId ];
1275
1278
}
1276
1279
$ dataRow [self ::COL_SKU ] = $ sku ;
1280
+ $ dataRow [self ::COL_ATTR_SET ] = $ attributeSet ;
1281
+ $ dataRow [self ::COL_TYPE ] = $ type ;
1282
+
1277
1283
return $ dataRow ;
1278
1284
}
1279
1285
@@ -1512,25 +1518,4 @@ protected function getProductEntityLinkField()
1512
1518
}
1513
1519
return $ this ->productEntityLinkField ;
1514
1520
}
1515
-
1516
- /**
1517
- * Check if row has valuable information to export.
1518
- *
1519
- * @param array $dataRow
1520
- * @return bool
1521
- */
1522
- private function skipRow (array $ dataRow )
1523
- {
1524
- $ baseInfo = [
1525
- self ::COL_STORE ,
1526
- self ::COL_ATTR_SET ,
1527
- self ::COL_TYPE ,
1528
- self ::COL_SKU ,
1529
- 'store_id ' ,
1530
- 'product_id ' ,
1531
- 'product_link_id ' ,
1532
- ];
1533
-
1534
- return empty (array_diff (array_keys ($ dataRow ), $ baseInfo ));
1535
- }
1536
1521
}
0 commit comments