Merge branch 'development' into fix/diariaapp-gus-ajustes-layout

src/components/dashboard/DashboardFavoriteProviders.vue

@@ -5,14 +5,14 @@
     <div class="scroll-track">
       <q-card
         v-for="item in data"
-        :key="item.id"
+        :key="item.provider_id"
         class="fav-card shadow-card bg-surface card-border"
         :flat="false"
       >
         <q-card-section class="q-pa-sm column text-text">
           <div class="row items-start no-wrap">
             <div class="col-3 q-my-auto">
-              <q-avatar :style="avatarColors[item.provider_id % avatarColors.length]" size="46px" class="text-weight-bold">
+              <q-avatar :style="avatarColors[item.provider_provider_id % avatarColors.length]" size="46px" class="text-weight-bold">
                 {{ item.provider_name?.slice(0,1).toUpperCase() ?? '—' }}
               </q-avatar>
             </div>
@@ -44,10 +44,15 @@
 // import { formatCurrency } from 'src/helpers/utils';
 // import { useI18n } from 'vue-i18n';
 
+import { formatCurrency } from 'src/helpers/utils';
+import { useI18n } from 'vue-i18n';
+
 defineProps({ data: { type: Array, default: () => [] } });
 
 // const { t } = useI18n();
 
+const { t } = useI18n();
+
 const avatarColors = [
   { background: '#ffd5df', color: '#932e57' },
   { background: '#d7e8ff', color: '#2158a8' },
@@ -67,6 +72,19 @@ const avatarColors = [
 //   const min = Math.min(...prices.map(Number));
 //   return t('dashboard_client.favorites.from') + ' ' + formatCurrency(min);
 // };
+
+const bestPrice = (item) => {
+  const prices = [
+    item.daily_price_2h,
+    item.daily_price_4h,
+    item.daily_price_6h,
+    item.daily_price_8h,
+  ].filter(p => p != null && Number(p) > 0);
+
+  if (!prices.length) return t('dashboard_client.favorites.no_price');
+  const min = Math.min(...prices.map(Number));
+  return t('dashboard_client.favorites.from') + ' ' + formatCurrency(min);
+};
 </script>
 
 <style scoped lang="scss">

src/components/dashboard/DashboardLastDoneSchedules.vue

@@ -10,7 +10,7 @@
         :flat="false"
       >
         <q-card-section class="column q-pa-md q-gutter-y-xs text-text">
-          <q-avatar :style="avatarColors[item.provider_id % avatarColors.length]" size="56px" class="text-weight-bold q-mx-auto">
+          <q-avatar :style="avatarColors[item.provider_provider_id % avatarColors.length]" size="56px" class="text-weight-bold q-mx-auto">
             {{ item.provider_name?.slice(0,1).toUpperCase() ?? '—' }}
           </q-avatar>
           <span class="text-done-name">{{ item.provider_name ?? 'Prestador' }}</span>

src/components/dashboard/DashboardNextSchedules.vue

@@ -42,8 +42,8 @@
               <div class="col-5">
                 <div class="full-height column justify-end">
                   <div class="row text-pill-place">
-                    <q-icon :name="addressIcon(item.address_type)" size="15px" color="primary" />
-                    <span class="row items-end">{{ addressLabel(item.address?.address_type) }}</span>
+                    <q-icon :name="addressIcon(item.address?.address_type ?? item.custom_address_type)" size="15px" color="primary" />
+                    <span class="row items-end">{{ addressLabel(item.address?.address_type ?? item.custom_address_type) }}</span>
                   </div>
                 </div>
               </div>
@@ -55,7 +55,6 @@
                   {{ item.total_amount && item.total_amount !== '0.00' ? formatCurrency(item.total_amount) : $t('dashboard_client.next_schedules.to_combine') }}
                 </span>
                 <span class="text-price-label col-6">
-                  <!-- {{ item.schedule_type === 'custom' ? $t('dashboard_client.next_schedules.custom') : $t('dashboard_client.next_schedules.default') }} -->
                   {{ formatLabelByPeriodType(item.period_type) }}
                 </span>
               </div>
@@ -110,7 +109,6 @@ const addressLabel = (type) => {
   if (type === 'home') return t('address.types.commercial.home');
   if (type === 'apartment') return t('dashboard_client.next_schedules.place_apartment');
   if (type === 'commercial') return t('address.types.commercial');
-
   return t('dashboard_client.next_schedules.place_unknown');
 };
 

src/components/dashboard/DashboardProvidersClose.vue

@@ -12,7 +12,7 @@
     <div class="column">
       <q-card
         v-for="p in data"
-        :key="p.id"
+        :key="p.provider_id"
         class="card-border bg-page text-text q-mb-sm"
         :flat="false"
       >
@@ -32,7 +32,7 @@
                   <div class="row items-center">
                     <q-icon name="mdi-star" color="warning" size="16px" />
                     <span class="text-provider-close-rating">
-                      {{ (p.average_rating ?? '-') + ' (' + (p.total_reviews ?? 0) + ')' }}
+                      {{ p.average_rating != null ? (Number(p.average_rating).toFixed(1) + ' (' + (p.total_reviews ?? 0) + ')') : ('(' + (p.total_reviews ?? 0) + ')') }}
                     </span>
                   </div>
                   <div class="row items-center">
@@ -89,15 +89,15 @@ const periodTypeMap = ref({
 const showCorrectValues = (p) => {
   switch (currentPeriodType.value) {
     case 8:
-      return p.daily_price_8h ? formatCurrency(p.daily_price_8h) : '-';
+      return p.daily_price_8h ? formatCurrency(p.daily_price_8h) : t('dashboard_client.providers_close.no_price');
     case 6:
-      return p.daily_price_6h ? formatCurrency(p.daily_price_6h) : '-';
+      return p.daily_price_6h ? formatCurrency(p.daily_price_6h) : t('dashboard_client.providers_close.no_price');
     case 4:
-      return p.daily_price_4h ? formatCurrency(p.daily_price_4h) : '-';
+      return p.daily_price_4h ? formatCurrency(p.daily_price_4h) : t('dashboard_client.providers_close.no_price');
     case 2:
-      return p.daily_price_2h ? formatCurrency(p.daily_price_2h) : '-';
+      return p.daily_price_2h ? formatCurrency(p.daily_price_2h) : t('dashboard_client.providers_close.no_price');
     default:
-      return '-';
+      return t('dashboard_client.providers_close.no_price');
   }
 };
 

src/i18n/locales/en.json

@@ -346,7 +346,9 @@
     },
     "favorites": {
       "title": "Favorites",
-      "view_schedule": "view schedule"
+      "view_schedule": "view schedule",
+      "from": "from",
+      "no_price": "no price"
     },
     "providers_close": {
       "title": "Near you",
@@ -355,7 +357,8 @@
       "until_6h": "Up to 6h",
       "until_4h": "Up to 4h",
       "until_2h": "Up to 2h",
-      "place_home": "Home"
+      "place_home": "Home",
+      "no_price": "to arrange"
     }
   },
   "profile": {

src/i18n/locales/es.json

@@ -346,7 +346,9 @@
     },
     "favorites": {
       "title": "Favoritos",
-      "view_schedule": "ver agenda"
+      "view_schedule": "ver agenda",
+      "from": "desde",
+      "no_price": "sin precio"
     },
     "providers_close": {
       "title": "Cerca de ti",
@@ -355,7 +357,8 @@
       "until_6h": "Hasta 6h",
       "until_4h": "Hasta 4h",
       "until_2h": "Hasta 2h",
-      "place_home": "Casa"
+      "place_home": "Casa",
+      "no_price": "a convenir"
     }
   },
   "profile": {

src/i18n/locales/pt.json

@@ -346,7 +346,9 @@
     },
     "favorites": {
       "title": "Favoritos",
-      "view_schedule": "ver agenda"
+      "view_schedule": "ver agenda",
+      "from": "a partir de",
+      "no_price": "sem preço"
     },
     "providers_close": {
       "title": "Perto de você",
@@ -355,7 +357,8 @@
       "until_6h": "Até 6h",
       "until_4h": "Até 4h",
       "until_2h": "Até 2h",
-      "place_home": "Casa"
+      "place_home": "Casa",
+      "no_price": "a combinar"
     }
   },
   "profile": {