Merge pull request #11 from lopes-vincent/master

Fix namespace + add error message on indexation fail
thelia-modules · Dec 9, 2019 · 36f8c1a · 36f8c1a
2 parents d25085a + 131a948
commit 36f8c1a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Event/IndexationEvent/ProductIndexationEvent.php b/Event/IndexationEvent/ProductIndexationEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ElasticProduct\Event;
+namespace ElasticProduct\Event\IndexationEvent;
 
 use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Product;

diff --git a/I18n/backOffice/default/fr_FR.php b/I18n/backOffice/default/fr_FR.php
@@ -13,4 +13,5 @@
  'Searchable' => 'Filtrable',
  'Searchable attributes' => 'Déclinaisons filtrables',
  'Searchable features' => 'Caractéristiques filtrables',
+ 'Success !' => 'Succés !',
 );
diff --git a/Service/IndexationService.php b/Service/IndexationService.php
@@ -3,7 +3,7 @@
 namespace ElasticProduct\Service;
 
 use ElasticProduct\ElasticProduct;
-use ElasticProduct\Event\ProductIndexationEvent;
+use ElasticProduct\Event\IndexationEvent\ProductIndexationEvent;
 use Propel\Runtime\Propel;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Thelia\Action\Image;

diff --git a/templates/backOffice/default/elastic-product/configuration.html b/templates/backOffice/default/elastic-product/configuration.html
@@ -102,7 +102,7 @@ <h4>{intl l="Searchable attributes" d="elasticproduct.bo.default"}</h4>
  </div>
  </div>
  <div class="row">
- <div class="col-md-12 general-block-decorator">
+ <div id="indexation_block" class="col-md-12 general-block-decorator">
  <div class="progress">
  <div id="elastic_product_index_all_progress" class="progress-bar progress-bar-striped active" role="progressbar"
  aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width:0%">
@@ -162,6 +162,7 @@ <h4>{intl l="Searchable attributes" d="elasticproduct.bo.default"}</h4>
  if (percent >= 100) {
  document.getElementById("elastic_product_index_all_progress").style.width = "100%";
  document.getElementById("elastic_product_index_all_progress").innerHTML = "{intl l="Finished" d="elasticproduct.bo.default"}";
+ $("#indexation_block").prepend('<div class="alert alert-success">{intl l="Success !" d="elasticproduct.bo.default"}</div>')
  } else if (percent > 5) {
  document.getElementById("elastic_product_index_all_progress").style.width = percent+"%";
  document.getElementById("elastic_product_index_all_progress").innerHTML = percent+"%";
@@ -171,6 +172,10 @@ <h4>{intl l="Searchable attributes" d="elasticproduct.bo.default"}</h4>
  page++;
  recursively_ajax(productCount);
  }
+ },
+ error: function (jqXHR)
+ {
+ $("#indexation_block").prepend('<div class="alert alert-danger">'+jqXHR.statusText+'</div>')
  }
  });
  }