Merge pull request #18 from emanuellcs/improve-ui

Improve ui

Author: spacobellas

actions/appointments.ts

@@ -42,6 +42,28 @@ export async function createAppointmentAction(
       };
     }
 
+    // Sync sale's created_at to appointment's start_time
+    if (data?.id) {
+      try {
+        const appointmentId = parseInt(data.id, 10);
+        const appointmentStartTime = appointment.startTime;
+        
+        await supabase
+          .from("sales")
+          .update({ created_at: appointmentStartTime })
+          .eq("appointment_id", appointmentId);
+        
+        console.log(
+          `Sale created_at synced to appointment start_time: ${appointmentStartTime}`
+        );
+      } catch (syncError) {
+        console.warn(
+          "Failed to sync sale created_at to appointment start_time:",
+          syncError
+        );
+      }
+    }
+
     revalidatePath("/agenda");
     revalidatePath("/financeiro");
 

actions/finance.ts

@@ -14,6 +14,7 @@ export type NewSale = Omit<
   "id" | "payments" | "created_at" | "updatedAt" | "clientName" | "totalAmount"
 > & {
   totalAmount?: number;
+  createdAt?: string;
 };
 
 /**
@@ -23,6 +24,41 @@ export async function createSaleAction(sale: NewSale) {
   try {
     const supabase = getSupabaseAdmin();
 
+    // Fetch appointment start time if linked
+    let inheritedCreatedAt = sale.createdAt || new Date().toISOString();
+    if (sale.appointmentId) {
+      try {
+        const appointmentId = parseInt(sale.appointmentId, 10);
+        if (isNaN(appointmentId)) {
+          console.warn(
+            `Invalid appointmentId provided to createSaleAction: ${sale.appointmentId}`
+          );
+        } else {
+          const { data: appt, error: apptErr } = await supabase
+            .from("appointments")
+            .select("start_time")
+            .eq("id", appointmentId)
+            .single();
+
+          if (apptErr) {
+            console.warn(
+              `Failed to fetch appointment ${appointmentId}: ${apptErr.message}`
+            );
+          } else if (appt?.start_time) {
+            inheritedCreatedAt = appt.start_time;
+            console.log(
+              `Sale linked to appointment ${appointmentId}: using start_time ${appt.start_time}`
+            );
+          }
+        }
+      } catch (appointmentFetchError) {
+        console.error(
+          "Error fetching appointment for sale creation:",
+          appointmentFetchError
+        );
+      }
+    }
+
     // Get default commission
     const { data: settingData } = await supabase
       .from("app_settings")
@@ -48,6 +84,7 @@ export async function createSaleAction(sale: NewSale) {
           total_amount: computedTotal,
           status: sale.status || "pending",
           notes: sale.notes || null,
+          created_at: inheritedCreatedAt,
         },
       ])
       .select("*")

app/agenda/page.tsx

@@ -248,20 +248,29 @@ export default function AgendaPage() {
 
         const supabaseRes = await addAppointment(supabasePayload);
         if (supabaseRes) {
+          // Close modal immediately after successful DB save (independent operation)
+          setIsModalOpen(false);
+          toast.success("Agendamento criado!");
+          // Attempt Google Calendar sync (non-blocking)
           res = await createCalendarEvent(googlePayload);
+          if (!res?.success) {
+            toast.error(res?.error || "Erro ao sincronizar com Google Agenda");
+          }
         } else {
           throw new Error("Falha ao salvar no banco de dados.");
         }
       }
 
       if (res?.success) {
-        toast.success(
-          selectedEvent ? "Agendamento atualizado!" : "Agendamento criado!",
-        );
-        setIsModalOpen(false);
+        if (selectedEvent) {
+          // Edit mode: only show success toast for Google Calendar result
+          toast.success("Agendamento atualizado!");
+          setIsModalOpen(false);
+        }
         fetchEvents();
-      } else {
-        toast.error(res?.error || "Erro ao salvar no Google Agenda");
+      } else if (selectedEvent) {
+        // Edit mode: Google Calendar sync failed
+        toast.error(res?.error || "Erro ao atualizar no Google Agenda");
       }
     } catch (e) {
       console.error(e);