Merge pull request #63 from magento-nord/develop (3e1f5a4d) · Commits · KIII-12 / Magento

Commit 3e1f5a4d authored 9 years ago by

Korshenko, Olexii(okorshenko)

Merge pull request #63 from magento-nord/develop

[Nord] GA Bug fixes

parents ec5598bd 1a584f8e

Branches

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php 12 additions, 10 deletions

...Magento/BundleImportExport/Model/Export/RowCustomizer.php
app/code/Magento/CatalogImportExport/Model/Export/Product.php 20 additions, 12 deletions

...code/Magento/CatalogImportExport/Model/Export/Product.php
app/code/Magento/CatalogImportExport/Model/Export/RowCustomizer/Composite.php 1 addition, 1 deletion

...alogImportExport/Model/Export/RowCustomizer/Composite.php
app/code/Magento/CatalogImportExport/Model/Export/RowCustomizerInterface.php 1 addition, 1 deletion

...talogImportExport/Model/Export/RowCustomizerInterface.php
app/code/Magento/CatalogImportExport/Model/Import/Product.php 215 additions, 186 deletions

...code/Magento/CatalogImportExport/Model/Import/Product.php
app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php 3 additions, 7 deletions

...ogImportExport/Model/Import/Product/CategoryProcessor.php
app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php 49 additions, 20 deletions

...to/CatalogImportExport/Model/Import/Product/Validator.php
app/code/Magento/CatalogImportExport/Model/Import/Uploader.php 1 addition, 1 deletion

...ode/Magento/CatalogImportExport/Model/Import/Uploader.php
app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php 2 additions, 1 deletion

.../Test/Unit/Model/Import/Product/CategoryProcessorTest.php
app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ValidatorTest.php 114 additions, 12 deletions

...rtExport/Test/Unit/Model/Import/Product/ValidatorTest.php
app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php 2 additions, 1 deletion

...atalogImportExport/Test/Unit/Model/Import/ProductTest.php
app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php 23 additions, 8 deletions

...to/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php 64 additions, 27 deletions

...ewrite/Test/Unit/Observer/AfterImportDataObserverTest.php
app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php 8 additions, 6 deletions

...o/ConfigurableImportExport/Model/Export/RowCustomizer.php
app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Export/RowCustomizerTest.php 7 additions, 5 deletions

...ImportExport/Test/Unit/Model/Export/RowCustomizerTest.php
app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php 2 additions, 1 deletion

...GroupedImportExport/Model/Import/Product/Type/Grouped.php
app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php 2 additions, 1 deletion

...Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php 8 additions, 7 deletions

...nto/ImportExport/Controller/Adminhtml/Import/Download.php
app/code/Magento/ImportExport/Files/Sample/catalog_product.csv 7 additions, 8 deletions

...ode/Magento/ImportExport/Files/Sample/catalog_product.csv
app/code/Magento/ImportExport/Model/Import.php 5 additions, 0 deletions

app/code/Magento/ImportExport/Model/Import.php

with 546 additions and 315 deletions

Please register or to comment

Admin message

Merge pull request #63 from magento-nord/develop