Procházet zdrojové kódy

Merge remote-tracking branch 'origin/development' into feature/diaria-gus-4leva

Gustavo Zanatta před 2 týdny
rodič
revize
e21af15d48

+ 7 - 2
src/api/clientFavoriteProvider.js

@@ -6,9 +6,14 @@ export const getClientFavoriteProviders = async (clientId) => {
 }
 
 export const createClientFavoriteProvider = async (info) => {
-  const { data } = await api.post(`/client/favorite-provider`, info);
+  const { data } = await api.post(`/client/favorite-provider`,info,
+    {
+      skipSuccessNotify: true,
+    }
+  );
+
   return data.payload;
-}
+};
 
 export const deleteClientFavoriteProvider = async (id) => {
   const { data } = await api.delete(`/client/favorite-provider/${id}`);

+ 0 - 22
src/components/login/LoginStep3Panel.vue

@@ -289,28 +289,6 @@
       />
     </div>
 
-    <div>
-      <div class="text-text">
-        <span class="font14 fontbold">
-          {{ $t("auth.address_instructions") }}
-        </span>
-      </div>
-
-      <q-input
-        v-model="form.instructions"
-        autogrow
-        bg-color="surface"
-        class="q-mt-sm q-mb-md"
-        hide-bottom-space
-        input-class="text-text"
-        lazy-rules
-        no-error-icon
-        outlined
-        rounded
-        rows="3"
-        type="textarea"
-      />
-    </div>
 
     <div>
       <div class="row q-gutter-sm q-mt-xs">

+ 1 - 1
src/i18n/locales/en.json

@@ -174,7 +174,7 @@
     "back_to_register": "Back to registration",
     "cep_not_found": "ZIP code not found. Please check and try again.",
     "location_permission_denied": "Location permission denied. Please enable it in device settings.",
-    "location_error": "Could not get your location. Please try again.",
+    "location_error": "Turn on your location",
     "confirm_location": "confirm location",
     "confirm_address": "confirm address",
     "complement": "Complement",

+ 1 - 1
src/i18n/locales/es.json

@@ -174,7 +174,7 @@
     "back_to_register": "Volver al registro",
     "cep_not_found": "Código postal no encontrado. Verifique e intente nuevamente.",
     "location_permission_denied": "Permiso de ubicación denegado. Habilítelo en la configuración del dispositivo.",
-    "location_error": "No se pudo obtener tu ubicación. Inténtalo de nuevo.",
+    "location_error": "Activa tu ubicación.",
     "confirm_location": "confirmar ubicación",
     "confirm_address": "confirmar dirección",
     "complement": "Complemento",

+ 1 - 1
src/i18n/locales/pt.json

@@ -174,7 +174,7 @@
     "back_to_register": "Voltar para o cadastro",
     "cep_not_found": "CEP não encontrado. Verifique e tente novamente.",
     "location_permission_denied": "Permissão de localização negada. Habilite nas configurações do dispositivo.",
-    "location_error": "Não foi possível obter sua localização. Tente novamente.",
+    "location_error": "Ative a sua localização",
     "confirm_location": "confirmar localização",
     "confirm_address": "confirmar endereço",
     "complement": "Complemento",

+ 9 - 3
src/pages/LoginPage.vue

@@ -607,13 +607,19 @@ onMounted(() => {
 }
 
 .register-later-row {
+  position: absolute;
+  top: 12px;
+  right: 16px;
+  z-index: 10;
+
   display: flex;
   justify-content: flex-end;
-  margin-top: -14px;
-  padding-bottom: 18px;
 }
 
 .register-later-btn {
-  justify-content: flex-end;
+  color: #8a8a8a !important;
+  font-size: 12px;
+  padding: 0;
+  min-height: 24px;
 }
 </style>

+ 0 - 29
src/pages/schedules/SobMedidaPage.vue

@@ -97,24 +97,6 @@
             />
           </div>
         </div>
-
-        <div class="field-label text-center gradient-diarista">
-          {{ $t('sob_medida.description_label') }}
-          <span class="optional">
-            {{ $t('sob_medida.optional') }}
-          </span>
-        </div>
-
-        <q-input
-          v-model="description"
-          type="textarea"
-          outlined
-          bg-color="white"
-          color="dark"
-          input-class="text-black"
-          class="description-box"
-          :placeholder="$t('sob_medida.description_placeholder')"
-        />
       </q-card>
 
       <div class="section-title gradient-diarista font16 fontbold">
@@ -218,7 +200,6 @@ const address = ref(null)
 const selectedServiceType = ref(null)
 const selectedSpecialties = ref([])
 const selectedOption = ref('home')
-const description = ref('')
 const selectedDate = ref(null)
 const quantity = ref(1)
 
@@ -309,7 +290,6 @@ const saveFinalOrder = async (payloadFinal) => {
     end_time: `${endHour}:00`,
     address_type: selectedOption.value,
     service_type_id: selectedServiceType.value,
-    description: description.value,
     min_price: priceRange.value.min,
     max_price: priceRange.value.max,
     offers_meal: payloadFinal.meal === 'offer',
@@ -444,15 +424,6 @@ onMounted(async () => {
   justify-content: flex-start;
 }
 
-.description-box {
-  margin-top: 8px;
-}
-
-.description-box :deep(textarea) {
-  min-height: 90px;
-  resize: none;
-}
-
 .compact-card {
   padding: 28px 22px;
   background: #fafafa;

+ 12 - 9
src/pages/search/SearchPage.vue

@@ -153,6 +153,7 @@
           :key="p.provider_id"
           :flat="false"
           class="card-border bg-page text-text q-mb-sm"
+          @click="openProviderInfo(p)"
         >
           <q-card-section class="row no-wrap q-pa-sm">
             <div class="row no-wrap full-width">
@@ -185,13 +186,6 @@
                     }}
                   </span>
 
-                  <span
-                    v-if="getProviderGenderLabel(p, t)"
-                    class="font9 fontmedium text-grey-7"
-                  >
-                    {{ getProviderGenderLabel(p, t) }}
-                  </span>
-
                   <span
                     class="text-provider-close-region font9 fontbold text-grey-7"
                    >
@@ -260,7 +254,7 @@
                       size="sm"
                       unelevated
                       :label="$t('search_page.schedule_btn')"
-                      @click="goToScheduling(p)"
+                      @click.stop="goToScheduling(p)"
                     />
                   </div>
                 </div>
@@ -278,7 +272,6 @@ import { avatarColors } from "src/helpers/avatarColors";
 import { buscaPrestadores } from "src/api/dashboard";
 import { computed, onMounted, ref } from "vue";
 import { formatCurrency, getFirstName } from "src/helpers/utils";
-import { getProviderGenderLabel } from "src/helpers/provider";
 import { useI18n } from "vue-i18n";
 import { useQuasar } from "quasar";
 import { useRouter } from "vue-router";
@@ -286,6 +279,7 @@ import { useRouter } from "vue-router";
 import AddressIncompleteBanner from "src/components/shared/AddressIncompleteBanner.vue";
 import SchedulingDialog from "src/pages/search/components/SchedulingDialog.vue";
 import SearchFilterDialog from "src/pages/search/components/SearchFilterDialog.vue";
+import ProfileInfoDialog from "src/components/profile/ProfileInfoDialog.vue";
 
 const { t } = useI18n();
 const router = useRouter();
@@ -385,6 +379,15 @@ const goToScheduling = (provider) => {
   });
 };
 
+const openProviderInfo = (provider) => {
+  $q.dialog({
+    component: ProfileInfoDialog,
+    componentProps: {
+      provider,
+    },
+  });
+};
+
 const loadProviders = async () => {
   loading.value = true;