From 8ea59863c5d13e68e080cf7612047ea4c655292c Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Sun, 17 Aug 2025 17:35:06 +0200 Subject: debug data for invoices and expenses --- src/ui/ui_expenses.cpp | 23 +++-------------------- src/ui/ui_invoices.cpp | 23 +++-------------------- 2 files changed, 6 insertions(+), 40 deletions(-) (limited to 'src/ui') diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp index 94b0b36..6d1b36c 100644 --- a/src/ui/ui_expenses.cpp +++ b/src/ui/ui_expenses.cpp @@ -289,24 +289,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false) // 7. Supplier information ImGui::Text(localize("invoice.form.supplier")); - bool on_autocomplete; - draw_contact_form_ex(&buffer->supplier, false, true, &on_autocomplete); - - if (on_autocomplete) { - strops_copy(buffer->supplier_id, buffer->supplier.id, sizeof(buffer->supplier_id)); - } - - // Check if contact info is equal to contact stored in customer id, in case we select from dropdown and edit data after, - // this should be handled as a new contact and supplier_id should be set to "" so we create a new contact. - contact lookup_buffer; - if (administration_contact_get_by_id(&lookup_buffer, buffer->supplier_id)) - { - if (!administration_contact_equals(lookup_buffer, buffer->supplier)) - { - buffer->supplier_id[0] = '\0'; - buffer->supplier.id[0] = '\0'; - } - } + draw_contact_form_ex(&buffer->supplier, false, true, 0); // 8. (optional) shipping address. ImGui::Checkbox(localize("invoice.form.triangulation"), &buffer->is_triangulation); @@ -360,8 +343,9 @@ static void ui_draw_expenses_list() invoice invoice_list[items_per_page]; u32 invoice_count = administration_invoice_get_partial_list_incomming(current_page, items_per_page, invoice_list); + u32 total_invoice_count = administation_invoice_get_incomming_count(); - s32 max_page = (invoice_count + items_per_page - 1) / items_per_page; + s32 max_page = (total_invoice_count + items_per_page - 1) / items_per_page; if (max_page == 0) max_page = 1; // Table header controls: create button and pagination. @@ -372,7 +356,6 @@ static void ui_draw_expenses_list() active_invoice.customer = administration_company_info_get(); active_invoice.is_outgoing = 0; active_invoice.status = invoice_status::INVOICE_RECEIVED; - strops_copy(active_invoice.customer_id, active_invoice.customer.id, sizeof(active_invoice.customer_id)); } if (current_page >= max_page-1) current_page = max_page-1; diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp index 2ae0aae..d6bb157 100644 --- a/src/ui/ui_invoices.cpp +++ b/src/ui/ui_invoices.cpp @@ -309,24 +309,7 @@ static void draw_invoice_form(invoice* buffer, bool viewing_only = false) // 7. Customer information ImGui::Text(localize("invoice.form.billinginformation")); - bool on_autocomplete; - draw_contact_form_ex(&buffer->customer, false, true, &on_autocomplete); - - if (on_autocomplete) { - strops_copy(buffer->customer_id, buffer->customer.id, sizeof(buffer->customer_id)); - } - - // Check if contact info is equal to contact stored in customer id, in case we select from dropdown and edit data after, - // this should be handled as a new contact and customer_id should be set to "" so we create a new contact. - contact lookup_buffer; - if (administration_contact_get_by_id(&lookup_buffer, buffer->customer_id)) - { - if (!administration_contact_equals(lookup_buffer, buffer->customer)) - { - buffer->customer_id[0] = '\0'; - buffer->customer.id[0] = '\0'; - } - } + draw_contact_form_ex(&buffer->customer, false, true, 0); // 8. (optional) shipping address. ImGui::Checkbox(localize("invoice.form.triangulation"), &buffer->is_triangulation); @@ -373,8 +356,9 @@ static void ui_draw_invoices_list() invoice invoice_list[items_per_page]; u32 invoice_count = administration_invoice_get_partial_list_outgoing(current_page, items_per_page, invoice_list); + u32 total_invoice_count = administation_invoice_get_outgoing_count(); - s32 max_page = (invoice_count + items_per_page - 1) / items_per_page; + s32 max_page = (total_invoice_count + items_per_page - 1) / items_per_page; if (max_page == 0) max_page = 1; // Table header controls: create button and pagination. @@ -385,7 +369,6 @@ static void ui_draw_invoices_list() active_invoice.supplier = administration_company_info_get(); active_invoice.is_outgoing = 1; active_invoice.status = invoice_status::INVOICE_CONCEPT; - strops_copy(active_invoice.supplier_id, active_invoice.supplier.id, sizeof(active_invoice.supplier_id)); } if (current_page >= max_page-1) current_page = max_page-1; -- cgit v1.2.3-70-g09d2