el-contador 1.2.14 → 1.2.16

package/docker-compose.yml

@@ -41,6 +41,13 @@ services:
       INIT_ADMIN_PASSWORD: ${INIT_ADMIN_PASSWORD}
       GEMINI_API_KEY: ${GEMINI_API_KEY:-}
       GEMINI_MODEL: ${GEMINI_MODEL:-gemini-3.1-flash-lite-preview}
+      SMTP_HOST: ${SMTP_HOST:-}
+      SMTP_TLS_SERVERNAME: ${SMTP_TLS_SERVERNAME:-}
+      SMTP_PORT: ${SMTP_PORT:-587}
+      SMTP_SECURE: ${SMTP_SECURE:-false}
+      SMTP_USER: ${SMTP_USER:-}
+      SMTP_PASS: ${SMTP_PASS:-}
+      SMTP_FROM: ${SMTP_FROM:-}
       PORT: 3080
     ports:
       - "${ADMIN_PORT:-3080}:3080"

package/frontend/src/components/ui/checkbox.tsx

@@ -10,7 +10,7 @@ function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
     <CheckboxPrimitive.Root
       data-slot="checkbox"
       className={cn(
-        "peer relative flex size-4 shrink-0 items-center justify-center rounded-[4px] border border-input transition-colors outline-none group-has-disabled/field:opacity-50 after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 aria-invalid:aria-checked:border-primary dark:bg-input/30 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 data-checked:border-primary data-checked:bg-primary data-checked:text-primary-foreground dark:data-checked:bg-primary",
+        "peer relative flex size-4 shrink-0 items-center justify-center rounded-[4px] border border-input transition-colors outline-none group-has-disabled/field:opacity-50 after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 aria-invalid:aria-checked:border-primary dark:bg-input/30 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 data-[checked]:border-primary data-[checked]:bg-primary data-[checked]:text-primary-foreground dark:data-[checked]:bg-primary",
         className
       )}
       {...props}

package/frontend/src/components/ui/select.tsx

