Forráskód Böngészése

fix botoes cancelar

Gustavo Zanatta 1 hete
szülő
commit
a5ce3bf1d8

+ 6 - 0
src/components/dashboard/SolicitationDetailsDialog.vue

@@ -167,6 +167,7 @@
               no-caps
               size="sm"
               :label="$t('provider.dashboard.cancel_schedule.help')"
+              @click="openHelp"
             />
           </div>
         </q-card-section>
@@ -403,6 +404,7 @@ import { computed, ref } from "vue";
 import { useDialogPluginComponent, useQuasar } from "quasar";
 import { useI18n } from "vue-i18n";
 
+import ProfileHelpDialog from "src/components/profile/ProfileHelpDialog.vue";
 import ScheduleCancelDialog from "./ScheduleCancelDialog.vue";
 
 const props = defineProps({
@@ -609,6 +611,10 @@ const parseLocalDate = (dateString) => {
 
 //
 
+const openHelp = () => {
+  $q.dialog({ component: ProfileHelpDialog });
+};
+
 const openCancelDialog = () => {
   $q.dialog({
     component: ScheduleCancelDialog,

+ 4 - 2
src/components/login/LoginStep1Panel.vue

@@ -8,7 +8,8 @@
 
     <q-input
       v-model="email"
-      class="bg-surface q-mt-sm"
+      bg-color="surface"
+      class="q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -49,7 +50,8 @@
 
       <q-input
         v-model="phone"
-        class="bg-surface q-mt-sm"
+        bg-color="surface"
+        class="q-mt-sm"
         hide-bottom-space
         input-class="text-text"
         lazy-rules

+ 30 - 15
src/components/login/LoginStep3Panel.vue

@@ -9,7 +9,8 @@
     <q-input
       :ref="fieldRefs.name"
       v-model="form.name"
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -32,7 +33,8 @@
     <q-input
       :ref="fieldRefs.phone"
       v-model="form.phone"
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -56,7 +58,8 @@
     <q-input
       :ref="fieldRefs.email"
       v-model="form.email"
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -81,7 +84,8 @@
     <q-input
       :ref="fieldRefs.rg"
       v-model="form.rg"
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -106,7 +110,8 @@
     <q-input
       :ref="fieldRefs.document"
       v-model="form.document"
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -131,7 +136,8 @@
     <q-input
       :ref="fieldRefs.birth_date"
       v-model="form.birth_date"
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -170,7 +176,8 @@
     <q-input
       :ref="fieldRefs.zip_code"
       v-model="form.zip_code"
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -206,7 +213,8 @@
     <q-input
       :ref="fieldRefs.address"
       v-model="form.address"
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -232,7 +240,8 @@
         <q-input
           :ref="fieldRefs.number"
           v-model="form.number"
-          class="bg-surface q-mb-md q-mt-sm"
+          bg-color="surface"
+          class="q-mb-md q-mt-sm"
           hide-bottom-space
           input-class="font12 fontmedium text-text"
           lazy-rules
@@ -257,7 +266,8 @@
         <q-input
           :ref="fieldRefs.district"
           v-model="form.district"
-          class="bg-surface q-mb-md q-mt-sm"
+          bg-color="surface"
+          class="q-mb-md q-mt-sm"
           hide-bottom-space
           input-class="font12 fontmedium text-text"
           lazy-rules
@@ -285,7 +295,8 @@
         <q-input
           :ref="fieldRefs.city"
           v-model="form.city"
-          class="bg-surface q-mb-md q-mt-sm"
+          bg-color="surface"
+          class="q-mb-md q-mt-sm"
           hide-bottom-space
           input-class="font12 fontmedium text-text"
           lazy-rules
@@ -310,7 +321,8 @@
         <q-input
           :ref="fieldRefs.state"
           v-model="form.state"
-          class="bg-surface q-mb-md q-mt-sm"
+          bg-color="surface"
+          class="q-mb-md q-mt-sm"
           hide-bottom-space
           input-class="font12 fontmedium text-text"
           lazy-rules
@@ -335,7 +347,8 @@
     <q-input
       :ref="fieldRefs.complement"
       v-model="form.complement"
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -358,7 +371,8 @@
     <q-input
       :ref="fieldRefs.nickname"
       v-model="form.nickname"
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules
@@ -381,7 +395,8 @@
       :ref="fieldRefs.instructions"
       v-model="form.instructions"
       autogrow
-      class="bg-surface q-mb-md q-mt-sm"
+      bg-color="surface"
+      class="q-mb-md q-mt-sm"
       hide-bottom-space
       input-class="font12 fontmedium text-text"
       lazy-rules

+ 5 - 4
src/components/login/LoginStep5Panel.vue

@@ -7,7 +7,8 @@
     <DefaultCurrencyInput
       :ref="fieldRefs.daily_price_8h"
       v-model="form.daily_price_8h"
-      class="bg-surface q-mb-sm custom-currency-input"
+      bg-color="surface"
+      class="q-mb-sm custom-currency-input"
       hide-bottom-space
       input-class="text-text font12 fontmedium"
       label=""
@@ -50,7 +51,7 @@
 
         <q-input
           :model-value="formatCurrency(form.daily_price_6h)"
-          class="bg-surface"
+          bg-color="surface"
           input-class="font12 fontmedium text-text"
           readonly
         />
@@ -63,7 +64,7 @@
 
         <q-input
           :model-value="formatCurrency(form.daily_price_4h)"
-          class="bg-surface"
+          bg-color="surface"
           input-class="font12 fontmedium text-text"
           readonly
         />
@@ -76,7 +77,7 @@
 
         <q-input
           :model-value="formatCurrency(form.daily_price_2h)"
-          class="bg-surface"
+          bg-color="surface"
           input-class="font12 fontmedium text-text"
           readonly
         />

+ 20 - 14
src/pages/dashboard/DashboardPage.vue

@@ -204,20 +204,26 @@ const openDetailsDialog = (solicitation, initialView = "details") => {
   $q.dialog({
     component: SolicitationDetailsDialog,
     componentProps: { initialView, solicitation },
-  }).onOk(async ({ action, id, ids, service_package_id }) => {
-  await handleScheduleAction(
-    id,
-    action === "accept" ? "accepted" : "rejected",
-    ids,
-    service_package_id,
-  );
-
-  if (action === "accept") {
-    $q.dialog({
-      component: ProposalAcceptedDialog,
-    });
-  }
-});
+  }).onOk(async ({ action, id, ids, service_package_id } = {}) => {
+    if (action === "cancelled") {
+      await loadDashboard();
+
+      return;
+    }
+
+    await handleScheduleAction(
+      id,
+      action === "accept" ? "accepted" : "rejected",
+      ids,
+      service_package_id,
+    );
+
+    if (action === "accept") {
+      $q.dialog({
+        component: ProposalAcceptedDialog,
+      });
+    }
+  });
 };
 
 const openNextScheduleDialog = (schedule) => {