project-booster-vue 9.52.0 → 9.54.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.52.0",
+  "version": "9.54.0",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/rework/question/city-search/MPbCitySearch.vue

@@ -257,12 +257,16 @@ export default defineComponent({
     updateHeaderHeight() {
       this.headerHeight = this.$refs?.pbCitySearchHeader?.$el?.offsetHeight;
     },
-    formatSuggestion(suggestion: google.maps.places.AutocompletePrediction) {
-      let text = '';
-      for (let i = 0; i < suggestion.terms.length - 1; i++) {
-        text = `${text} ${suggestion.terms[i].value}`;
+    formatSuggestion(suggestion: any) {
+      if (suggestion.name) {
+        return suggestion.name;
+      } else {
+        let text = '';
+        for (let i = 0; i < suggestion.terms.length - 1; i++) {
+          text = `${text} ${suggestion.terms[i].value}`;
+        }
+        return text;
       }
-      return text;
     },
     handleSearchKeywordChange() {
       this.updateHeaderHeight();
@@ -289,24 +293,39 @@ export default defineComponent({
         return;
       }
 
-      const request = {
-        input: this.searchKeyword,
-        types: ['(regions)'],
-        componentRestrictions: {
-          country: 'fr',
-        },
-      };
-
       try {
-        this.googlePlacesAutocompleteService?.getPlacePredictions(request, (results, status) => {
+        this.loadingSuggestions = false;
+        this.displaySuggestions = true;
+
+        if (Number.isNaN(parseInt(this.searchKeyword))) {
+          const request = {
+            input: this.searchKeyword,
+            types: ['(regions)'],
+            componentRestrictions: {
+              country: 'fr',
+            },
+          };
+
+          this.googlePlacesAutocompleteService?.getPlacePredictions(request, (results, status) => {
+            this.loadingSuggestions = false;
+            this.displaySuggestions = true;
+            if (status === 'OK') {
+              this.suggestions = results;
+            } else if (status === 'ZERO_RESULTS') {
+              this.suggestions = null;
+            }
+          });
+        } else {
+          const results = await this.getPlaceFromGeoGouvAPI(this.searchKeyword);
+
           this.loadingSuggestions = false;
           this.displaySuggestions = true;
-          if (status === 'OK') {
+          if (results) {
             this.suggestions = results;
-          } else if (status === 'ZERO_RESULTS') {
+          } else {
             this.suggestions = null;
           }
-        });
+        }
       } catch (error) {
         console.error(`Could not get city search suggestions for ${this.searchKeyword}`, error);
       }
@@ -333,14 +352,10 @@ export default defineComponent({
             const selectedCity = results[0];
             this.suggestions = null;
 
-            const placeData = await this.getPlaceFromGeoGouvAPI(
-              selectedCity.geometry.location.lat(),
-              selectedCity.geometry.location.lng(),
-            );
+            const postalCode = selectedCity.address_components.filter((field) => field.types.includes('postal_code'))[0]
+              ?.short_name;
 
-            const postalCode =
-              selectedCity.address_components.filter((field) => field.types.includes('postal_code'))[0]?.short_name ||
-              placeData.postalCode;
+            const placeData: any = await this.getPlaceFromGeoGouvAPI(postalCode);
 
             const region =
               selectedCity.address_components.filter((field) => field.types.includes('administrative_area_level_1'))[0]
@@ -374,22 +389,26 @@ export default defineComponent({
         ],
       });
     },
-    async getPlaceFromGeoGouvAPI(lat: number, lng: number) {
+    async getPlaceFromGeoGouvAPI(codePostal: string) {
       const placeData = await axios.get('https://geo.api.gouv.fr/communes', {
         params: {
-          lat: lat,
-          lon: lng,
+          codePostal: codePostal,
           fields: 'nom,code,codesPostaux',
           format: 'json',
           geometry: 'centre',
         },
       });
+      let placeDataFormatted: any = [];
 
-      return {
-        inseeCode: placeData.data[0].code,
-        postalCode: placeData.data[0].codesPostaux[0],
-        name: placeData.data[0].nom,
-      };
+      placeData.data.forEach((element: any) => {
+        placeDataFormatted.push({
+          inseeCode: element.code,
+          postalCode: element.codesPostaux[0],
+          name: element.nom,
+        });
+      });
+
+      return placeDataFormatted;
     },
     selectedCityToKeyword(): string {
       return this.selectedCity?.postalCode + ' ' + this.selectedCity?.name + ', ' + this.selectedCity?.region;

package/src/stores/modules/trezorStore.ts

@@ -46,6 +46,11 @@ export default {
         switch (response.status) {
           case 200:
           case 201:
+            // 998 is status returned from trezor for duplicated leads
+            if (response.data.status == 998) {
+              return 'LEAD_DUPLICATED';
+            }
+
             return 'LEAD_CREATED_SUCCESSFULLY';
           case 400:
             return 'LEAD_CREATION_FAILED_DUE_TO_QUOTA';