Skip to content

Commit

Permalink
Merge pull request #187 in PLUG_OPEN/backend_swagimportexport from bu…
Browse files Browse the repository at this point in the history 
…gfix/pt-4564/fix-configurator-set-name to master

* commit 'd6bd6473c1b2d81cdd21e5534d6170d2f8f894b5':
  PT-4564 - Add configSetName column to articles profile
  • Loading branch information
Patrick Stahl authored and Patrick Stahl committed Sep 2, 2016
2 parents 2472438 + d6bd647 commit a3a4c72
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Components/SwagImportExport/DbAdapters/ArticlesDbAdapter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1416,9 +1416,9 @@ public function getConfiguratorBuilder($columns, $ids)
$configBuilder->select($columns)
->from('Shopware\Models\Article\Detail', 'variant')
->join('variant.article', 'article')
->leftjoin('variant.configuratorOptions', 'configuratorOptions')
->leftjoin('configuratorOptions.group', 'configuratorGroup')
->leftjoin('article.configuratorSet', 'configuratorSet')
->leftJoin('variant.configuratorOptions', 'configuratorOptions')
->leftJoin('configuratorOptions.group', 'configuratorGroup')
->leftJoin('article.configuratorSet', 'configuratorSet')
->where('variant.id IN (:ids)')
->andWhere('configuratorOptions.id IS NOT NULL')
->andWhere('configuratorGroup.id IS NOT NULL')
Expand Down
1 change: 0 additions & 1 deletion Components/SwagImportExport/Transformers/DataTransformerChain.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public function transformBackward($data)
public function composeHeader()
{
$transformer = $this->getLastComposerTransformer($this->chain);

return $transformer->composeHeader();
}

