Merge pull request #6781 from akeneo/PIM-6737-feedback

PIM-6737 Delphine's feedback
akeneo · Sep 22, 2017 · 8587ec6 · 8587ec6
2 parents d5e1d01 + 886713d
commit 8587ec6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/.../ConnectorBundle/tests/integration/Export/ProductModel/ExportProductModelsIntegration.php b/.../ConnectorBundle/tests/integration/Export/ProductModel/ExportProductModelsIntegration.php
@@ -148,10 +148,10 @@ protected function loadFixtures() : void
     public function testProductModelsExport()
     {
         $expectedCsv = <<<CSV
-code;family_variant;parent;categories;color;name-de_DE;name-en_US;name-fr_FR;name-zh_CN;variation_image;variation_name
-apollon;clothing_color_size;;;;;;;;;
-apollon_blue;clothing_color_size;apollon;;blue;;;;;;"my blue tshirt"
-apollon_pink;clothing_color_size;apollon;;pink;;;;;;"my pink tshirt"
+code;family_variant;parent;color;name-de_DE;name-en_US;name-fr_FR;name-zh_CN;variation_image;variation_name
+apollon;clothing_color_size;;;;;;;;
+apollon_blue;clothing_color_size;apollon;blue;;;;;;"my blue tshirt"
+apollon_pink;clothing_color_size;apollon;pink;;;;;;"my pink tshirt"
 
 CSV;
 

diff --git a/...chBundle/Resources/config/form_extensions/job_instance/xlsx_product_model_export_edit.yml b/...chBundle/Resources/config/form_extensions/job_instance/xlsx_product_model_export_edit.yml
@@ -111,6 +111,17 @@ extensions:
             label: pim_enrich.form.job_instance.tab.properties.date_format.title
             tooltip: pim_enrich.form.job_instance.tab.properties.date_format.help
 
+    pim-job-instance-xlsx-product-model-export-edit-properties-lines-per-file:
+        module: pim/job/common/edit/field/text
+        parent: pim-job-instance-xlsx-product-model-export-edit-global
+        position: 150
+        targetZone: properties
+        config:
+            fieldCode: configuration.linesPerFile
+            readOnly: false
+            label: pim_enrich.form.job_instance.tab.properties.lines_per_file.title
+            tooltip: pim_enrich.form.job_instance.tab.properties.lines_per_file.help
+
     pim-job-instance-xlsx-product-model-export-edit-properties-with-header:
         module: pim/job/common/edit/field/switch
         parent: pim-job-instance-xlsx-product-model-export-edit-global

diff --git a/src/Pim/Component/Connector/ArrayConverter/StandardToFlat/ProductModel.php b/src/Pim/Component/Connector/ArrayConverter/StandardToFlat/ProductModel.php
@@ -31,9 +31,6 @@ public function __construct(ProductValueConverter $valueConverter)
     protected function convertProperty($property, $data, array $convertedItem, array $options)
     {
         switch ($property) {
-            case 'categories':
-                $convertedItem[$property] = implode(',', $data);
-                break;
             case 'code':
             case 'family_variant':
             case 'parent':
@@ -44,6 +41,7 @@ protected function convertProperty($property, $data, array $convertedItem, array
                     $convertedItem = $convertedItem + $this->valueConverter->convertAttribute($code, $attribute);
                 }
                 break;
+            case 'categories':
             case 'created':
             case 'updated':
                 break;

diff --git a/...ponent/Connector/Job/JobParameters/ConstraintCollectionProvider/ProductModelCsvExport.php b/...ponent/Connector/Job/JobParameters/ConstraintCollectionProvider/ProductModelCsvExport.php
@@ -46,6 +46,8 @@ public function getConstraintCollection()
     {
         $baseConstraint = $this->simpleProvider->getConstraintCollection();
         $constraintFields = $baseConstraint->fields;
+        $constraintFields['decimalSeparator'] = new NotBlank(['groups' => ['Default', 'FileConfiguration']]);
+        $constraintFields['dateFormat'] = new NotBlank(['groups' => ['Default', 'FileConfiguration']]);
         $constraintFields['with_media'] = new Type(
             [
                 'type'   => 'bool',

diff --git a/...Pim/Component/Connector/Job/JobParameters/DefaultValuesProvider/ProductModelCsvExport.php b/...Pim/Component/Connector/Job/JobParameters/DefaultValuesProvider/ProductModelCsvExport.php
@@ -44,6 +44,8 @@ public function __construct(
     public function getDefaultValues()
     {
         $parameters = $this->simpleProvider->getDefaultValues();
+        $parameters['decimalSeparator'] = LocalizerInterface::DEFAULT_DECIMAL_SEPARATOR;
+        $parameters['dateFormat'] = LocalizerInterface::DEFAULT_DATE_FORMAT;
         $parameters['with_media'] = true;
 
         return $parameters;

diff --git a/src/Pim/Component/Connector/spec/ArrayConverter/StandardToFlat/ProductModelSpec.php b/src/Pim/Component/Connector/spec/ArrayConverter/StandardToFlat/ProductModelSpec.php
@@ -40,7 +40,6 @@ function it_converts_from_standard_to_flat_format($valueConverter)
 
         $expected = [
             'code'                    => 'apollon',
-            'categories'              => 'audio_video_sales,loudspeakers,sony',
             'family_variant'          => 'soundspeaker_color',
             'parent'                  => 'parent_model_code',
             'weight-de_DE-print'      => '100',
@@ -49,7 +48,6 @@ function it_converts_from_standard_to_flat_format($valueConverter)
 
         $item = [
             'code'              => 'apollon',
-            'categories'        => ['audio_video_sales', 'loudspeakers', 'sony'],
             'family_variant'    => 'soundspeaker_color',
             'parent'            => 'parent_model_code',
             'values'            => [