Merged in dev/ftp-integration (pull request #13)

Dev/ftp integration
synolia · Jan 6, 2017 · 34a48ee · 34a48ee
2 parents 3222708 + b3e4684
commit 34a48ee
Show file tree

Hide file tree

Showing 26 changed files with 1,761 additions and 179 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ debug
 /node_modules
 /vendor
 /web
+components
diff --git a/Controller/ImportController.php b/Controller/ImportController.php
@@ -30,13 +30,15 @@ class ImportController extends Controller
  public function importAction(Request $request)
  {
  $validationResult = [];
+ $success = false;
  $processorsChoices = $this->container->get('synolia.oroneo.import.manager')->getProcessorsChoices();
 
  $form = $this->createForm('synolia_oroneo_import_form', null, ['processorsChoices' => $processorsChoices]);
 
  if ($request->isMethod('POST')) {
  $form->submit($request);
  $localMapping = $this->container->get('oro_config.global')->get('synolia_oroneo.localization_mapping');
+ $importJob = $request->get('importValidateJob', JobExecutor::JOB_VALIDATE_IMPORT_FROM_CSV);
  if (empty($localMapping)) {
  $this->get('session')->getFlashBag()->add(
  'error',
@@ -53,16 +55,38 @@ public function importAction(Request $request)
  ]
  )
  );
- } elseif ($form->isValid()) {
- $importJob = $request->get('importValidateJob', JobExecutor::JOB_VALIDATE_IMPORT_FROM_CSV);
+ } elseif ($form->get('isManualImport')->getData() === false) {
+ $validationResult = $this->container->get('synolia.oroneo.import.manager')->distantImportValidation($form->getData(), $importJob);
+ if (empty($validationResult)) {
+ $this->get('session')->getFlashBag()->add(
+ 'error',
+ $this->get('translator')->trans(
+ 'synolia.oroneo.import_page.error.distant.missing_config',
+ [
+ '%url%' => $this->generateUrl(
+ 'oro_config_configuration_system',
+ [
+ 'activeGroup' => 'oroneo',
+ 'activeSubGroup' => 'oroneo_config_distant',
+ ]
+ ),
+ ]
+ )
+ );
+ } else {
+ $success = true;
+ }
+ } elseif ($form->get('isManualImport')->getData() === true && $form->isValid()) {
  $validationResult = $this->container->get('synolia.oroneo.import.manager')->importValidation($form->getData(), $importJob);
- $validationResult['importJob'] = $request->get('importJob');
+ $success = true;
  }
+ $validationResult['importJob'] = $request->get('importJob');
  }
 
  return [
- 'form' => $form->createView(),
- 'result' => $validationResult,
+ 'form' => $form->createView(),
+ 'result' => $validationResult,
+ 'success' => $success,
  ];
  }
 

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -25,18 +25,28 @@ public function getConfigTreeBuilder()
  SettingsBuilder::append(
  $rootNode,
  [
- 'delimiter' => ['value' => ';'],
- 'enclosure' => ['value' => '"'],
- 'localization_mapping' => ['type' => 'array', 'value' => []],
- 'category_mapping' => ['type' => 'array', 'value' => []],
- 'master_category' => ['type' => 'array', 'value' => ['masterCategory' => 1]],
- 'attribute_mapping' => ['type' => 'array', 'value' => []],
- 'option_mapping' => ['type' => 'array', 'value' => []],
- 'product_channel' => ['value' => 'ecommerce'],
- 'product_mapping' => ['type' => 'array', 'value' => []],
- 'attribute_file_max_size' => ['value' => 1024],
- 'attribute_image_width' => ['value' => 50],
- 'attribute_image_height' => ['value' => 50],
+ 'delimiter' => ['value' => ';'],
+ 'enclosure' => ['value' => '"'],
+ 'localization_mapping' => ['type' => 'array', 'value' => []],
+ 'category_mapping' => ['type' => 'array', 'value' => []],
+ 'master_category' => ['type' => 'array', 'value' => ['masterCategory' => 1]],
+ 'attribute_mapping' => ['type' => 'array', 'value' => []],
+ 'option_mapping' => ['type' => 'array', 'value' => []],
+ 'product_channel' => ['value' => 'ecommerce'],
+ 'product_mapping' => ['type' => 'array', 'value' => []],
+ 'attribute_file_max_size' => ['value' => 1024],
+ 'attribute_image_width' => ['value' => 50],
+ 'attribute_image_height' => ['value' => 50],
+ 'distant_host' => ['value' => ''],
+ 'distant_connection_type' => ['value' => 'FTP'],
+ 'distant_username' => ['value' => ''],
+ 'distant_password' => ['value' => ''],
+ 'distant_port' => ['value' => 21],
+ 'distant_filepath_category' => ['value' => ''],
+ 'distant_filepath_attribute' => ['value' => ''],
+ 'distant_filepath_option' => ['value' => ''],
+ 'distant_filepath_product' => ['value' => ''],
+ 'distant_filepath_product-file' => ['value' => ''],
  'jobs' => [
  'type' => 'array',
  'value' => [

diff --git a/Form/Type/ImportType.php b/Form/Type/ImportType.php
@@ -2,10 +2,10 @@
 
 namespace Synolia\Bundle\OroneoBundle\Form\Type;
 
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Validator\Constraints\File;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Oro\Bundle\ImportExportBundle\Processor\ProcessorRegistry;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -16,25 +16,13 @@
  */
 class ImportType extends BaseImportType
 {
- /**
- * @var ProcessorRegistry
- */
- protected $processorRegistry;
-
- /**
- * @param ProcessorRegistry $processorRegistry
- */
- public function __construct(ProcessorRegistry $processorRegistry)
- {
- $this->processorRegistry = $processorRegistry;
- }
-
  /**
  * @param FormBuilderInterface $builder
  * @param array $options
  */
  public function buildForm(FormBuilderInterface $builder, array $options)
  {
+ $builder->remove('file');
  $builder->add(
  'processorAlias',
  ChoiceType::class,
@@ -46,10 +34,21 @@ public function buildForm(FormBuilderInterface $builder, array $options)
  ]
  );
 
+ $builder->add(
+ 'isManualImport',
+ CheckboxType::class,
+ [
+ 'label' => 'synolia.oroneo.import_page.import_type.checkbox',
+ 'required' => false,
+ 'mapped' => false,
+ ]
+ );
+
  $builder->add(
  'file',
  FileType::class,
  [
+ 'required' => false,
  'constraints' => [
  new File(
  [