Browse Source

fix aba pagamentos: fotos aparecendo, e movimentacoes apenas que deram sucesso

Gustavo Zanatta 1 day ago
parent
commit
60218dc788

+ 2 - 2
src/api/paymentSplit.js

@@ -1,6 +1,6 @@
 import api from 'src/api'
 
-export const getPaymentSplits = async () => {
-  const { data } = await api.get('/provider/payment-splits')
+export const getPaymentSplits = async (params = {}) => {
+  const { data } = await api.get('/provider/payment-splits', { params })
   return data.payload
 }

+ 4 - 2
src/components/payments/MovimentacoesDialog.vue

@@ -24,7 +24,8 @@
             <q-card-section class="q-pa-sm">
               <div class="row items-center no-wrap q-gutter-x-sm">
                 <q-avatar size="40px" :color="movBgColor(item.type)" :text-color="movIconColor(item.type)">
-                  <q-icon :name="movIcon(item.type)" size="20px" />
+                  <img v-if="item.client_photo" :src="item.client_photo" style="object-fit: cover" />
+                  <q-icon v-else :name="movIcon(item.type)" size="20px" />
                 </q-avatar>
                 <div class="col column">
                   <span class="font13 fontsemibold text-dark">{{ movLabel(item) }}</span>
@@ -68,7 +69,7 @@ const loadMovements = async () => {
   loading.value = true;
   try {
     const [splits, withdrawals] = await Promise.all([
-      getPaymentSplits(),
+      getPaymentSplits({ payment_status: 'paid' }),
       getWithdrawals(),
     ]);
 
@@ -76,6 +77,7 @@ const loadMovements = async () => {
       id: `split-${s.id}`,
       type: 'servico',
       client_name: s.client_name,
+      client_photo: s.client_photo,
       gross_amount: parseFloat(s.gross_amount || 0),
       created_at: s.created_at,
     }));

+ 3 - 3
src/pages/payments/PaymentsPage.vue

@@ -244,10 +244,10 @@
                 </div>
 
                 <div class="text-text fontmedium font12">
-                  <span>
+                  <span class="text-text">
                     {{ $t("provider.payments.services_date_payment") }}
+                    {{ " " + item.payment_date }}
                   </span>
-                  {{ " " + item.payment_date }}
                 </div>
               </div>
 
@@ -410,7 +410,7 @@ const loadData = async () => {
       client_name:
         split.client_name ??
         t("provider.payments.default_client_name"),
-      client_photo: null,
+      client_photo: split.client_photo ?? null,
       date: formatServiceDate(split.schedule_date),
       payment_date: formatIsoDate(split.payment_paid_at),
       total_amount: splitAmount(split),