Merge branch '1.0' into 1.1

* 1.0: Fix 1.0.8 changelog Change version to 1.0.9-DEV Generate changelog for 1.0.8 Change version to 1.0.8 Fix wrong target-entity in exchange-rate entity [Translations] Updated translations from Crowdin Fix UI form add button issue collection in a collection Prevent the kernel response listener for cart from continuing when the session is not actually started. Otherwise the next cartContext->getCart() method call would open a session with no sense.
ezecosystem · Jan 12, 2018 · 43bcd72 · 43bcd72
2 parents 68da29b + 5b8cead
commit 43bcd72
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md
@@ -1,5 +1,16 @@
 ## CHANGELOG
 
+### v1.0.8 2018-01-12
+
+- [#9101](https://github.com/Sylius/Sylius/pull/9101) Fix wrong target-entity in exchange-rate entity (@alcaeus)
+- [#9097](https://github.com/Sylius/Sylius/pull/9097) Fix UI form add button issue collection in a collection (@wadjeroudi)
+- [#9095](https://github.com/Sylius/Sylius/pull/9095) Prevent the kernel response listener for cart from continuing when the session is not actually started. (@Hailong)
+- [#9096](https://github.com/Sylius/Sylius/pull/9096) PHP 7.2 support, finally! (@pamil)
+- [#9090](https://github.com/Sylius/Sylius/pull/9090) Update README.md (@landsman)
+- [#9084](https://github.com/Sylius/Sylius/pull/9084) Minor enhancements to product review API pull request (@pamil)
+- [#9085](https://github.com/Sylius/Sylius/pull/9085) Fix referenced state machine configuration path (@pamil)
+- [#9079](https://github.com/Sylius/Sylius/pull/9079) [Travis] Run a full build for tags (@pamil)
+
 ### v1.0.7 2017-12-30
 
 - [#9075](https://github.com/Sylius/Sylius/pull/9075) Test sylius:install command on Travis (@pamil)

diff --git a/src/Sylius/Bundle/CurrencyBundle/Resources/config/doctrine/model/ExchangeRate.orm.xml b/src/Sylius/Bundle/CurrencyBundle/Resources/config/doctrine/model/ExchangeRate.orm.xml
@@ -34,10 +34,10 @@
             <gedmo:timestampable on="update"/>
         </field>
 
-        <many-to-one field="sourceCurrency" target-entity="Sylius\Component\Currency\Model\Currency">
+        <many-to-one field="sourceCurrency" target-entity="Sylius\Component\Currency\Model\CurrencyInterface">
             <join-column name="source_currency" referenced-column-name="id" nullable="false" on-delete="CASCADE" />
         </many-to-one>
-        <many-to-one field="targetCurrency" target-entity="Sylius\Component\Currency\Model\Currency">
+        <many-to-one field="targetCurrency" target-entity="Sylius\Component\Currency\Model\CurrencyInterface">
             <join-column name="target_currency" referenced-column-name="id" nullable="false" on-delete="CASCADE" />
         </many-to-one>
     </mapped-superclass>

diff --git a/src/Sylius/Bundle/ProductBundle/Resources/translations/messages.cs.yml b/src/Sylius/Bundle/ProductBundle/Resources/translations/messages.cs.yml
@@ -16,6 +16,8 @@ sylius:
         association_type:
             name: Jméno
             translations: Překlady
+        association:
+            type: Typ asociace
         variant:
             name: Jméno
         option:

diff --git a/src/Sylius/Bundle/ShopBundle/EventListener/SessionCartSubscriber.php b/src/Sylius/Bundle/ShopBundle/EventListener/SessionCartSubscriber.php
@@ -61,6 +61,11 @@ public function onKernelResponse(FilterResponseEvent $event): void
             return;
         }
 
+        $session = $event->getRequest()->getSession();
+        if ($session && !$session->isStarted()) {
+            return;
+        }
+
         try {
             $cart = $this->cartContext->getCart();
         } catch (CartNotFoundException $exception) {

diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-form-collection.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-form-collection.js
@@ -25,7 +25,7 @@
 
         this.$element.on(
             'click',
-            '[data-form-collection="add"]:first',
+            '[data-form-collection="add"]:last',
             $.proxy(this.addItem, this)
         );