Make channel pricing translatable

gabiudrescu · Mar 7, 2017 · 542b067 · 542b067
1 parent c3cc078
commit 542b067
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 18 deletions.
diff --git a/src/Sylius/Behat/Page/Admin/Product/CreateSimpleProductPage.php b/src/Sylius/Behat/Page/Admin/Product/CreateSimpleProductPage.php
@@ -251,8 +251,8 @@ protected function getDefinedElements()
             'language_tab' => '[data-locale="%locale%"] .title',
             'locale_tab' => '#attributesContainer .menu [data-tab="%localeCode%"]',
             'name' => '#sylius_product_translations_%locale%_name',
-            'price' => '#sylius_product_variant_channelPricings [data-form-collection="item"]:contains("%channelName%") input[name$="[price]"]',
-            'original_price' => '#sylius_product_variant_channelPricings [data-form-collection="item"]:contains("%channelName%") input[name$="[originalPrice]"]',
+            'price' => '#sylius_product_variant_channelPricings > .field:contains("%channelName%") input[name$="[price]"]',
+            'original_price' => '#sylius_product_variant_channelPricings > .field:contains("%channelName%") input[name$="[originalPrice]"]',
             'price_calculator' => '#sylius_product_variant_pricingCalculator',
             'shipping_category' => '#sylius_product_variant_shippingCategory',
             'slug' => '#sylius_product_translations_%locale%_slug',

diff --git a/src/Sylius/Behat/Page/Admin/Product/UpdateSimpleProductPage.php b/src/Sylius/Behat/Page/Admin/Product/UpdateSimpleProductPage.php
@@ -436,8 +436,8 @@ protected function getDefinedElements()
             'language_tab' => '[data-locale="%locale%"] .title',
             'locale_tab' => '#attributesContainer .menu [data-tab="%localeCode%"]',
             'name' => '#sylius_product_translations_%locale%_name',
-            'original_price' => '#sylius_product_variant_channelPricings [data-form-collection="item"]:contains("%channelName%") input[name$="[originalPrice]"]',
-            'price' => '#sylius_product_variant_channelPricings [data-form-collection="item"]:contains("%channelName%") input[name$="[price]"]',
+            'original_price' => '#sylius_product_variant_channelPricings > .field:contains("%channelName%") input[name$="[originalPrice]"]',
+            'price' => '#sylius_product_variant_channelPricings > .field:contains("%channelName%") input[name$="[price]"]',
             'pricing_configuration' => '#sylius_calculator_container',
             'main_taxon' => '#sylius_product_mainTaxon',
             'slug' => '#sylius_product_translations_%locale%_slug',

