Update app.py

app.py

@@ -1,268 +1,307 @@
 import gradio as gr
 import pandas as pd
 import tempfile
-import os
-from datetime import datetime
+from datetime import datetime, timedelta
+import openpyxl
+from openpyxl.styles import Font, Alignment, Border, Side, PatternFill
+from openpyxl.drawing.image import Image as ExcelImage
+import random
+import base64
+from io import BytesIO
 
-def process_invoice_files(file1, file2, file3, bookings_file, start_date, end_date):
-    """
-    Process uploaded CSV files and generate final invoice
+
+def generate_random_invoice_number():
+    """Generate random 6-digit invoice number"""
+    return str(random.randint(100000, 999999))
+
+
+def create_professional_individual_invoice(workbook, employee_data, start_date, end_date):
+    """Create individual invoice sheet with professional Glimmr template formatting and logo"""
+
+    # --- PASTE YOUR CLEANED BASE64 STRING HERE ---
+    GLIMMR_LOGO_BASE64 = """
+    iVBORw0KGgoAAAANSUhEUgAAAOEAAADhCAMAAAAJbSJIAAAAnFBMVEX///8An9r/nzcAm9kAmdgAndkAl9fo8/rQ5/Vjt+L/myug0OzU6fb/yZzC4PIAldeBwudPsOCn1O05qd7/3MDk8fn/mSH/59Xd7vh6v+a73fFrvOWy2vD/nC74/P6Hx+n/qVP/rl3/0qshpdz/8ub//PlYteL/1rX/lACUy+r/o0L/5Mv/lxr/uXj/vYH/69r/w4z/t3Mfm83/y6CSnfTNAAAGLElEQVR4nO2cfXeiOBTGiXlBxRGF1iJabIeOHabOtLv9/t9tkxBAq+juWV4OOc/vn0ajOfcxbzf3hjoOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0wSyd9m9AuCeUi7tuIVllyIqK+jWiTjBG+6duINokE4bxvI1qFyDE67tuINplwQtd9G/F/ePlxvX4rJyHpxpSWeH24Wu0KMvQx+uvpanUox+iiG0va4eX5cfr8Ul+/o4Sn3ZnTPG+/DqPR4emtrn6sxuisS4ua5/vhcFdbmXA5RncdWtMKvz/r66S3Nuwxqnmo3y08Ruz2R6W3RmjWtxUNcraippyQ4Y/Rivc/X97YUDlG73uxpRXeR4fPkxkZyzHKhj1GTxzSl4/D9GRbTGQP8rBrm5rl7nSff30+eSm9NSLcLu1pnqen09fvxy8y2YXM69CaFvhYTX/XVs7kJOTLDq1pnJe7p+loNB19r3G6+eDH6I/338rl/vN+uXqvBAbdmtQ8r/UudzD4MZrz10ddDVHLTNKlLe3wUH/w3Qix7dCStrh4pnDDjeq8rQVjtIaUcz7suNMN9D4ohu2NXieWa4xcZZYWLDOXcIOQEc3wQxfBPotnbtVRSTQP1qmgnBiFg19oIp9SxgTjqYRQKgSjvJAn8YcfnAmNHK4gX6EDj5Aq5uJM1hGib/OaYH/ec0cKrYjOEEE1l5QyK/b8ZB54WRZsdxckUhuc0pwkXtILfUgHfzTM2S6JuDhI7Ql0h6f9V4nlg083FRwPUc6WpUSLLs/sS4l/k3Foo0J5mM8lid2PjRbIJym3SqGTCc6p2EfOjpmNwjaFTpzuPddxdsaNEwm3apSWoZpNcTDcO8IqhYZxWqw4bD5jNu0WBVGhkBPHk0U68JTMJTymNUppalekNt4HTnbSg+PcSdSKY8fp6YzES/2ts6Vk6FcRrxFJX1UeG/3BH54iz6s94rpx4M27NKYpgkkYLnd5ynPtUyoGfgfhnL1aRqi+ZbjV3suw7zVfYJK71WlZJLRvkxrGyBKJvm+oi32b1DCFQlff+iXDvwx0xpHChKs56VsQ1j7hSKGTLNJ0Yp3XcqzQCmZxfJo9uqlQfsN4Ack4np/3sDuP5+bLUfnRY97urj+30Sgel66XSMdOsk7lmUHlAo8UeillfK/9llgWaRhIh4Ax+Q11jy2ZCFVM82kacsrI+t5xlTPHxFJ+PeC6mD+C8fprupo+vzrO52G1OoxuPH3TGEuWb34i0DlB7p8qXCjfmvsqrO3pZVVMMhPCYIvEhIi5r7vJV9/nYl68S5O1MNupzqF+m45Go8fDx8dK/h1Nay/oNMumjBCagviisNoPc4WkyiDStMwC68fxxElDymUoi/rCjVYoNT7qP9NvnQicnWUGaxTOSoVHVHFvNq8UXqrXG6pRaFjVP7jRJJMiu0sL8y8rZMcKq14sU8I6ViPO6iuN4kzhoZt5WBgVBsG/Vkj3ZdabTIwGHW8zjfG0+N3k/CuC/6qtUqFccB4fn2/Z1ggzExZUjnVYzbirClV3FWbfO+O8Bb6vFMrGAlrqNnNVhToKhavPt9enn90M0q2xZPIfFKp0ofksc517E+hfVgrlqjOvfgzTFotKhVP9YNFrJwJLo7MuFXa0xORkxmjPeoX29mGxeKytVRgbS4i1Cu+LBT6zVWGxWxF5VCj2OMsUBmbLr/iicHdDoXtL4aZnhWUnli6kUrioFBpZtQqTWwoXfStMuDGmOAopheYuolIY+dcVmmK9QtNWfwrlj8zUMZwHxiodGV348jhMfRWe8PKiPOJmPlP40j1IRV6UCl2urtMydTrK65lsIc6L+mxv2pI/0befK0VHHukx0XwelT5qHvuNvMU6y3Muri4msjDOkbJmpqhvRse79cJTgR7z5rj66H3ZlsqivjzkXPmnDG1QhpHyCWNfNjD2zb071xyDrLtYoU73i3g8z0z4iNmWlI+ZXkdZEcSw7z88fb3z61txo/mY7Ul8LI+LWsZSlJExOSMHmZO/xXjDhdq/hQgtvNtkSKLxeGZdAg0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgMPwD+p9Y6vy1tXkAAAAASUVORK5CYII=
     """
+
+    ws = workbook.create_sheet(title=employee_data['Row Labels'])
+
+    column_widths = {'A': 25, 'B': 15, 'C': 15, 'D': 15, 'E': 15, 'F': 12, 'G': 12, 'H': 12, 'I': 12}
+    for col, width in column_widths.items():
+        ws.column_dimensions[col].width = width
+
+    try:
+        if GLIMMR_LOGO_BASE64.strip() and "PASTE" not in GLIMMR_LOGO_BASE64 and "YOUR BASE64" not in GLIMMR_LOGO_BASE64:
+            logo_data = base64.b64decode(GLIMMR_LOGO_BASE64.strip())
+            logo_stream = BytesIO(logo_data)
+            img = ExcelImage(logo_stream)
+            img.width = 200
+            img.height = 100
+            ws.add_image(img, 'A1')
+    except Exception as e:
+        print(f"Logo embedding failed: {e}")
+
+    # Company name
+    ws['A6'] = 'Glimmr Ltd'
+    ws['A6'].font = Font(bold=True, size=16)
+
+    # --- CORRECTED HEADER STRUCTURE TO MATCH ORIGINAL ---
+    # Main header spanning wider (extended one cell left)
+    ws.merge_cells('E2:I2')
+    ws['E2'] = 'CLEANER INVOICE'
+    ws['E2'].font = Font(bold=True, size=14, color='FFFFFF')
+    ws['E2'].alignment = Alignment(horizontal='center', vertical='center')
+    ws['E2'].fill = PatternFill(start_color='4472C4', end_color='4472C4', fill_type='solid')
+
+    # Invoice # header (left side)
+    ws.merge_cells('E6:F6')
+    ws['E6'] = 'Invoice #'
+    ws['E6'].font = Font(bold=True, color='FFFFFF')
+    ws['E6'].fill = PatternFill(start_color='4472C4', end_color='4472C4', fill_type='solid')
+    ws['E6'].alignment = Alignment(horizontal='center', vertical='center')
+
+    # Date header (right side)
+    ws.merge_cells('G6:I6')
+    ws['G6'] = 'Date'
+    ws['G6'].font = Font(bold=True, color='FFFFFF')
+    ws['G6'].fill = PatternFill(start_color='4472C4', end_color='4472C4', fill_type='solid')
+    ws['G6'].alignment = Alignment(horizontal='center', vertical='center')
+
+    # Invoice # value (below header)
+    ws.merge_cells('E7:F7')
+    ws['E7'] = generate_random_invoice_number()
+    ws['E7'].alignment = Alignment(horizontal='center', vertical='center')
+
+    # Date value (below header)
+    ws.merge_cells('G7:I7')
+    ws['G7'] = datetime.now().strftime('%d/%m/%y')
+    ws['G7'].alignment = Alignment(horizontal='center', vertical='center')
+
+    # Company address
+    ws['A8'] = '108 Westbourne Terrace'
+    ws['A9'] = 'London'
+    ws['A10'] = 'W2 6QJ'
+    ws['A11'] = 'support@glimmr.co.uk'
+    ws['A12'] = '020 8158 8505'
+
+    # Payee information
+    ws['A14'] = "Payee's Name"
+    ws['A14'].font = Font(bold=True)
+    ws['A15'] = employee_data['Row Labels']
+    ws['A15'].font = Font(size=11)
+
+    # Payment period header
+    ws.merge_cells('A20:D20')
+    ws['A20'] = 'Payment Period'
+    ws['A20'].font = Font(bold=True, color='FFFFFF')
+    ws['A20'].fill = PatternFill(start_color='4472C4', end_color='4472C4', fill_type='solid')
+    ws['A20'].alignment = Alignment(horizontal='center')
+
+    # Table headers - adjusted positions
+    ws['E20'] = 'Hours'
+    ws['F20'] = '£ / Hour'
+    ws.merge_cells('G20:I20')
+    ws['G20'] = 'Amount'
+
+    for cell in ['E20', 'F20', 'G20']:
+        ws[cell].font = Font(bold=True, color='FFFFFF')
+        ws[cell].fill = PatternFill(start_color='4472C4', end_color='4472C4', fill_type='solid')
+        ws[cell].alignment = Alignment(horizontal='center')
+
+    # Payment period data with center alignment
+    ws.merge_cells('A21:D21')
+    ws['A21'] = f"{start_date} to {end_date}"
+    ws['A21'].alignment = Alignment(horizontal='center')
+    ws['E21'] = employee_data['Sum of Hours Worked']
+    ws['F21'] = f"£  {employee_data['Average of Hourly Rate']:.2f}"
+    ws.merge_cells('G21:I21')
+    ws['G21'] = f"£  {employee_data['Sum of Total']:.2f}"
+
+    # Total sections - adjusted positions
+    ws.merge_cells('F24:G24')
+    ws['F24'] = 'Total Labor'
+    ws['F24'].font = Font(bold=True)
+    ws.merge_cells('H24:I24')
+    ws['H24'] = f"£  {employee_data['Sum of Total']:.2f}"
+
+    ws.merge_cells('F26:G26')
+    ws['F26'] = 'Tax (Withholding)'
+
+    # Payment due date and total
+    due_date = (datetime.strptime(end_date, '%Y-%m-%d') + timedelta(days=1)).strftime('%d/%m/%Y')
+    ws['A27'] = f'Payment is due on {due_date}'
+    ws.merge_cells('F27:G27')
+    ws['F27'] = 'TOTAL'
+    ws['F27'].font = Font(bold=True)
+    ws.merge_cells('H27:I27')
+    ws['H27'] = f"£  {employee_data['Sum of Total']:.2f}"
+    ws['H27'].font = Font(bold=True)
+
+    # Comments section
+    ws['A28'] = 'Comments or Special Instructions:'
+    ws['A28'].font = Font(bold=True)
+    ws['A29'] = 'Payments to be made every other Saturday (or as close to these days).'
+    ws['A30'] = 'Please let us know immediately if there are any issues.'
+
+    # Apply borders - updated ranges
+    thin_border = Border(left=Side(style='thin'), right=Side(style='thin'), top=Side(style='thin'), bottom=Side(style='thin'))
+
+    # Border for payment period table
+    for row in range(20, 22):
+        for col in range(1, 10):
+            ws.cell(row=row, column=col).border = thin_border
+
+    # Border for header section
+    for row in range(6, 8):
+        for col_letter in ['E', 'F', 'G', 'H', 'I']:
+            ws[f'{col_letter}{row}'].border = thin_border
+
+
+def create_invoices_from_template_with_logo(report_data, start_date, end_date):
+    wb = openpyxl.Workbook()
+    wb.remove(wb.active)
+
+    # Create Payments sheet
+    payments_ws = wb.create_sheet(title="Payments")
+    payments_ws['C1'] = 'DO NOT ALTER THIS TEMPLATE'
+    payments_ws['C1'].font = Font(bold=True)
+    headers = ['First Name', 'Last Name', 'Stripe Name', 'Reference', 'Amount (GBP)', 'Remarks']
+    for col, header in enumerate(headers, 1):
+        cell = payments_ws.cell(row=2, column=col, value=header)
+        cell.font = Font(bold=True)
+
+    for row_idx, employee in enumerate(report_data[report_data['Row Labels'] != 'Grand Total'].itertuples(), 3):
+        name_parts = employee._1.split(' ', 1)
+        first_name = name_parts[0] if name_parts else ''
+        last_name = name_parts[1] if len(name_parts) > 1 else ''
+        payments_ws.cell(row=row_idx, column=1, value=first_name)
+        payments_ws.cell(row=row_idx, column=2, value=last_name)
+        payments_ws.cell(row=row_idx, column=3, value=employee._1)
+        payments_ws.cell(row=row_idx, column=4, value='')
+        payments_ws.cell(row=row_idx, column=5, value=employee._4)
+        payments_ws.cell(row=row_idx, column=6, value='')
+
+    # Create Pivot sheet
+    pivot_ws = wb.create_sheet(title="Pivot")
+    pivot_ws['A1'] = f"{start_date} to {end_date}"
+    pivot_ws['A1'].font = Font(bold=True)
+    due_date = (datetime.strptime(end_date, '%Y-%m-%d') + timedelta(days=1)).strftime('%d/%m/%Y')
+    pivot_ws['A2'] = f"Payment is due on {due_date}"
+    pivot_headers = ['Name', 'Average of Hourly Rate', 'Sum of Hours Worked', 'Sum of Total']
+    for col, header in enumerate(pivot_headers, 1):
+        cell = pivot_ws.cell(row=3, column=col, value=header)
+        cell.font = Font(bold=True)
+
+    for row_idx, employee in enumerate(report_data.itertuples(), 4):
+        pivot_ws.cell(row=row_idx, column=1, value=employee._1)
+        pivot_ws.cell(row=row_idx, column=2, value=employee._2)
+        pivot_ws.cell(row=row_idx, column=3, value=employee._3)
+        pivot_ws.cell(row=row_idx, column=4, value=employee._4)
+
+    # Create individual invoice sheets
+    individual_employees = report_data[report_data['Row Labels'] != 'Grand Total']
+    for _, employee in individual_employees.iterrows():
+        create_professional_individual_invoice(wb, employee, start_date, end_date)
+
+    return wb
+
+
+def process_invoice_files_with_professional_excel(file1, file2, file3, bookings_file, start_date, end_date):
     try:
-        # Check which employee files are uploaded (filter out None values)
         employee_files = [f for f in [file1, file2, file3] if f is not None]
-
         if not employee_files:
-            return None, "❗ **Error:** At least one Employee CSV (1.csv, 2.csv, or 3.csv) must be uploaded."
-
+            return None, "❗ **Error:** At least one Employee CSV must be uploaded."
         if bookings_file is None:
-            return None, "❗ **Error:** Bookings CSV is required and must be uploaded."
-
-        print(f"✅ Files loaded successfully:")
-        print(f"Employee files: {len(employee_files)}")
-        print(f"Bookings file: {'✓' if bookings_file else '✗'}")
-
-        # Step 1: Combine available employee CSVs
-        employee_dfs = []
-        for i, ef in enumerate(employee_files):
-            df = pd.read_csv(ef.name)
-            employee_dfs.append(df)
-            print(f"Employee CSV {i+1}: {len(df)} rows")
+            return None, "❗ **Error:** Bookings CSV is required."
 
+        employee_dfs = [pd.read_csv(ef.name) for ef in employee_files]
         all_employee_data = pd.concat(employee_dfs, ignore_index=True)
-
-        # Step 2: Load bookings CSV
         pdf_bookings = pd.read_csv(bookings_file.name)
-        print(f"Bookings CSV: {len(pdf_bookings)} rows")
 
-        # Step 3: Convert dates - FIXED DATE FORMAT PARSING
-        # Handle both DD/MM/YY and DD/MM/YYYY formats
-        all_employee_data['Date'] = pd.to_datetime(all_employee_data['Date'], dayfirst=True, format='mixed')
-        pdf_bookings['Date'] = pd.to_datetime(pdf_bookings['Date'], dayfirst=True, format='mixed')
+        all_employee_data['Date'] = pd.to_datetime(all_employee_data['Date'], dayfirst=True, errors='coerce')
+        pdf_bookings['Date'] = pd.to_datetime(pdf_bookings['Date'], dayfirst=True, errors='coerce')
 
-        # Step 4: Filter by selected date range
         start_date_dt = pd.to_datetime(start_date)
         end_date_dt = pd.to_datetime(end_date)
 
-        filtered_data = all_employee_data[
-            (all_employee_data['Date'] >= start_date_dt) &
-            (all_employee_data['Date'] <= end_date_dt)
-        ].copy()
-
-        filtered_bookings = pdf_bookings[
-            (pdf_bookings['Date'] >= start_date_dt) &
-            (pdf_bookings['Date'] <= end_date_dt)
-        ].copy()
-
-        print(f"📅 Filtered records ({start_date} to {end_date}): {len(filtered_data)} employee records")
+        filtered_data = all_employee_data[(all_employee_data['Date'] >= start_date_dt) & (all_employee_data['Date'] <= end_date_dt)].copy()
+        filtered_bookings = pdf_bookings[(pdf_bookings['Date'] >= start_date_dt) & (pdf_bookings['Date'] <= end_date_dt)].copy()
 
-        # Step 5: Standardize employee names (keep as in expected output)
-        name_mapping = {
-            'Marisa Felipa': 'Marisa Felipa',  # Keep original as shown in expected output
-            'Sumaya Parvin': 'Sumaya Parvin',  # Keep original as shown in expected output
-        }
-        filtered_data['Name'] = filtered_data['Name'].replace(name_mapping)
-
-        # Step 6: Extract tips from bookings
         def extract_employee_name(team_string):
-            if pd.isna(team_string):
-                return None
-            if ',' in team_string:
-                team_string = team_string.split(',')[0].strip()
-            if '(' in team_string:
-                return team_string.split('(')[0].strip()
-            return team_string.strip()
+            if pd.isna(team_string): return None
+            name = team_string.split(',')[0].strip()
+            return name.split('(')[0].strip()
 
         filtered_bookings['Employee_Name'] = filtered_bookings['Teams Assigned  (without IDs)'].apply(extract_employee_name)
-
-        # Find tips (£10 from Morgan Barnes booking for Pelumi Oluwatobi)
         tips_summary = filtered_bookings.groupby('Employee_Name')['Tip'].sum().reset_index()
         tips_with_amount = tips_summary[tips_summary['Tip'] > 0]
 
-        print(f"💰 Total tips found: £{tips_summary['Tip'].sum():.2f}")
         if not tips_with_amount.empty:
-            print(f"Tip recipients: {tips_with_amount[['Employee_Name', 'Tip']].values.tolist()}")
-
-        # Step 7: Add tip as separate rows (matching your manual process)
-        if not tips_with_amount.empty:
-            tip_rows = []
-            for idx, row in tips_with_amount.iterrows():
-                tip_rows.append({
-                    'Date': None,
-                    'Team': 'TIP',
-                    'Name': row['Employee_Name'],
-                    'Hourly Rate': 0,
-                    'Hours Worked': 0,
-                    'Total': row['Tip']  # Put tip in Total column (as per your manual process)
-                })
-
+            tip_rows = [{'Name': row['Employee_Name'], 'Hourly Rate': 0, 'Hours Worked': 0, 'Total': row['Tip']} for _, row in tips_with_amount.iterrows()]
             tip_df = pd.DataFrame(tip_rows)
             final_data = pd.concat([filtered_data, tip_df], ignore_index=True)
         else:
             final_data = filtered_data.copy()
 
-        print(f"📊 Total records after adding tips: {len(final_data)}")
-
-        # Step 8: Simple aggregation by Name (exact replication of your process)
-        report = final_data.groupby('Name').agg({
-            'Hourly Rate': 'mean',
-            'Hours Worked': 'sum',
-            'Total': 'sum'
-        }).reset_index()
-
-        # Step 9: Format to match expected output exactly
-        report = report.rename(columns={
-            'Name': 'Row Labels',
-            'Hourly Rate': 'Average of Hourly Rate',
-            'Hours Worked': 'Sum of Hours Worked',
-            'Total': 'Sum of Total'
-        })
-
-        # Round values to match expected precision
+        report = final_data.groupby('Name').agg({'Hourly Rate': 'mean', 'Hours Worked': 'sum', 'Total': 'sum'}).reset_index()
+        report = report.rename(columns={'Name': 'Row Labels', 'Hourly Rate': 'Average of Hourly Rate', 'Hours Worked': 'Sum of Hours Worked', 'Total': 'Sum of Total'})
         report['Average of Hourly Rate'] = report['Average of Hourly Rate'].round(8)
         report['Sum of Hours Worked'] = report['Sum of Hours Worked'].round(2)
         report['Sum of Total'] = report['Sum of Total'].round(2)
 
-        # Step 10: Add Grand Total
-        if report['Sum of Hours Worked'].sum() > 0:
-            grand_total = pd.DataFrame({
-                'Row Labels': ['Grand Total'],
-                'Average of Hourly Rate': [report['Sum of Total'].sum() / report['Sum of Hours Worked'].sum()],
-                'Sum of Hours Worked': [report['Sum of Hours Worked'].sum()],
-                'Sum of Total': [report['Sum of Total'].sum()]
-            })
-        else:
-            grand_total = pd.DataFrame({
-                'Row Labels': ['Grand Total'],
-                'Average of Hourly Rate': [0],
-                'Sum of Hours Worked': [0],
-                'Sum of Total': [0]
-            })
-
+        total_hours = report['Sum of Hours Worked'].sum()
+        total_sum = report['Sum of Total'].sum()
+        grand_total = pd.DataFrame({'Row Labels': ['Grand Total'], 'Average of Hourly Rate': [total_sum / total_hours if total_hours > 0 else 0], 'Sum of Hours Worked': [total_hours], 'Sum of Total': [total_sum]})
         final_invoice = pd.concat([report, grand_total], ignore_index=True)
 
-        # Step 11: Save to temporary file for download
-        temp_file = tempfile.NamedTemporaryFile(delete=False, suffix='.csv', mode='w')
-        final_invoice.to_csv(temp_file.name, index=False)
-        temp_file.close()
-
-        summary_text = f"""
-📊 **Processing Summary:**
-- Employee CSVs processed: {len(employee_files)} out of 3 possible files
-- Total employees: {len(report)}
-- Total hours worked: {report['Sum of Hours Worked'].sum():.2f}
-- Total amount (including tips): £{report['Sum of Total'].sum():.2f}
-- Date range: {start_date} to {end_date}
-- Records processed: {len(filtered_data)}
-- Tips included: £{tips_summary['Tip'].sum():.2f}
+        wb = create_invoices_from_template_with_logo(final_invoice, start_date, end_date)
 
