Explorar o código

ajustes aba pedidos: troca labels, reordena componentes e troca botao de lugar

Gustavo Zanatta hai 1 semana
pai
achega
2124d84aaf

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

@@ -868,6 +868,7 @@
     "pix_total": "Pix total",
     "credit_card_fee": "Card total",
     "credit_card_total": "Card total",
+    "total": "Total",
     "pix_discount": "Pix discount: save R$ {value}",
     "discount_saved": "Orders total discount: R$ {value}",
     "discount_hint": "Add {count} more time slot(s) to get the orders discount.",

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

@@ -865,6 +865,7 @@
     "pix_total": "Total con Pix",
     "credit_card_fee": "Total con tarjeta",
     "credit_card_total": "Total con tarjeta",
+    "total": "Total",
     "pix_discount": "Descuento con Pix: ahorre R$ {value}",
     "discount_saved": "Descuento en el total de los pedidos: R$ {value}",
     "discount_hint": "Agregue {count} horario(s) más para recibir descuento en los pedidos.",

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

@@ -876,6 +876,7 @@
     "pix_total": "Total com Pix",
     "credit_card_fee": "Total no cartão",
     "credit_card_total": "Total no cartão",
+    "total" : "Total",
     "pix_discount": "Desconto no Pix: economize R$ {value}",
     "discount_saved": "Desconto no total dos pedidos: R$ {value}",
     "discount_hint": "Adicione mais {count} horário(s) para receber desconto nos pedidos.",

+ 29 - 29
src/pages/orders/ServicePackagePage.vue

@@ -28,18 +28,6 @@
           </span>
         </div>
 
-        <q-btn
-          class="full-width"
-          color="primary"
-          icon="mdi-plus"
-          no-caps
-          outline
-          padding="8px 16px"
-          rounded
-          :label="$t('service_package.add_more')"
-          @click="openAddMoreDialog"
-        />
-
         <q-card
           v-for="(item, index) in servicePackage.items"
           :key="item.local_id"
@@ -112,7 +100,7 @@
               <div class="item-prices q-mt-sm">
                 <div class="row items-center no-wrap">
                   <span class="font11 fontbold text-primary">
-                    {{ $t("service_package.credit_card_total") }}
+                    {{ $t("service_package.total") }}
                   </span>
 
                   <q-space />
@@ -134,8 +122,20 @@
             />
           </q-card-section>
         </q-card>
+        <q-btn
+          class="full-width"
+          color="primary"
+          icon="mdi-plus"
+          no-caps
+          outline
+          padding="8px 16px"
+          rounded
+          :label="$t('service_package.add_more')"
+          @click="openAddMoreDialog"
+        />
       </div>
 
+
       <div class="q-px-md q-pt-md">
         <q-card
           :flat="false"
@@ -234,6 +234,22 @@
       </div>
     </template>
 
+    <div
+      v-if="pendingServicePackages.length > 0"
+      class="q-pt-md"
+    >
+      <div class="section-title gradient-diarista q-px-md q-mb-sm font16 fontbold">
+        {{ $t("service_package.awaiting_payment_title") }}
+      </div>
+
+      <DashboardPendingSchedules
+        :data="pendingServicePackages"
+        progress-class="progress-fill--urgent"
+        type="servicePackage"
+        @view-details="openServicePackagePaymentDialog"
+      />
+    </div>
+
     <DashboardClientProposals
       v-if="schedulesProposals.length > 0"
       :data="schedulesProposals"
@@ -258,22 +274,6 @@
       />
     </div>
 
-    <div
-      v-if="pendingServicePackages.length > 0"
-      class="q-pt-md"
-    >
-      <div class="section-title gradient-diarista q-px-md q-mb-sm font16 fontbold">
-        {{ $t("service_package.awaiting_payment_title") }}
-      </div>
-
-      <DashboardPendingSchedules
-        :data="pendingServicePackages"
-        progress-class="progress-fill--urgent"
-        type="servicePackage"
-        @view-details="openServicePackagePaymentDialog"
-      />
-    </div>
-
     <div
       v-if="pendingSchedules.length > 0"
       class="q-pt-md"