@@ -39,7 +39,7 @@ function SelectTrigger({
       data-slot="select-trigger"
       data-size={size}
       className={cn(
-        "flex w-fit items-center justify-between gap-1.5 rounded-lg border border-input bg-transparent py-2 pr-2 pl-2.5 text-sm whitespace-nowrap transition-colors outline-none select-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-placeholder:text-muted-foreground data-[size=default]:h-8 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-1.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "flex w-fit items-center justify-between gap-1.5 rounded-lg border border-input bg-background py-2 pr-2 pl-2.5 text-sm whitespace-nowrap transition-colors outline-none select-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-placeholder:text-muted-foreground data-[size=default]:h-8 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-1.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         className
       )}
       {...props}
@@ -81,11 +81,11 @@ function SelectContent({
         <SelectPrimitive.Popup
           data-slot="select-content"
           data-align-trigger={alignItemWithTrigger}
-          className={cn("relative isolate z-[200] max-h-(--available-height) w-(--anchor-width) min-w-36 origin-(--transform-origin) overflow-x-hidden overflow-y-auto rounded-lg border border-border bg-popover pb-[15px] text-popover-foreground shadow-md duration-100 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95", className )}
+          className={cn("relative isolate z-[200] max-h-(--available-height) w-(--anchor-width) min-w-36 origin-(--transform-origin) overflow-x-hidden overflow-y-auto rounded-lg border border-border bg-popover pb-[15px] text-popover-foreground shadow-md duration-100 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:zoom-in-95 data-closed:animate-out data-closed:zoom-out-95", className )}
           {...props}
         >
           <SelectScrollUpButton />
-          <SelectPrimitive.List>{children}</SelectPrimitive.List>
+          <SelectPrimitive.List className="bg-popover">{children}</SelectPrimitive.List>
           <SelectScrollDownButton />
         </SelectPrimitive.Popup>
       </SelectPrimitive.Positioner>

package/frontend/src/components/ui/switch.tsx

@@ -14,14 +14,14 @@ function Switch({
       data-slot="switch"
       data-size={size}
       className={cn(
-        "peer group/switch relative inline-flex shrink-0 items-center rounded-full border border-transparent transition-all outline-none after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-[size=default]:h-[18.4px] data-[size=default]:w-[32px] data-[size=sm]:h-[14px] data-[size=sm]:w-[24px] dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 data-checked:bg-primary data-unchecked:bg-input dark:data-unchecked:bg-input/80 data-disabled:cursor-not-allowed data-disabled:opacity-50",
+        "peer group/switch relative inline-flex shrink-0 items-center rounded-full border border-transparent transition-all outline-none after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-[size=default]:h-[18.4px] data-[size=default]:w-[32px] data-[size=sm]:h-[14px] data-[size=sm]:w-[24px] dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 data-[checked]:bg-primary data-[unchecked]:bg-input dark:data-[unchecked]:bg-input/80 data-disabled:cursor-not-allowed data-disabled:opacity-50",
         className
       )}
       {...props}
     >
       <SwitchPrimitive.Thumb
         data-slot="switch-thumb"
-        className="pointer-events-none block rounded-full bg-background ring-0 transition-transform group-data-[size=default]/switch:size-4 group-data-[size=sm]/switch:size-3 group-data-[size=default]/switch:data-checked:translate-x-[calc(100%-2px)] group-data-[size=sm]/switch:data-checked:translate-x-[calc(100%-2px)] dark:data-checked:bg-primary-foreground group-data-[size=default]/switch:data-unchecked:translate-x-0 group-data-[size=sm]/switch:data-unchecked:translate-x-0 dark:data-unchecked:bg-foreground"
+        className="pointer-events-none block rounded-full bg-background ring-0 transition-transform group-data-[size=default]/switch:size-4 group-data-[size=sm]/switch:size-3 group-data-[size=default]/switch:data-[checked]:translate-x-[calc(100%-2px)] group-data-[size=sm]/switch:data-[checked]:translate-x-[calc(100%-2px)] dark:data-[checked]:bg-primary-foreground group-data-[size=default]/switch:data-[unchecked]:translate-x-0 group-data-[size=sm]/switch:data-[unchecked]:translate-x-0 dark:data-[unchecked]:bg-foreground"
       />
     </SwitchPrimitive.Root>
   )

package/frontend/src/hooks/useContactLinks.ts

@@ -0,0 +1,74 @@
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import { api } from '../lib/api';
+
+export type ContactLink = {
+  id: string;
+  supplierId: string;
+  supplierName: string;
+  customerId: string;
+  customerName: string;
+  notes: string;
+  createdAt: string;
+};
+
+export type InvoiceSettlement = {
+  id: string;
+  date: string;
+  description: string;
+  adjustmentAmount: number;
+  contactLinkId: string | null;
+  supplierId: string | null;
+  supplierName: string | null;
+  customerId: string | null;
+  customerName: string | null;
+  createdAt: string;
+  salesTotal: number;
+  expenseTotal: number;
+  sales: Array<{ id: string; invoiceNo: string; customer: string; total: number }>;
+  expenses: Array<{ id: string; vendor: string; invoiceNumber: string | null; total: number }>;
+};
+
+export function useContactLinks() {
+  return useQuery({
+    queryKey: ['contact-links'],
+    queryFn: async () => {
+      const { data } = await api.get<ContactLink[]>('/contact-links');
+      return data;
+    },
+  });
+}
+
+export function useCreateContactLink() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async (body: { supplierId: string; customerId: string; notes?: string }) => {
+      const { data } = await api.post<ContactLink>('/contact-links', body);
+      return data;
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['contact-links'] });
+    },
+  });
+}
+
+export function useDeleteContactLink() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async (id: string) => {
+      await api.delete(`/contact-links/${id}`);
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['contact-links'] });
+    },
+  });
+}
+
+export function useInvoiceSettlements() {
+  return useQuery({
+    queryKey: ['reconciliation', 'settlements'],
+    queryFn: async () => {
+      const { data } = await api.get<{ settlements: InvoiceSettlement[] }>('/reconciliation/settlements');
+      return data.settlements;
+    },
+  });
+}

package/frontend/src/hooks/useContacts.ts

@@ -75,6 +75,20 @@ export function useDeleteCustomer() {
   });
 }
 