Expand Down
2 changes: 1 addition & 1 deletion Components/SwagImportExport/Utils/TreeHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ public static function getDefaultTreeByProfileType($profileType)
case 'categories':
return '{"id":"root","name":"Root","type":"node","children":[{"id":"537359399c80a","name":"Header","index":0,"type":"node","children":[{"id":"537385ed7c799","name":"HeaderChild","index":0,"type":"node","shopwareField":""}]},{"id":"537359399c8b7","name":"categories","index":1,"type":"node","children":[{"id":"537359399c90d","name":"category","index":0,"type":"iteration","adapter":"default","attributes":null,"children":[{"id":"53e9f539a997d","type":"leaf","index":0,"name":"categoryId","shopwareField":"categoryId"},{"id":"53e0a853f1b98","type":"leaf","index":1,"name":"parentID","shopwareField":"parentId"},{"id":"53e0cf5cad595","type":"leaf","index":2,"name":"description","shopwareField":"name"},{"id":"53e9f69bf2edb","type":"leaf","index":3,"name":"position","shopwareField":"position"},{"id":"53e0d1414b0ad","type":"leaf","index":4,"name":"metatitle","shopwareField":"metaTitle"},{"id":"53e0d1414b0d7","type":"leaf","index":5,"name":"metakeywords","shopwareField":"metaKeywords"},{"id":"53e0d17da1f06","type":"leaf","index":6,"name":"metadescription","shopwareField":"metaDescription"},{"id":"53e9f5c0eedaf","type":"leaf","index":7,"name":"cmsheadline","shopwareField":"cmsHeadline"},{"id":"53e9f5d80f10f","type":"leaf","index":8,"name":"cmstext","shopwareField":"cmsText"},{"id":"53e9f5e603ffe","type":"leaf","index":9,"name":"template","shopwareField":"template"},{"id":"53e9f5f87c87a","type":"leaf","index":10,"name":"active","shopwareField":"active"},{"id":"53e9f609c56eb","type":"leaf","index":11,"name":"blog","shopwareField":"blog"},{"id":"53e9f62a03f55","type":"leaf","index":13,"name":"external","shopwareField":"external"},{"id":"53e9f637aa1fe","type":"leaf","index":14,"name":"hidefilter","shopwareField":"hideFilter"},{"id":"541c35c378bc9","type":"leaf","index":15,"name":"attribute_attribute1","shopwareField":"attributeAttribute1"},{"id":"541c36d0bba0f","type":"leaf","index":16,"name":"attribute_attribute2","shopwareField":"attributeAttribute2"},{"id":"541c36d63fac6","type":"leaf","index":17,"name":"attribute_attribute3","shopwareField":"attributeAttribute3"},{"id":"541c36da52222","type":"leaf","index":18,"name":"attribute_attribute4","shopwareField":"attributeAttribute4"},{"id":"541c36dc540e3","type":"leaf","index":19,"name":"attribute_attribute5","shopwareField":"attributeAttribute5"},{"id":"541c36dd9e130","type":"leaf","index":20,"name":"attribute_attribute6","shopwareField":"attributeAttribute6"},{"id":"54dc86ff4bee5","name":"CustomerGroups","index":21,"type":"iteration","adapter":"customerGroups","parentKey":"categoryId","shopwareField":"","children":[{"id":"54dc87118ad11","type":"leaf","index":0,"name":"CustomerGroup","shopwareField":"customerGroupId"}]}]}]}]}';
case 'articles':
return '{"id":"root","name":"Root","type":"node","children":[{"id":"4","name":"articles","index":0,"type":"","children":[{"id":"53e0d3148b0b2","name":"article","index":0,"type":"iteration","adapter":"article","parentKey":"","shopwareField":"","children":[{"id":"53e0d365881b7","type":"leaf","index":0,"name":"ordernumber","shopwareField":"orderNumber"},{"id":"53e0d329364c4","type":"leaf","index":1,"name":"mainnumber","shopwareField":"mainNumber"},{"id":"53e0d3a201785","type":"leaf","index":2,"name":"name","shopwareField":"name"},{"id":"53fb1c8c99aac","type":"leaf","index":3,"name":"additionalText","shopwareField":"additionalText"},{"id":"53e0d3fea6646","type":"leaf","index":4,"name":"supplier","shopwareField":"supplierName"},{"id":"53e0d4333dca7","type":"leaf","index":5,"name":"tax","shopwareField":"tax"},{"id":"53e0d44938a70","type":"node","index":6,"name":"prices","shopwareField":"","children":[{"id":"53e0d45110b1d","name":"price","index":0,"type":"iteration","adapter":"price","parentKey":"variantId","shopwareField":"","children":[{"id":"53eddba5e3471","type":"leaf","index":0,"name":"group","shopwareField":"priceGroup"},{"id":"53e0d472a0aa8","type":"leaf","index":1,"name":"price","shopwareField":"price"},{"id":"53e0d48a9313a","type":"leaf","index":2,"name":"pseudoprice","shopwareField":"pseudoPrice"}],"attributes":null}]},{"id":"53fb272db680f","type":"leaf","index":7,"name":"active","shopwareField":"active"},{"id":"53eddc83e7a2e","type":"leaf","index":8,"name":"instock","shopwareField":"inStock"},{"id":"541af5febd073","type":"leaf","index":9,"name":"stockmin","shopwareField":"stockMin"},{"id":"53e0d3e46c923","type":"leaf","index":10,"name":"description","shopwareField":"description"},{"id":"541af5dc189bd","type":"leaf","index":11,"name":"description_long","shopwareField":"descriptionLong"},{"id":"541af601a2874","type":"leaf","index":12,"name":"shippingtime","shopwareField":"shippingTime"},{"id":"541af6bac2305","type":"leaf","index":13,"name":"added","shopwareField":"date"},{"id":"541af75d8a839","type":"leaf","index":14,"name":"changed","shopwareField":"changeTime"},{"id":"541af76ed2c28","type":"leaf","index":15,"name":"releasedate","shopwareField":"releaseDate"},{"id":"541af7a98284d","type":"leaf","index":16,"name":"shippingfree","shopwareField":"shippingFree"},{"id":"541af7d1b1c53","type":"leaf","index":17,"name":"topseller","shopwareField":"topSeller"},{"id":"541af887a00ee","type":"leaf","index":18,"name":"metatitle","shopwareField":"metaTitle"},{"id":"541af887a00ed","type":"leaf","index":19,"name":"keywords","shopwareField":"keywords"},{"id":"541af7f35d78a","type":"leaf","index":20,"name":"minpurchase","shopwareField":"minPurchase"},{"id":"541af889cfb71","type":"leaf","index":21,"name":"purchasesteps","shopwareField":"purchaseSteps"},{"id":"541af88c05567","type":"leaf","index":22,"name":"maxpurchase","shopwareField":"maxPurchase"},{"id":"541af88e24a40","type":"leaf","index":23,"name":"purchaseunit","shopwareField":"purchaseUnit"},{"id":"541af8907b3e3","type":"leaf","index":24,"name":"referenceunit","shopwareField":"referenceUnit"},{"id":"541af9dd95d11","type":"leaf","index":25,"name":"packunit","shopwareField":"packUnit"},{"id":"541af9e03ba80","type":"leaf","index":26,"name":"unitID","shopwareField":"unitId"},{"id":"541af9e2939b0","type":"leaf","index":27,"name":"pricegroupID","shopwareField":"priceGroupId"},{"id":"541af9e54b365","type":"leaf","index":28,"name":"pricegroupActive","shopwareField":"priceGroupActive"},{"id":"541afad534551","type":"leaf","index":29,"name":"laststock","shopwareField":"lastStock"},{"id":"541afad754eb9","type":"leaf","index":30,"name":"suppliernumber","shopwareField":"supplierNumber"},{"id":"540efb5f704bc","type":"leaf","index":31,"name":"purchaseprice","shopwareField":"purchasePrice"},{"id":"541afad9b7357","type":"leaf","index":32,"name":"weight","shopwareField":"weight"},{"id":"541afadc6536c","type":"leaf","index":33,"name":"width","shopwareField":"width"},{"id":"541afadfb5179","type":"leaf","index":34,"name":"height","shopwareField":"height"},{"id":"541afae631bc8","type":"leaf","index":35,"name":"length","shopwareField":"length"},{"id":"541afae97c6ec","type":"leaf","index":36,"name":"ean","shopwareField":"ean"},{"id":"541afdba8e926","name":"similars","index":37,"type":"iteration","adapter":"similar","parentKey":"articleId","shopwareField":"","children":[{"id":"541afdc37e956","type":"leaf","index":0,"name":"similar","shopwareField":"ordernumber"}]},{"id":"53e0d5f7d03d4","type":"","index":37,"name":"configurators","shopwareField":"","children":[{"id":"53e0d603db6b9","name":"configurator","index":0,"type":"iteration","adapter":"configurator","parentKey":"variantId","shopwareField":"","children":[{"id":"542119418283a","type":"leaf","index":0,"name":"configuratorsetID","shopwareField":"configSetId"},{"id":"53e0d6142adca","type":"leaf","index":1,"name":"configuratortype","shopwareField":"configSetType"},{"id":"53e0d63477bef","type":"leaf","index":2,"name":"configuratorGroup","shopwareField":"configGroupName"},{"id":"53e0d6446940d","type":"leaf","index":3,"name":"configuratorOptions","shopwareField":"configOptionName"}],"attributes":null}]},{"id":"54211df500e93","name":"category","index":38,"type":"iteration","adapter":"category","parentKey":"articleId","shopwareField":"","children":[{"id":"54211e05ddc3f","type":"leaf","index":0,"name":"categories","shopwareField":"categoryId"}]}],"attributes":null}],"shopwareField":""}]}';
return '{"id":"root","name":"Root","type":"node","children":[{"id":"4","name":"articles","index":0,"type":"","children":[{"id":"53e0d3148b0b2","name":"article","index":0,"type":"iteration","adapter":"article","parentKey":"","shopwareField":"","children":{"0":{"id":"53e0d365881b7","type":"leaf","index":0,"name":"ordernumber","shopwareField":"orderNumber"},"1":{"id":"53e0d329364c4","type":"leaf","index":1,"name":"mainnumber","shopwareField":"mainNumber"},"2":{"id":"53e0d3a201785","type":"leaf","index":2,"name":"name","shopwareField":"name"},"3":{"id":"53fb1c8c99aac","type":"leaf","index":3,"name":"additionalText","shopwareField":"additionalText"},"4":{"id":"53e0d3fea6646","type":"leaf","index":4,"name":"supplier","shopwareField":"supplierName"},"5":{"id":"53e0d4333dca7","type":"leaf","index":5,"name":"tax","shopwareField":"tax"},"6":{"id":"53e0d44938a70","type":"node","index":6,"name":"prices","shopwareField":"","children":[{"id":"53e0d45110b1d","name":"price","index":0,"type":"iteration","adapter":"price","parentKey":"variantId","shopwareField":"","children":[{"id":"53eddba5e3471","type":"leaf","index":0,"name":"group","shopwareField":"priceGroup"},{"id":"53e0d472a0aa8","type":"leaf","index":1,"name":"price","shopwareField":"price"},{"id":"53e0d48a9313a","type":"leaf","index":2,"name":"pseudoprice","shopwareField":"pseudoPrice"}],"attributes":null}]},"7":{"id":"53fb272db680f","type":"leaf","index":7,"name":"active","shopwareField":"active"},"8":{"id":"53eddc83e7a2e","type":"leaf","index":8,"name":"instock","shopwareField":"inStock"},"9":{"id":"541af5febd073","type":"leaf","index":9,"name":"stockmin","shopwareField":"stockMin"},"10":{"id":"53e0d3e46c923","type":"leaf","index":10,"name":"description","shopwareField":"description"},"11":{"id":"541af5dc189bd","type":"leaf","index":11,"name":"description_long","shopwareField":"descriptionLong"},"12":{"id":"541af601a2874","type":"leaf","index":12,"name":"shippingtime","shopwareField":"shippingTime"},"13":{"id":"541af6bac2305","type":"leaf","index":13,"name":"added","shopwareField":"date"},"14":{"id":"541af75d8a839","type":"leaf","index":14,"name":"changed","shopwareField":"changeTime"},"15":{"id":"541af76ed2c28","type":"leaf","index":15,"name":"releasedate","shopwareField":"releaseDate"},"16":{"id":"541af7a98284d","type":"leaf","index":16,"name":"shippingfree","shopwareField":"shippingFree"},"17":{"id":"541af7d1b1c53","type":"leaf","index":17,"name":"topseller","shopwareField":"topSeller"},"18":{"id":"541af887a00ee","type":"leaf","index":18,"name":"metatitle","shopwareField":"metaTitle"},"19":{"id":"541af887a00ed","type":"leaf","index":19,"name":"keywords","shopwareField":"keywords"},"20":{"id":"541af7f35d78a","type":"leaf","index":20,"name":"minpurchase","shopwareField":"minPurchase"},"21":{"id":"541af889cfb71","type":"leaf","index":21,"name":"purchasesteps","shopwareField":"purchaseSteps"},"22":{"id":"541af88c05567","type":"leaf","index":22,"name":"maxpurchase","shopwareField":"maxPurchase"},"23":{"id":"541af88e24a40","type":"leaf","index":23,"name":"purchaseunit","shopwareField":"purchaseUnit"},"24":{"id":"541af8907b3e3","type":"leaf","index":24,"name":"referenceunit","shopwareField":"referenceUnit"},"25":{"id":"541af9dd95d11","type":"leaf","index":25,"name":"packunit","shopwareField":"packUnit"},"26":{"id":"541af9e03ba80","type":"leaf","index":26,"name":"unitID","shopwareField":"unitId"},"27":{"id":"541af9e2939b0","type":"leaf","index":27,"name":"pricegroupID","shopwareField":"priceGroupId"},"28":{"id":"541af9e54b365","type":"leaf","index":28,"name":"pricegroupActive","shopwareField":"priceGroupActive"},"29":{"id":"541afad534551","type":"leaf","index":29,"name":"laststock","shopwareField":"lastStock"},"30":{"id":"541afad754eb9","type":"leaf","index":30,"name":"suppliernumber","shopwareField":"supplierNumber"},"31":{"id":"540efb5f704bc","type":"leaf","index":31,"name":"purchaseprice","shopwareField":"purchasePrice"},"32":{"id":"541afad9b7357","type":"leaf","index":32,"name":"weight","shopwareField":"weight"},"33":{"id":"541afadc6536c","type":"leaf","index":33,"name":"width","shopwareField":"width"},"34":{"id":"541afadfb5179","type":"leaf","index":34,"name":"height","shopwareField":"height"},"35":{"id":"541afae631bc8","type":"leaf","index":35,"name":"length","shopwareField":"length"},"36":{"id":"541afae97c6ec","type":"leaf","index":36,"name":"ean","shopwareField":"ean"},"37":{"id":"53e0d5f7d03d4","type":"","index":37,"name":"configurators","shopwareField":"","children":[{"id":"53e0d603db6b9","name":"configurator","index":0,"type":"iteration","adapter":"configurator","parentKey":"variantId","shopwareField":"","children":[{"id":"542119418283a","type":"leaf","index":0,"name":"configuratorsetID","shopwareField":"configSetId"},{"id":"53e0d6142adca","type":"leaf","index":1,"name":"configuratortype","shopwareField":"configSetType"},{"id":"53e0d63477bef","type":"leaf","index":2,"name":"configuratorGroup","shopwareField":"configGroupName"},{"id":"53e0d6446940d","type":"leaf","index":3,"name":"configuratorOptions","shopwareField":"configOptionName"},{"id":"57c93872e082d","type":"leaf","index":4,"name":"configSetName","shopwareField":"configSetName","defaultValue":""}],"attributes":null}]},"38":{"id":"54211df500e93","name":"category","index":38,"type":"iteration","adapter":"category","parentKey":"articleId","shopwareField":"","children":[{"id":"54211e05ddc3f","type":"leaf","index":0,"name":"categories","shopwareField":"categoryId"}]},"78":{"id":"541afdba8e926","name":"similars","index":37,"type":"iteration","adapter":"similar","parentKey":"articleId","shopwareField":"","children":[{"id":"541afdc37e956","type":"leaf","index":0,"name":"similar","shopwareField":"ordernumber"}]}},"attributes":null}],"shopwareField":""}]}';
case 'articlesInStock':
return '{"id":"root","name":"Root","type":"node","children":[{"id":"537359399c80a","name":"Header","index":0,"type":"node","children":[{"id":"537385ed7c799","name":"HeaderChild","index":0,"type":"node","shopwareField":""}]},{"id":"537359399c8b7","name":"articlesInStock","index":1,"type":"node","shopwareField":"","children":[{"id":"537359399c90d","name":"article","index":0,"type":"iteration","adapter":"default","parentKey":"","shopwareField":"","attributes":null,"children":[{"id":"5373865547d06","name":"ordernumber","index":0,"type":"leaf","shopwareField":"orderNumber"},{"id":"537388742e20e","name":"instock","index":1,"type":"leaf","shopwareField":"inStock"},{"id":"541c4b9ddc00e","type":"leaf","index":2,"name":"_additionaltext","shopwareField":"additionalText"},{"id":"541c4bc6b7e0a","type":"leaf","index":3,"name":"_supplier","shopwareField":"supplier"},{"id":"541c4bd27761c","type":"leaf","index":4,"name":"_price","shopwareField":"price"}]}]}]}';
case 'articlesPrices':
Expand Down

0 comments on commit a3a4c72

Please sign in to comment.