Merge pull request #6 from LeoMoshko/bug/issues_4_Locale_should_not_h…

…ardcoded fix Locale should not be hardcoded
mad-coders · Sep 29, 2021 · bb70c95 · bb70c95
2 parents 4fd3b69 + 8d23572
commit bb70c95
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/Form/Provider/AttributeOptionsProvider.php b/src/Form/Provider/AttributeOptionsProvider.php
@@ -29,13 +29,18 @@ class AttributeOptionsProvider implements AttributeOptionsProviderInterface
     /** @var RepositoryInterface  */
     private $productAttributeRepository;
 
+    /** @var string */
+    private $localeCode;
+
     public function __construct(
         ProductAttributeValueRepository $productAttributeValueRepository,
-        RepositoryInterface $productAttributeRepository
+        RepositoryInterface $productAttributeRepository,
+        string $localeCode
     )
     {
         $this->productAttributeValueRepository = $productAttributeValueRepository;
         $this->productAttributeRepository = $productAttributeRepository;
+        $this->localeCode = $localeCode;
     }
 
     public function provideOptionsByAttributeCode(string $code): array
@@ -49,7 +54,7 @@ public function provideOptionsByAttributeCode(string $code): array
         $qb->andWhere('av.attribute = :attribute');
         $qb->andWhere('av.localeCode = :localeCode');
         $qb->setParameter(':attribute', $attribute->getId());
-        $qb->setParameter(':localeCode', 'en_US');
+        $qb->setParameter(':localeCode', $this->localeCode);
 
         $choices = [];
         foreach($qb->getQuery()->getResult() as $value) {

diff --git a/src/Matcher/SizeChartValidator.php b/src/Matcher/SizeChartValidator.php
@@ -22,6 +22,16 @@
 
 final class SizeChartValidator implements SizeChartValidatorInterface
 {
+    /** @var string */
+    private $localeCode;
+
+    public function __construct(
+        string $localeCode
+    )
+    {
+        $this->localeCode = $localeCode;
+    }
+
     public function isValidForTheProduct(SizeChartInterface $sizeChart, ProductInterface $product): bool
     {
         $criteria = $sizeChart->getCriteria();
@@ -32,7 +42,7 @@ public function isValidForTheProduct(SizeChartInterface $sizeChart, ProductInter
         foreach($attributeCodes as $attributeCode) {
             /** @var string $value */
             $value = $criteria['attribute' . $attributeCode ] ?? '';
-            $productAttributeValue = $product->getAttributeByCodeAndLocale($attributeCode, 'en_US');
+            $productAttributeValue = $product->getAttributeByCodeAndLocale($attributeCode, $this->localeCode);
 
             if (!$productAttributeValue || $productAttributeValue->getValue() !== $value) {
                 return false;

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -12,7 +12,10 @@ Architects of this package:
 @author Piotr Lewandowski <[email protected]>
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
     <imports>
         <import resource="services/**/*.xml" />
     </imports>
@@ -26,7 +29,10 @@ Architects of this package:
         </service>
 
         <!-- Size Chart Matcher -->
-        <service id="madcoders_sizechart.matcher.validator" class="Madcoders\SyliusSizechartPlugin\Matcher\SizeChartValidator" />
+        <service id="madcoders_sizechart.matcher.validator"
+                 class="Madcoders\SyliusSizechartPlugin\Matcher\SizeChartValidator">
+            <argument>%locale%</argument>
+        </service>
         <service id="madcoders_sizechart.matcher.live_matcher" class="Madcoders\SyliusSizechartPlugin\Matcher\LiveMatcher">
             <argument type="service" id="madcoders_sizechart.repository.size_chart" />
             <argument type="service" id="madcoders_sizechart.matcher.validator" />

diff --git a/src/Resources/config/services/forms.xml b/src/Resources/config/services/forms.xml
@@ -8,6 +8,7 @@
                  class="Madcoders\SyliusSizechartPlugin\Form\Provider\AttributeOptionsProvider">
             <argument type="service" id="sylius.repository.product_attribute_value" />
             <argument type="service" id="sylius.repository.product_attribute" />
+            <argument>%locale%</argument>
         </service>
 
         <!-- size chart option criteria form view factory -->