-✅ **Final invoice generated successfully!**
+        with tempfile.NamedTemporaryFile(delete=False, suffix='.xlsx') as tmp:
+            wb.save(tmp.name)
+            temp_file_path = tmp.name
 
-**Expected Values (with all 3 files):**
-- Should match Final-Invoice.csv exactly
-- Pelumi Oluwatobi: £303.25 (includes £10 tip)
-- Grand Total: £3,877.91
-        """
+        individual_employees_count = len(report[report['Row Labels'] != 'Grand Total'])
+        summary_text = f"🎉 **Professional Invoice Generated Successfully!**\n\n- ✅ **Individual Professional Invoices** for each employee ({individual_employees_count} sheets)\n- ✅ **Payments Summary & Pivot Data** sheets included\n- ✅ **Glimmr Logo & Branding** applied\n\n**Summary for {start_date} to {end_date}:**\n- Total hours: {total_hours:.2f}\n- Total amount: £{total_sum:.2f}"
 
-        return temp_file.name, summary_text
+        return temp_file_path, summary_text
 
     except Exception as e:
-        error_msg = f"❌ **Error processing files:** {str(e)}"
-        print(error_msg)
-        return None, error_msg
+        return None, f"❌ **An error occurred:**\n\n``````\n\nPlease check your input files and date formats (YYYY-MM-DD)."
 
-# Create Gradio Interface
-with gr.Blocks(title="Invoice Generator", theme=gr.themes.Soft()) as interface:
-
-    gr.Markdown("# 🧾 Invoice Generator for Launch27 Data")
-    gr.Markdown("Upload your CSV files and select date range to generate the final invoice with tips included.")
 
+with gr.Blocks(title="Complete Professional Invoice Generator", theme=gr.themes.Soft()) as interface:
+    gr.Markdown("# 🧾 Complete Professional Invoice Generator for Launch27 Data")
     with gr.Row():
-        with gr.Column():
+        with gr.Column(scale=2):
             gr.Markdown("### 📁 Upload CSV Files")
-            gr.Markdown("**Employee Data Files (Upload 1, 2, or 3 files):**")
-            file1 = gr.File(label="Upload 1.csv (Employee Data)", file_types=[".csv"])
-            file2 = gr.File(label="Upload 2.csv (Employee Data)", file_types=[".csv"])
-            file3 = gr.File(label="Upload 3.csv (Employee Data)", file_types=[".csv"])
-
-            gr.Markdown("**Required File:**")
+            file1 = gr.File(label="Upload 1.csv (Optional Employee Data)", file_types=[".csv"])
+            file2 = gr.File(label="Upload 2.csv (Optional Employee Data)", file_types=[".csv"])
+            file3 = gr.File(label="Upload 3.csv (Optional Employee Data)", file_types=[".csv"])
             bookings_file = gr.File(label="Upload Bookings CSV (Required)", file_types=[".csv"])
-
-        with gr.Column():
+        with gr.Column(scale=1):
             gr.Markdown("### 📅 Select Date Range")
-            start_date = gr.Textbox(
-                label="Start Date (YYYY-MM-DD)",
-                value="2025-08-09",
-                placeholder="2025-08-09"
-            )
-            end_date = gr.Textbox(
-                label="End Date (YYYY-MM-DD)",
-                value="2025-08-22",
-                placeholder="2025-08-22"
-            )
-
-            process_btn = gr.Button("🚀 Generate Invoice", variant="primary", size="lg")
+            start_date = gr.Textbox(label="Start Date (YYYY-MM-DD)", value="2025-08-09")
+            end_date = gr.Textbox(label="End Date (YYYY-MM-DD)", value="2025-08-22")
+            process_btn = gr.Button("🚀 Generate Professional Invoice Excel", variant="primary", size="lg")
 
+    gr.Markdown("---")
     gr.Markdown("### 📋 Results")
-
     with gr.Row():
-        with gr.Column():
-            summary_output = gr.Markdown(label="Summary")
+        summary_output = gr.Markdown(label="Summary")
+        download_file = gr.File(label="📥 Download Professional Invoice Excel (.xlsx)")
 
-        with gr.Column():
-            download_file = gr.File(label="📥 Download Final Invoice CSV")
-
-    # Event handlers
     process_btn.click(
-        fn=process_invoice_files,
+        fn=process_invoice_files_with_professional_excel,
         inputs=[file1, file2, file3, bookings_file, start_date, end_date],
         outputs=[download_file, summary_output]
     )
 
-    # Example section
     with gr.Accordion("📖 How to Use", open=False):
         gr.Markdown("""
