Merge branch 'master' into notification/completion

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue

@@ -6,8 +6,9 @@
          v-model="value"
          :placeholder="$t('select_address')"
          :tag-placeholder="$t('create_address')"
-         :select-label="$t('press_enter_to_select')"
+         :select-label="$t('multiselect.select_label')"
          :deselect-label="$t('create_address')"
+         :selected-label="$t('multiselect.selected_label')"
          @search-change="listenInputSearch"
          ref="addressSelector"
          @select="selectAddress"

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue

@@ -12,8 +12,9 @@
          label="value"
          :custom-label="transName"
          :placeholder="$t('select_city')"
-         :select-label="$t('press_enter_to_select')"
+         :select-label="$t('multiselect.select_label')"
          :deselect-label="$t('create_postal_code')"
+         :selected-label="$t('multiselect.selected_label')"
          :taggable="true"
          :multiple="false"
          @tag="addPostcode"

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue

@@ -5,12 +5,13 @@
          id="countrySelect"
          label="name"
          track-by="id"
-         v-bind:custom-label="transName"
-         v-bind:placeholder="$t('select_country')"
-         v-bind:options="sortedCountries"
+         :custom-label="transName"
+         :placeholder="$t('select_country')"
+         :options="sortedCountries"
          v-model="value"
-         :select-label="$t('press_enter_to_select')"
-         :deselect-label="$t('press_enter_to_remove')"
+         :select-label="$t('multiselect.select_label')"
+         :deselect-label="$t('multiselect.deselect_label')"
+         :selected-label="$t('multiselect.selected_label')"
          @select="selectCountry">
       </VueMultiselect>
    </div>

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue

@@ -10,7 +10,7 @@
    <h4 class="h3">{{ $t('address_suggestions') }}</h4>
 
    <div class="flex-table AddressSuggestionList">
-      <div v-for="a in context.suggestions" class="item-bloc">
+      <div v-for="(a, i) in context.suggestions" class="item-bloc" :key="`suggestions-${i}`">
          <div class="float-button bottom">
             <div class="box">
                <div class="action">

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js

@@ -1,7 +1,7 @@
+import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n'
+
 const addressMessages = {
     fr: {
-        press_enter_to_select: 'Appuyer sur Entrée pour sélectionner',
-        press_enter_to_remove: 'Appuyer sur Entrée pour désélectionner',
         add_an_address_title: 'Créer une adresse',
         edit_an_address_title: 'Modifier une adresse',
         create_a_new_address: 'Créer une nouvelle adresse',
@@ -48,6 +48,8 @@ const addressMessages = {
     }
 };
 
+Object.assign(addressMessages.fr, multiSelectMessages.fr);
+
 export {
     addressMessages
 };

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue

@@ -2,21 +2,28 @@
    <component :is="component" class="chill-entity entity-address my-3">
 
       <component :is="component" class="address" :class="multiline">
-         <p v-if="address.text"
-            class="street">
-            {{ address.text }},
-         </p>
-         <p v-if="address.postcode"
-            class="postcode">
-            {{ address.postcode.code }} {{ address.postcode.name }}
-         </p>
-         <p v-if="address.country"
-            class="country">
-            {{ address.country.name.fr }}
-         </p>
+         <div v-if="isMultiline === true">
+            <p v-for="(l, i) in address.lines" :key="`line-${i}`">
+               {{ l }}
+            </p>
+         </div>
+         <div v-else>
+            <p v-if="address.text"
+               class="street">
+               {{ address.text }}
+            </p>
+            <p v-if="address.postcode"
+               class="postcode">
+               {{ address.postcode.code }} {{ address.postcode.name }}
+            </p>
+            <p v-if="address.country"
+               class="country">
+               {{ address.country.name.fr }}
+            </p>
+         </div>
       </component>
 
-      <div v-if="isMultiline === true" class="address-more">
+      <!-- <div v-if="isMultiline === true" class="address-more">
          <div v-if="address.floor">
             <span class="floor">
                <b>{{ $t('floor') }}</b>: {{ address.floor }}
@@ -52,7 +59,7 @@
                   <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
                </span>
          </div>
-      </div>
+      </div> -->
 
       <div v-if="useDatePane === true" class="address-more">
          <div v-if="address.validFrom">

src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js

@@ -84,3 +84,17 @@ const _createI18n = (appMessages) => {
 };
 
 export { _createI18n }
+
+export const multiSelectMessages = {
+  fr: {
+    multiselect: {
+      placeholder: 'Choisir',
+      tag_placeholder: 'Créer un nouvel élément',
+      select_label: 'Appuyer sur "Entrée" pour sélectionner',
+      deselect_label: 'Appuyer sur "Entrée" pour désélectionner',
+      select_group_label: 'Appuyer sur "Entrée" pour sélectionner ce groupe',
+      deselect_group_label: 'Appuyer sur "Entrée" pour désélectionner ce groupe',
+      selected_label: 'Sélectionné'
+    }
+  }
+};