Merge branch 'feature/payment-gateway' into diy-estimate-presentation-module

# Conflicts:
#	src/components/Layout.jsx

src/components/Layout.jsx

@@ -6,7 +6,7 @@ import {
     LayoutDashboard, Map, Calendar, LogOut, User, Home, MessageSquare,
     ChevronLeft, ChevronRight, Sun, Moon, Trophy, Users, Briefcase,
     FileText, Menu, X, Calculator, PlusCircle, ClipboardList, Zap, LayoutGrid, Settings, CloudLightning,
-    HardHat, ShieldCheck, Sparkles, Megaphone, Rocket
+    HardHat, ShieldCheck, Sparkles, Megaphone, Rocket, CreditCard
 } from 'lucide-react';
 
 import PageTransition from './PageTransition';
@@ -155,6 +155,7 @@ const Layout = () => {
                     { to: "/admin/schedule", icon: Calendar, label: "Team Schedule" },
                     { to: "/admin/leaderboard", icon: Trophy, label: "Leaderboard" },
                     { to: "/owner/subcontractor-tasks", icon: HardHat, label: "Subcontractor Tasks" },
+                    { to: "/owner/payments", icon: CreditCard, label: "Payment Management" },
                     { to: "/owner/people", icon: Users, label: "People" },
                     { to: "/owner/settings", icon: Settings, label: "Org Settings" },
                     ...commonItems,
@@ -181,6 +182,7 @@ const Layout = () => {
                     },
                     { to: "/admin/estimates", icon: Calculator, label: "Estimates" },
                     { to: "/admin/subcontractor-tasks", icon: HardHat, label: "Subcontractor Tasks" },
+                    { to: "/owner/payments", icon: CreditCard, label: "Payment Management" },
                     { to: "/admin/settings", icon: Settings, label: "Org Settings" },
                     ...commonItems,
                     { to: "/estimate-wizard/admin", icon: Settings, label: "Wizard Admin" },
@@ -221,6 +223,7 @@ const Layout = () => {
                 return [
                     { to: "/portal/dashboard", icon: LayoutDashboard, label: "Dashboard" },
                     { to: "/portal/profile", icon: User, label: "My Profile" },
+                    { to: "/portal/payments", icon: CreditCard, label: "Payments" },
                     ...commonItems,
                 ];
         }