Add little fixes

Author: bitbager

.travis.yml

@@ -68,7 +68,7 @@ script:
 
     - bin/phpunit
     - bin/phpspec run
-    - bin/behat --strict -vvv --no-interaction || bin/behat --strict -vvv --no-interaction --rerun
+    - bin/behat
 
 after_failure:
     - vendor/lakion/mink-debug-extension/travis/tools/upload-textfiles "${SYLIUS_BUILD_DIR}/*.log"

src/Form/Type/ChoiceMapper/ProductAttributesMapper.php

@@ -13,6 +13,7 @@
 namespace BitBag\SyliusElasticsearchPlugin\Form\Type\ChoiceMapper;
 
 use BitBag\SyliusElasticsearchPlugin\Formatter\StringFormatterInterface;
+use Sylius\Component\Locale\Context\LocaleContextInterface;
 use Sylius\Component\Product\Model\ProductAttributeInterface;
 use Sylius\Component\Product\Model\ProductAttributeValueInterface;
 use Sylius\Component\Product\Repository\ProductAttributeValueRepositoryInterface;
@@ -24,20 +25,29 @@ final class ProductAttributesMapper implements ProductAttributesMapperInterface
      */
     private $productAttributeValueRepository;
 
+    /**
+     * @var LocaleContextInterface
+     */
+    private $localeContext;
+
     /**
      * @var StringFormatterInterface
      */
     private $stringFormatter;
 
     /**
      * @param ProductAttributeValueRepositoryInterface $productAttributeValueRepository
+     * @param LocaleContextInterface $localeContext
      * @param StringFormatterInterface $stringFormatter
      */
     public function __construct(
         ProductAttributeValueRepositoryInterface $productAttributeValueRepository,
+        LocaleContextInterface $localeContext,
         StringFormatterInterface $stringFormatter
-    ) {
+    )
+    {
         $this->productAttributeValueRepository = $productAttributeValueRepository;
+        $this->localeContext = $localeContext;
         $this->stringFormatter = $stringFormatter;
     }
 
@@ -50,13 +60,18 @@ public function mapToChoices(ProductAttributeInterface $productAttribute): array
         $choices = [];
         array_walk($attributeValues, function (ProductAttributeValueInterface $productAttributeValue) use (&$choices) {
             $value = $productAttributeValue->getValue();
-            if (is_array($value)) {
+            $configuration = $productAttributeValue->getAttribute()->getConfiguration();
+            if (is_array($value)
+                && isset($configuration['choices'])
+                && is_array($configuration['choices'])) {
                 foreach ($value as $singleValue) {
-                    $choices[$singleValue] = $this->stringFormatter->formatToLowercaseWithoutSpaces($singleValue);
+                    $choice = $this->stringFormatter->formatToLowercaseWithoutSpaces($singleValue);
+                    $label = $configuration['choices'][$singleValue][$this->localeContext->getLocaleCode()];
+                    $choices[$label] = $choice;
                 }
             } else {
-                $choiceValue = is_string($value) ? $this->stringFormatter->formatToLowercaseWithoutSpaces($value) : $value;
-                $choices[$value] = $choiceValue;
+                $choice = is_string($value) ? $this->stringFormatter->formatToLowercaseWithoutSpaces($value) : $value;
+                $choices[$value] = $choice;
             }
         });
 

src/QueryBuilder/HasPriceBetweenQueryBuilder.php

@@ -44,7 +44,8 @@ public function __construct(
         PriceNameResolverInterface $priceNameResolver,
         ConcatedNameResolverInterface $channelPricingNameResolver,
         ChannelContextInterface $channelContext
-    ) {
+    )
+    {
         $this->channelPricingNameResolver = $channelPricingNameResolver;
         $this->priceNameResolver = $priceNameResolver;
         $this->channelContext = $channelContext;
@@ -55,20 +56,19 @@ public function __construct(
      */
     public function buildQuery(array $data): ?AbstractQuery
     {
-        $minPrice = $data[$this->priceNameResolver->resolveMinPriceName()];
-        $maxPrice = $data[$this->priceNameResolver->resolveMaxPriceName()];
+        $dataMinPrice = $data[$this->priceNameResolver->resolveMinPriceName()];
+        $dataMaxPrice = $data[$this->priceNameResolver->resolveMaxPriceName()];
 
-        if (!$minPrice || !$maxPrice) {
-            return null;
-        }
+        $minPrice = $dataMinPrice ?  $this->getPriceFromString($dataMinPrice) : 0;
+        $maxPrice = $dataMaxPrice ? $this->getPriceFromString($dataMaxPrice) : PHP_INT_MAX;
 
         $channelCode = $this->channelContext->getChannel()->getCode();
         $propertyName = $this->channelPricingNameResolver->resolvePropertyName($channelCode);
         $rangeQuery = new Range();
 
         $rangeQuery->setParam($propertyName, [
-            'gte' => $this->getPriceFromString($minPrice),
-            'lt' => $this->getPriceFromString($maxPrice),
+            'gte' => $minPrice,
+            'lt' => $maxPrice,
         ]);
 
         return $rangeQuery;

src/Resources/config/services/form.yml

@@ -43,4 +43,5 @@ services:
         class: BitBag\SyliusElasticsearchPlugin\Form\Type\ChoiceMapper\ProductAttributesMapper
         arguments:
             - "@sylius.repository.product_attribute_value"
+            - "@sylius.context.locale"
             - "@bitbag.sylius_elasticsearch_plugin.string_formatter"