Update app.py

app.py

@@ -270,14 +270,14 @@ def create_invoices_from_template_with_logo(report_data, start_date, end_date):
         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)
+        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=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=5, value=employee[4]) # Sum of Total
         payments_ws.cell(row=row_idx, column=6, value='')
     # Create Pivot sheet
     pivot_ws = wb.create_sheet(title="Pivot")
@@ -285,15 +285,19 @@ def create_invoices_from_template_with_logo(report_data, start_date, 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']
+    # MODIFIED: Updated header name as requested
+    pivot_headers = ['Name', 'Fixed Hourly Rate(without TIP)', '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)
+    for row_idx, employee in enumerate(report_data.itertuples(index=False), 4):
+        # The tuple index corresponds to the column order in the final_invoice DataFrame
+        # [0]: Row Labels, [1]: Avg Rate, [2]: Sum Hours, [3]: Sum Total, [4]: Fixed Rate
+        pivot_ws.cell(row=row_idx, column=1, value=employee[0])  # Name
+        pivot_ws.cell(row=row_idx, column=2, value=employee[4])  # Fixed Hourly Rate(without TIP)
+        pivot_ws.cell(row=row_idx, column=3, value=employee[1])  # Average of Hourly Rate
+        pivot_ws.cell(row=row_idx, column=4, value=employee[2])  # Sum of Hours Worked
+        pivot_ws.cell(row=row_idx, column=5, value=employee[3])  # Sum of Total
     # Create individual invoice sheets
     individual_employees = report_data[report_data['Row Labels'] != 'Grand Total']
     for _, employee in individual_employees.iterrows():
@@ -309,6 +313,9 @@ def process_invoice_files_with_professional_excel(file1, file2, file3, bookings_
             return None, 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)
+        # Add the new Fixed Hour Rate column
+        all_employee_data['Fixed Hour Rate'] = all_employee_data['Hourly Rate']
+
         pdf_bookings = pd.read_csv(bookings_file.name)
         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')
@@ -316,47 +323,88 @@ def process_invoice_files_with_professional_excel(file1, file2, file3, bookings_
         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()
+
         def extract_employee_name(team_string):
             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)
         tips_summary = filtered_bookings.groupby('Employee_Name')['Tip'].sum().reset_index()
         tips_with_amount = tips_summary[tips_summary['Tip'] > 0]
+
         if not tips_with_amount.empty:
-            tip_rows = [{'Name': row['Employee_Name'], 'Hourly Rate': 0, 'Hours Worked': 0, 'Total': row['Tip']} for _, row in tips_with_amount.iterrows()]
+            # Add Fixed Hour Rate to tip rows as 0
+            tip_rows = [{'Name': row['Employee_Name'], 'Hourly Rate': 0, 'Hours Worked': 0, 'Total': row['Tip'], 'Fixed Hour Rate': 0} 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()
-        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'})
+
+        # Update aggregation to include Fixed Hour Rate
+        report = final_data.groupby('Name').agg({
+            'Hourly Rate': 'mean',
+            'Hours Worked': 'sum',
+            'Total': 'sum',
+            'Fixed Hour Rate': 'first' # Use 'first' to get the original rate
+        }).reset_index()
+
+        # MODIFIED: Update column renaming as requested
+        report = report.rename(columns={
+            'Name': 'Row Labels',
+            'Hourly Rate': 'Average of Hourly Rate',
+            'Hours Worked': 'Sum of Hours Worked',
+            'Total': 'Sum of Total',
+            'Fixed Hour Rate': 'Fixed Hourly Rate(without TIP)'
+        })
+
         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)
+
         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]})
+
+        # MODIFIED: Update Grand Total DataFrame to use new column name
+        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],
+            'Fixed Hourly Rate(without TIP)': [None]
+        })
+
         final_invoice = pd.concat([report, grand_total], ignore_index=True)
+
+        # Reorder columns for the create_invoices function to process correctly
+        # The order here determines the order in `itertuples`
+        final_invoice = final_invoice[['Row Labels', 'Average of Hourly Rate', 'Sum of Hours Worked', 'Sum of Total', 'Fixed Hourly Rate(without TIP)']]
+
         wb = create_invoices_from_template_with_logo(final_invoice, start_date, end_date)
+
         with tempfile.NamedTemporaryFile(delete=False, suffix='.xlsx') as tmp:
             wb.save(tmp.name)
             temp_excel_file_path = tmp.name
+
         # Create PDF files for individual cleaners
         pdf_temp_dir = tempfile.mkdtemp()
-        individual_employees = report[report['Row Labels'] != 'Grand Total']
+        individual_employees = final_invoice[final_invoice['Row Labels'] != 'Grand Total']
         pdf_files = []
         for _, employee in individual_employees.iterrows():
             pdf_path = create_individual_pdf_invoice(employee, start_date, end_date, pdf_temp_dir)
             pdf_files.append(pdf_path)
+
         # Create a ZIP file containing all PDFs
         zip_temp_file = tempfile.NamedTemporaryFile(delete=False, suffix='.zip')
         with zipfile.ZipFile(zip_temp_file.name, 'w') as zipf:
             for pdf_file in pdf_files:
                 zipf.write(pdf_file, os.path.basename(pdf_file))
-        individual_employees_count = len(report[report['Row Labels'] != 'Grand Total'])
+
+        individual_employees_count = len(final_invoice[final_invoice['Row Labels'] != 'Grand Total'])
         summary_text = f"🎉 **Professional Invoice Generated Successfully!**\n\n- ✅ **Individual Professional Invoices** for each employee ({individual_employees_count} Excel sheets)\n- ✅ **Individual PDF Invoices** for each cleaner ({individual_employees_count} PDFs)\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}\n\n**Files Generated:**\n- Excel file with all data and individual sheets\n- ZIP file containing individual PDF invoices for each cleaner"
+
         return temp_excel_file_path, zip_temp_file.name, summary_text
+
     except Exception as e:
         return None, None, f"❌ **An error occurred:**\n\n{str(e)}\n\nPlease check your input files and date formats (YYYY-MM-DD)."
 
@@ -400,4 +448,4 @@ with gr.Blocks(title="Complete Professional Invoice Generator", theme=gr.themes.
         """)
 
 if __name__ == "__main__":
-    interface.launch(debug=True)
+    interface.launch(debug=True)