+export function useMergeCustomers() {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async (body: { keepCustomerId: string; mergeCustomerIds: string[] }) => {
+      const { data } = await api.post<{ ok: boolean; mergedCount: number }>('/customers/merge', body);
+      return data;
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['customers'] });
+      queryClient.invalidateQueries({ queryKey: ['sales'] });
+    },
+  });
+}
+
 // Suppliers
 export function useSuppliers() {
   return useQuery({

package/frontend/src/hooks/useExpenses.ts

@@ -22,6 +22,8 @@ export type Expense = {
   reconciledAt: string | null;
   supplierId: string | null;
   bankTransactionId: string | null;
+  settlementId?: string | null;
+  paymentSource?: 'bank' | 'settlement' | null;
   createdAt: string;
   createdBy?: string | null;
   creatorEmail?: string | null;
@@ -50,7 +52,7 @@ export function useExpenseCategories() {
   });
 }
 
-/** Accounts for expenses: not asset/revenue (100-299) and Allow expenses enabled on the account */
+/** Accounts for expenses: Allow expenses enabled on the account */
 export function useExpenseAccounts() {
   return useQuery({
     queryKey: ['accounts', 'expense'],

package/frontend/src/hooks/useSettings.ts

@@ -60,6 +60,31 @@ export function useSaveIntegrationsSettings() {
   });
 }
 
+export type IntegrationTestResult = { ok: boolean; error?: string; detail?: string };
+
+export function useTestIntegrationConnection() {
+  return useMutation({
+    mutationFn: async (payload: { provider: 'stripe' | 'paddle'; stripeSecretKey?: string; paddleApiKey?: string }) => {
+      const { data } = await api.post<{ testResults: { stripe?: IntegrationTestResult; paddle?: IntegrationTestResult } }>(
+        '/integrations/test',
+        payload
+      );
+      return data;
+    },
+  });
+}
+
+export type PaymentSyncResult = { imported: number; skipped: number; errors: { id?: string; error: string }[] };
+
+export function useSyncPaymentIntegrations() {
+  return useMutation({
+    mutationFn: async (payload: { provider: 'stripe' | 'paddle'; limit?: number }) => {
+      const { data } = await api.post<PaymentSyncResult>('/integrations/sync', payload);
+      return data;
+    },
+  });
+}
+
 // Users
 export function useUsers() {
   return useQuery({

package/frontend/src/index.css

@@ -22,6 +22,7 @@
     --accent: oklch(0.97 0 0);
     --accent-foreground: oklch(0.205 0 0);
     --destructive: oklch(0.58 0.22 27);
+    --destructive-foreground: oklch(0.985 0 0);
     --border: oklch(0.922 0 0);
     --input: oklch(0.922 0 0);
     --ring: oklch(0.708 0 0);
@@ -68,6 +69,7 @@
     --accent: oklch(0.371 0 0);
     --accent-foreground: oklch(0.985 0 0);
     --destructive: oklch(0.704 0.191 22.216);
+    --destructive-foreground: oklch(0.985 0 0);
     --border: oklch(1 0 0 / 10%);
     --input: oklch(1 0 0 / 15%);
     --ring: oklch(0.556 0 0);
@@ -99,7 +101,9 @@
     --font-sans: 'Geist Variable', sans-serif
   }
   * {
-    @apply border-border outline-ring/50;
+    @apply border-border;
+    /* outline-ring/50 is not generated for theme colors defined as full var(--token) */
+    outline-color: color-mix(in oklch, var(--ring) 50%, transparent);
   }
   body {
     @apply bg-background text-foreground;

package/frontend/src/pages/AccountLedger.tsx

@@ -216,7 +216,7 @@ export default function AccountLedger() {
           <div className="flex flex-wrap items-center gap-2">
             <Select value={year} onValueChange={(v) => setYear(v ?? 'all')}>
               <SelectTrigger className="w-24">
-                <SelectValue placeholder="Year">{year === 'all' ? 'All (historic)' : year}</SelectValue>
+                <SelectValue placeholder="Year" />
               </SelectTrigger>
               <SelectContent>
                 <SelectItem value="all">All (historic)</SelectItem>
@@ -240,7 +240,7 @@ export default function AccountLedger() {
               <>
                 <Select value={quarter} onValueChange={(v) => setQuarter(v ?? 'all')}>
                   <SelectTrigger className="w-28">
-                    <SelectValue placeholder="Quarter">{quarter === 'all' ? 'All' : `Q${quarter}`}</SelectValue>
+                    <SelectValue placeholder="Quarter" />
                   </SelectTrigger>
                   <SelectContent>
                     <SelectItem value="all">All</SelectItem>
@@ -251,9 +251,7 @@ export default function AccountLedger() {
                 </Select>
                 <Select value={month} onValueChange={(v) => setMonth(v ?? 'all')}>
                   <SelectTrigger className="w-28">
-                    <SelectValue placeholder="Month">
-                      {month === 'all' ? 'All' : new Date(2000, Number(month) - 1, 1).toLocaleString('default', { month: 'short' })}
-                    </SelectValue>
+                    <SelectValue placeholder="Month" />
                   </SelectTrigger>
                   <SelectContent>
                     <SelectItem value="all">All</SelectItem>