From 031ed4fd9e20f8114e52678007451ce742d344b1 Mon Sep 17 00:00:00 2001
From: Matt <matt@letsbe.solutions>
Date: Fri, 15 Aug 2025 15:55:01 +0200
Subject: [PATCH] fixes

---
 components/DuesPaymentBanner.vue | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/components/DuesPaymentBanner.vue b/components/DuesPaymentBanner.vue
index 770b0cb..125443e 100644
--- a/components/DuesPaymentBanner.vue
+++ b/components/DuesPaymentBanner.vue
@@ -151,6 +151,11 @@
 
 <script setup lang="ts">
 import type { RegistrationConfig, Member } from '~/utils/types';
+import { 
+  isPaymentOverOneYear as checkPaymentOverOneYear, 
+  isDuesActuallyCurrent as checkDuesActuallyCurrent, 
+  calculateOverdueDays 
+} from '~/utils/dues-calculations';
 
 // Get auth state
 const { user, isAdmin } = useAuth();
@@ -191,21 +196,11 @@ const isInGracePeriod = computed(() => {
 
 /**
  * Check if a member's last payment is over 1 year old
- * Uses the same logic as dues-status API
+ * Uses standardized dues calculation function
  */
 const isPaymentOverOneYear = computed(() => {
-  if (!memberData.value?.membership_date_paid) return false;
-  
-  try {
-    const lastPaidDate = new Date(memberData.value.membership_date_paid);
-    const oneYearFromPayment = new Date(lastPaidDate);
-    oneYearFromPayment.setFullYear(oneYearFromPayment.getFullYear() + 1);
-    const today = new Date();
-    
-    return today > oneYearFromPayment;
-  } catch {
-    return false;
-  }
+  if (!memberData.value) return false;
+  return checkPaymentOverOneYear(memberData.value);
 });
 
 /**
@@ -257,17 +252,13 @@ const isDueSoon = computed(() => {
 
 /**
  * Check if dues are overdue
+ * Uses standardized dues calculation function
  */
 const isDuesOverdue = computed(() => {
   if (!memberData.value) return false;
   
-  // If dues are current, not overdue
-  const duesCurrentlyPaid = memberData.value.current_year_dues_paid === 'true';
-  const paymentTooOld = isPaymentOverOneYear.value;
-  const gracePeriod = isInGracePeriod.value;
-  
-  // Member is overdue if payment is too old OR (dues not paid AND not in grace period)
-  return paymentTooOld || (!duesCurrentlyPaid && !gracePeriod);
+  // Use the standardized function - if not current, then overdue
+  return !checkDuesActuallyCurrent(memberData.value);
 });
 
 /**