diff --git a/src/Sylius/Behat/Page/Admin/ProductVariant/CreatePage.php b/src/Sylius/Behat/Page/Admin/ProductVariant/CreatePage.php
@@ -30,15 +30,15 @@ class CreatePage extends BaseCreatePage implements CreatePageInterface
      */
     public function specifyPrice($price, $channelName)
     {
-        $this->getDocument()->fillField(sprintf('Price for %s', $channelName), $price);
+        $this->getElement('price', ['%channelName%' => $channelName])->setValue($price);
     }
 
     /**
      * {@inheritdoc}
      */
     public function specifyOriginalPrice($originalPrice, $channelName)
     {
-        $this->getDocument()->fillField(sprintf('Original price for %s', $channelName), $originalPrice);
+        $this->getElement('original_price', ['%channelName%' => $channelName])->setValue($originalPrice);
     }
 
     /**
@@ -159,6 +159,8 @@ protected function getDefinedElements()
             'option_select' => '#sylius_product_variant_optionValues_%option-name%',
             'price_calculator' => '#sylius_product_variant_pricingCalculator',
             'shipping_category' => '#sylius_product_variant_shippingCategory',
+            'original_price' => '#sylius_product_variant_channelPricings > .field:contains("%channelName%") input[name$="[originalPrice]"]',
+            'price' => '#sylius_product_variant_channelPricings > .field:contains("%channelName%") input[name$="[price]"]',
             'prices_validation_message' => '#sylius_product_variant_channelPricings ~ .sylius-validation-error',
             'first_price_validation_message' => '#sylius_product_variant_channelPricings [data-form-collection="item"]:first-child .sylius-validation-error',
             'weight' => '#sylius_product_variant_weight',

diff --git a/src/Sylius/Behat/Page/Admin/ProductVariant/GeneratePage.php b/src/Sylius/Behat/Page/Admin/ProductVariant/GeneratePage.php
@@ -30,7 +30,7 @@ public function generate()
      */
     public function specifyPrice($nth, $price, $channelName)
     {
-        $this->getElement('price', ['%position%' => $nth, '%channel%' => $channelName])->setValue($price);
+        $this->getElement('price', ['%position%' => $nth, '%channelName%' => $channelName])->setValue($price);
     }
 
     /**
@@ -90,7 +90,7 @@ protected function getDefinedElements()
     {
         return array_merge(parent::getDefinedElements(), [
             'code' => '#sylius_product_generate_variants_variants_%position%_code',
-            'price' => '#sylius_product_generate_variants_variants_%position%_channelPricings [data-form-collection="item"]:contains("%channel%") input',
+            'price' => '#sylius_product_generate_variants_variants_%position%_channelPricings > .field:contains("%channelName%") input',
             'prices_validation_message' => '#sylius_product_generate_variants_variants_%position%_channelPricings ~ .sylius-validation-error',
         ]);
     }

diff --git a/src/Sylius/Behat/Page/Admin/ProductVariant/UpdatePage.php b/src/Sylius/Behat/Page/Admin/ProductVariant/UpdatePage.php
@@ -108,8 +108,8 @@ protected function getDefinedElements()
             'code' => '#sylius_product_variant_code',
             'name' => '#sylius_product_variant_translations_%language%_name',
             'on_hand' => '#sylius_product_variant_onHand',
-            'original_price' => '#sylius_product_variant_channelPricings [data-form-collection="item"]:contains("%channelName%") input[name$="[originalPrice]"]',
-            'price' => '#sylius_product_variant_channelPricings [data-form-collection="item"]:contains("%channelName%") input[name$="[price]"]',
+            'original_price' => '#sylius_product_variant_channelPricings > .field:contains("%channelName%") input[name$="[originalPrice]"]',
+            'price' => '#sylius_product_variant_channelPricings > .field:contains("%channelName%") input[name$="[price]"]',
             'pricing_configuration' => '#sylius_calculator_container',
             'tracked' => '#sylius_product_variant_tracked',
         ]);

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_details.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_details.html.twig
@@ -31,7 +31,6 @@
                 <h4 class="ui dividing header">{{ 'sylius.ui.pricing'|trans }}</h4>
                 {{ form_row(form.variant.channelPricings, {'label': false}) }}
             {% endif %}
-
         </div>
     </div>
     <div class="ui hidden divider"></div>

diff --git a/src/Sylius/Bundle/CoreBundle/Form/Type/ChannelCollectionType.php b/src/Sylius/Bundle/CoreBundle/Form/Type/ChannelCollectionType.php
@@ -78,6 +78,6 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getBlockPrefix()
     {
-        return 'collection';
+        return 'sylius_channel_collection';
     }
 }
diff --git a/src/Sylius/Bundle/CoreBundle/Form/Type/Product/ChannelPricingType.php b/src/Sylius/Bundle/CoreBundle/Form/Type/Product/ChannelPricingType.php
@@ -20,6 +20,8 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -36,11 +38,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('price', MoneyType::class, [
-                'label' => 'Price for ' . $options['channel']->getName(),
+                'label' => 'sylius.ui.price',
                 'currency' => $options['channel']->getBaseCurrency()->getCode(),
             ])
             ->add('originalPrice', MoneyType::class, [
-                'label' => 'Original price for ' .$options['channel']->getName(),
+                'label' => 'sylius.ui.original_price',
                 'currency' => $options['channel']->getBaseCurrency()->getCode(),
             ])
         ;
@@ -71,8 +73,15 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver
             ->setRequired('channel')
             ->setAllowedTypes('channel', [ChannelInterface::class])
+
             ->setDefined('product_variant')
             ->setAllowedTypes('product_variant', ['null', ProductVariantInterface::class])
+
+            ->setDefaults([
+                'label' => function (Options $options) {
+                    return $options['channel']->getName();
+                },
+            ])
         ;
     }
 

diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig
@@ -79,10 +79,6 @@
 {% block collection_widget -%}
     {% from 'SyliusResourceBundle:Macros:notification.html.twig' import error %}
     {% set attr = attr|merge({'class': attr.class|default ~ ' controls collection-widget'}) %}
-    {% set allow_add = allow_add|default(false) %}
-    {% set allow_delete = allow_delete|default(false) %}
-    {% set button_add_label = button_add_label|default %}
-    {% set button_delete_label = button_delete_label|default %}
 
     {% spaceless %}
         <div data-form-type="collection" {{ block('widget_container_attributes') }}