Add ListingSessionBundle compatibility

stephane-cocolabs · Jul 7, 2020 · 0192b69 · 0192b69
1 parent 74b729b
commit 0192b69
Show file tree

Hide file tree

Showing 50 changed files with 886 additions and 488 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ bin/security-checker
 bin/security-checker.bat
 
 composer.dev.json
+composer.dev.json.tmp
 composer.phar
 .idea/*
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,17 +9,50 @@ and to the [CHANGELOG recommendations](http://keepachangelog.com/).
 
 ## [Unreleased]
 
+### Added
+
+### Fixed
+
+### Changed
+
+
+## [0.15.1] - (2020-07-07)
+
 ### Added
 - Add default FB og:image
+- Add ListingSessionBundle compatibility
+- Add ListingPublicBundle compatibility
 
 ### Fixed
 - Fix update "unread" message in dashboard
 - Fix multi timezone in day mode  
+- Fix admin access front link
+- Fix Nesting level too deep error in user comparison in twig
 
 ### Changed
+- Update doc for SF 3.4
+- Update listing option bundle to v0.15.1
+- Update report bundle to v0.15.1
 - Add acceptation delay constraint in day mode
 - Replace cocorico.booking.min_start_delay parameter by cocorico.booking.min_start_time_delay in day mode
 - Change invoice number generation method
+- Handle end date not manually selected in range mode
+- Change form phone fields to TelType
+- Add condition to replace Translation extension
+- Update listing-alert-bundle to v0.15.1
+- Fork sonata user bundle
+- Replace app/console by bin/console in bin init scripts
+- Add NotFoundException to listings unreachable
+- Remove the comma for last link in edit dashboard page.
+- Add alert box when user delete his listing in edit listing page.
+- Move the description and title block on the right of the category block in deposit listing page.
+- Design changes for calendar title.
+- Remove in user profile page, language related last comma
+- Remove in home and search page category related last comma
+- Enhance error message displaying
+- Change comment count displaying
+- Add comment counts on HP listings
+- Add transchoice to nb comments
 
 ## [0.15.0] - (2019-03-21)
 
@@ -112,7 +145,7 @@ and to the [CHANGELOG recommendations](http://keepachangelog.com/).
 - Fix listing availabilities checking in not day mode and with availabilities by default unavailable
 
 ### Changed
-
+- Disable JMS translation reference file adding
 
 ## [0.9.1] - (2019-01-15)
 
@@ -136,6 +169,7 @@ and to the [CHANGELOG recommendations](http://keepachangelog.com/).
 ### Added
 
 ### Fixed
+- Set gc_probability to null
 
 ### Changed
 - Add BookingSubscriber for new booking

diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -19,19 +19,21 @@ public function registerBundles()
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle(),
+            new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new JMS\I18nRoutingBundle\JMSI18nRoutingBundle(),
             new JMS\TranslationBundle\JMSTranslationBundle(),
             new JMS\AopBundle\JMSAopBundle(),
             new JMS\DiExtraBundle\JMSDiExtraBundle(),
             new FOS\UserBundle\FOSUserBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle(),
             new Sonata\AdminBundle\SonataAdminBundle(),
             new Sonata\CoreBundle\SonataCoreBundle(),
             new Sonata\BlockBundle\SonataBlockBundle(),
             new Sonata\EasyExtendsBundle\SonataEasyExtendsBundle(),
             new Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle(),
             new Sonata\UserBundle\SonataUserBundle(),
+            new Sonata\IntlBundle\SonataIntlBundle(),
             new A2lix\TranslationFormBundle\A2lixTranslationFormBundle(),
             new Oneup\UploaderBundle\OneupUploaderBundle(),
             new Liip\ImagineBundle\LiipImagineBundle(),
@@ -43,7 +45,6 @@ public function registerBundles()
             new HWI\Bundle\OAuthBundle\HWIOAuthBundle(),
             new FOS\CKEditorBundle\FOSCKEditorBundle(),
             new FM\ElfinderBundle\FMElfinderBundle(),
-            new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new SimpleThings\EntityAudit\SimpleThingsEntityAuditBundle(),
             //Required bundles
             new Cocorico\CoreBundle\CocoricoCoreBundle(),

diff --git a/app/Resources/translations/cocorico_listing_public.en.xlf b/app/Resources/translations/cocorico_listing_public.en.xlf
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+    <file date="2018-01-20T00:18:52Z" source-language="en" target-language="en" datatype="plaintext"
+          original="not.available">
+        <header>
+            <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
+            <note>The source node in most cases contains the sample message as written by the developer. If it looks
+                like a
+                dot-delimitted string such as "form.label.firstname", then the developer has not provided a default
+                message.
+            </note>
+        </header>
+        <body>
+            <trans-unit id="dd72b497fa2331ddc4703f0325c7a908b28369ac" resname="listing.price_four">
+                <source>listing.price_four</source>
+                <target>0-3 years</target>
+            </trans-unit>
+            <trans-unit id="13f1e1f3ae0691647335196c1993e1643e98f9a5" resname="listing.price_four.help">
+                <source>listing.price_four.help</source>
+                <target>listing.price_four.help</target>
+            </trans-unit>
+            <trans-unit id="15d6b95ff2ec78ee71ce3159fa7cda5a1009a8f6" resname="listing.price_one">
+                <source>listing.price_one</source>
+                <target>18 years+</target>
+            </trans-unit>
+            <trans-unit id="6343f3b6f9b88827c70a46b5f8faf44b048fa1eb" resname="listing.price_one.help">
+                <source>listing.price_one.help</source>
+                <target>listing.price_one.help</target>
+            </trans-unit>
+            <trans-unit id="13dad3bfa615b0605168e17ff8d1abcc8cac08bd" resname="listing.price_three">
+                <source>listing.price_three</source>
+                <target>4-12 years</target>
+            </trans-unit>
+            <trans-unit id="d0bd24dda747d39864b0ca205588d8e24fe868c5" resname="listing.price_three.help">
+                <source>listing.price_three.help</source>
+                <target>listing.price_three.help</target>
+            </trans-unit>
+            <trans-unit id="b5c2218c164df7e08fa08f89226045bfb1f92413" resname="listing.price_two">
+                <source>listing.price_two</source>
+                <target>13-18 years</target>
+            </trans-unit>
+            <trans-unit id="fd3607b9c56a1ceb3e8b027780a38c8cc931df16" resname="listing.price_two.help">
+                <source>listing.price_two.help</source>
+                <target>listing.price_two.help</target>
+            </trans-unit>
+            <trans-unit id="447dc13870338b929260a9d1dadbb5b2bb3395a7" resname="listing_public.price.required">
+                <source>listing_public.price.required</source>
+                <target state="new">At least one price must be filled</target>
+            </trans-unit>
+            <trans-unit id="2097c33723b61c7e24d3d7d27840469989b61b49" resname="price">
+                <source>price</source>
+                <target>Price</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/app/Resources/translations/cocorico_listing_public.fr.xlf b/app/Resources/translations/cocorico_listing_public.fr.xlf
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+    <file date="2018-01-20T00:19:00Z" source-language="en" target-language="fr" datatype="plaintext"
+          original="not.available">
+        <header>
+            <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
+            <note>The source node in most cases contains the sample message as written by the developer. If it looks
+                like a
+                dot-delimitted string such as "form.label.firstname", then the developer has not provided a default
+                message.
+            </note>
+        </header>
+        <body>
+            <trans-unit id="dd72b497fa2331ddc4703f0325c7a908b28369ac" resname="listing.price_four">
+                <source>listing.price_four</source>
+                <target>0-3 ans</target>
+            </trans-unit>
+            <trans-unit id="13f1e1f3ae0691647335196c1993e1643e98f9a5" resname="listing.price_four.help">
+                <source>listing.price_four.help</source>
+                <target>listing.price_four.help</target>
+            </trans-unit>
+            <trans-unit id="15d6b95ff2ec78ee71ce3159fa7cda5a1009a8f6" resname="listing.price_one">
+                <source>listing.price_one</source>
+                <target>18 ans+</target>
+            </trans-unit>
+            <trans-unit id="6343f3b6f9b88827c70a46b5f8faf44b048fa1eb" resname="listing.price_one.help">
+                <source>listing.price_one.help</source>
+                <target>listing.price_one.help</target>
+            </trans-unit>
+            <trans-unit id="13dad3bfa615b0605168e17ff8d1abcc8cac08bd" resname="listing.price_three">
+                <source>listing.price_three</source>
+                <target>4-12 ans</target>
+            </trans-unit>
+            <trans-unit id="d0bd24dda747d39864b0ca205588d8e24fe868c5" resname="listing.price_three.help">
+                <source>listing.price_three.help</source>
+                <target>listing.price_three.help</target>
+            </trans-unit>
+            <trans-unit id="b5c2218c164df7e08fa08f89226045bfb1f92413" resname="listing.price_two">
+                <source>listing.price_two</source>
+                <target>13-18 ans</target>
+            </trans-unit>
+            <trans-unit id="fd3607b9c56a1ceb3e8b027780a38c8cc931df16" resname="listing.price_two.help">
+                <source>listing.price_two.help</source>
+                <target>listing.price_two.help</target>
+            </trans-unit>
+            <trans-unit id="447dc13870338b929260a9d1dadbb5b2bb3395a7" resname="listing_public.price.required">
+                <source>listing_public.price.required</source>
+                <target state="new">Au moins un prix doit être renseigné</target>
+            </trans-unit>
+            <trans-unit id="2097c33723b61c7e24d3d7d27840469989b61b49" resname="price">
+                <source>price</source>
+                <target>Prix</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/app/Resources/translations/cocorico_listing_session.en.xlf b/app/Resources/translations/cocorico_listing_session.en.xlf
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+    <file date="2018-01-18T10:19:43Z" source-language="en" target-language="en" datatype="plaintext"
+          original="not.available">
+        <header>
+            <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
+            <note>The source node in most cases contains the sample message as written by the developer. If it looks
+                like a
+                dot-delimitted string such as "form.label.firstname", then the developer has not provided a default
+                message.
+            </note>
+        </header>
+        <body>
+            <trans-unit id="39b5a7eef4b8a1d29c2616db61bd803bc1e8e5b3" resname="listing.duration">
+                <source>listing.duration</source>
+                <target>Duration</target>
+            </trans-unit>
+            <trans-unit id="5a44c928642e3a4648a60d8ab1ab6362eb1e810a" resname="listing.form.duration">
+                <source>listing.form.duration</source>
+                <target>Session duration</target>
+            </trans-unit>
+            <trans-unit id="06c59b9b463c217f2965f3a0db032e4377420f1a" resname="listing.show.duration">
+                <source>listing.show.duration</source>
+                <target>Session duration</target>
+            </trans-unit>
+            <trans-unit id="55c0b3aa3afa5a74762bf8425ed58dd86f6f14a6" resname="listing_session.duration.min {{ min }}">
+                <source>listing_session.duration.min {{ min }}</source>
+                <target state="new">THe minimum duration is {{ min }}</target>
+            </trans-unit>
+            <trans-unit id="f6837b3e73f08e9626617af82fd78015c5d763ad" resname="time_unit_session">
+                <source>time_unit_session</source>
+                <target xml:space="preserve">{-3} by session|{-1} hour(s)|{0} session|]0,1] %hour%h %minute%|]1,Inf]%hour%h%minute%
+        </target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/app/Resources/translations/cocorico_listing_session.fr.xlf b/app/Resources/translations/cocorico_listing_session.fr.xlf
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+    <file date="2018-01-18T10:12:51Z" source-language="en" target-language="fr" datatype="plaintext"
+          original="not.available">
+        <header>
+            <tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
+            <note>The source node in most cases contains the sample message as written by the developer. If it looks
+                like a
+                dot-delimitted string such as "form.label.firstname", then the developer has not provided a default
+                message.
+            </note>
+        </header>
+        <body>
+            <trans-unit id="39b5a7eef4b8a1d29c2616db61bd803bc1e8e5b3" resname="listing.duration">
+                <source>listing.duration</source>
+                <target>Durée</target>
+            </trans-unit>
+            <trans-unit id="5a44c928642e3a4648a60d8ab1ab6362eb1e810a" resname="listing.form.duration">
+                <source>listing.form.duration</source>
+                <target>Durée d'une séance</target>
+            </trans-unit>
+            <trans-unit id="06c59b9b463c217f2965f3a0db032e4377420f1a" resname="listing.show.duration">
+                <source>listing.show.duration</source>
+                <target>Durée d'une séance</target>
+            </trans-unit>
+            <trans-unit id="55c0b3aa3afa5a74762bf8425ed58dd86f6f14a6" resname="listing_session.duration.min {{ min }}">
+                <source>listing_session.duration.min {{ min }}</source>
+                <target state="new">La durée minimum est de {{ min }}</target>
+            </trans-unit>
+            <trans-unit id="f6837b3e73f08e9626617af82fd78015c5d763ad" resname="time_unit_session">
+                <source>time_unit_session</source>
+                <target>{-3} par séance|{-1} heure(s)|{0} séance|]0,1] %hour%h%minute%|]1,Inf]%hour%h%minute%</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -34,7 +34,7 @@ framework:
         handler_id:  ~
         name: _csess
         #on debian there is a /etc/cron.d/php5 doing the job
-        gc_probability: 0 #todo check in prod
+        gc_probability: null
     fragments:       ~
     http_method_override: true
 

diff --git a/app/config/config_staging.yml b/app/config/config_staging.yml
@@ -4,7 +4,7 @@ imports:
 framework:
     test: ~
     session:
-        gc_probability: 0
+        gc_probability: null
 #        storage_id: session.storage.mock_file
 #    profiler:
 #        collect: false

diff --git a/composer.json b/composer.json
@@ -3,14 +3,15 @@
   "license": "MIT",
   "type": "project",
   "description": "The Cocorico Standard Edition distribution",
+  "version": "0.15.1",
   "keywords": [
     "marketplace",
     "service",
     "collaborative",
     "platform",
     "consumption"
   ],
-  "homepage": "http://cocorico.io",
+  "homepage": "http://www.cocorico.io",
   "authors": [
     {
       "name": "Cocolabs SAS",

diff --git a/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityPriceController.php b/src/Cocorico/CoreBundle/Controller/Dashboard/Offerer/ListingAvailabilityPriceController.php
@@ -79,7 +79,7 @@ public function editAvailabilitiesPricesAction(Request $request, Listing $listin
             'CocoricoCoreBundle:Dashboard/Listing:edit_availabilities_prices.html.twig',
             array(
                 'listing' => $listing,
-                'form_prices' => $form->createView()
+                'form' => $form->createView()
             )
         );
 

diff --git a/src/Cocorico/CoreBundle/Controller/Frontend/ListingController.php b/src/Cocorico/CoreBundle/Controller/Frontend/ListingController.php
@@ -39,6 +39,8 @@ class ListingController extends Controller
      * @param Request $request
      *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+     * @throws \Symfony\Component\Form\Exception\RuntimeException
+     * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedException
      */
     public function newAction(Request $request)
     {