-**Step-by-step instructions:**
-
-1. **Upload Files**:
-   - **Employee Data**: Upload 1, 2, or 3 CSV files (1.csv, 2.csv, 3.csv)
-   - **Bookings**: Upload bookings CSV file (REQUIRED)
-
-2. **Select Dates**: Enter your bi-weekly date range in YYYY-MM-DD format:
-   - Start Date: First day of the period (e.g., 2025-08-09)
-   - End Date: Last day of the period (e.g., 2025-08-22)
-
-3. **Generate**: Click "Generate Invoice" button
-
-4. **Download**: Download the final invoice CSV file
-
-**Features:**
-- ✅ **Flexible file upload**: Works with 1, 2, or 3 employee CSV files
-- ✅ **Handles DD/MM/YYYY date format** automatically
-- ✅ **Merges multiple employee CSV files**
-- ✅ **Filters data by date range**
-- ✅ **Includes tips from bookings** (£10 from Morgan Barnes)
-- ✅ **Generates pivot table format**
-- ✅ **Matches expected Final-Invoice.csv exactly**
-
-**Expected Output (with all 3 files):**
-- 20 employees total
-- 284 total hours
-- £3,877.91 total (including £10 tip)
-- Pelumi Oluwatobi: £303.25 (£293.25 + £10 tip)
-
-**Note:** At least one employee CSV file and the bookings CSV file are required.
+1.  **Upload Files**: Upload 1-3 employee CSVs and the required bookings CSV.
+2.  **Select Dates**: Enter the date range in YYYY-MM-DD format.
+3.  **Generate**: Click the button.
+4.  **Download**: Your complete Excel file will appear for download.
         """)
 
-    # Footer
-    gr.Markdown("---")
-    gr.Markdown("🔧 Built for Launch27 invoice processing | Works with 1-3 employee CSV files + bookings CSV")
-
-# Launch the interface
 if __name__ == "__main__":
-    interface.launch(
-        share=True,  # Create shareable link
-        debug=True,  # Enable debug mode
-        server_name="0.0.0.0",  # Allow external access
-        server_port=7860  # Default Gradio port
-    )
+    interface.launch(debug=True)