1 files changed, 24 insertions, 24 deletions

diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index 5d89479..acf0de7 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -30,12 +30,12 @@ void ui_destroy_invoices()
 void ui_setup_invoices()
 {
     current_view_state = view_state::LIST;
-    active_invoice = administration_create_empty_invoice();
+    active_invoice = administration_invoice_create_empty();
 
-    u32 costcenter_count = administration_get_cost_center_count();
+    u32 costcenter_count = administration_cost_center_count();
     cost_center_list_buffer = (cost_center*) malloc(sizeof(cost_center) * costcenter_count); // @leak
 
-    u32 tax_bracket_count = administration_get_tax_bracket_count();
+    u32 tax_bracket_count = administration_tax_bracket_count();
     tax_bracket_list_buffer = (country_tax_bracket*) malloc(sizeof(country_tax_bracket) * tax_bracket_count); // @leak
 }
 
@@ -46,7 +46,7 @@ void draw_tax_bracket_selector(char* tax_bracket_id)
     country_tax_bracket* selected_tax_bracket = NULL;
 
     country_tax_bracket* buffer = tax_bracket_list_buffer;
-    u32 tax_bracket_count = administration_get_tax_brackets_for_country(buffer, administration_get_company_info().address.country_code);
+    u32 tax_bracket_count = administration_tax_bracket_get_by_country(buffer, administration_company_info_get().address.country_code);
 
     // Select tax bracket by given id.
     if (strlen(tax_bracket_id) > 0)
@@ -151,7 +151,7 @@ void draw_costcenter_selector(char* costcenter_id)
     cost_center* selected_costcenter = NULL;
 
     cost_center* buffer = cost_center_list_buffer;
-    u32 costcenter_count = administration_get_cost_centers(buffer);
+    u32 costcenter_count = administration_cost_center_get_all(buffer);
 
     // Select cost center by given id.
     if (strlen(costcenter_id) > 0)
@@ -188,9 +188,9 @@ void draw_project_selector(char* project_id)
 {
     project* selected_project = NULL;
 
-    u32 project_count = administration_get_project_count();
+    u32 project_count = administration_project_count();
     project* buffer = (project*) malloc(sizeof(project) * project_count);
-    project_count = administration_get_all_projects(buffer);
+    project_count = administration_project_get_all(buffer);
 
     // Select project by given id.
     if (strlen(project_id) > 0)
@@ -227,9 +227,9 @@ void draw_project_selector(char* project_id)
 
 static void draw_invoice_items_form(invoice* invoice)
 {
-    u32 invoice_items = administration_get_billing_items_count(invoice);
+    u32 invoice_items = administration_billing_items_count(invoice);
     billing_item* buffer = (billing_item*)malloc(sizeof(billing_item) * invoice_items);
-    administration_get_all_billing_items_for_invoice(invoice, buffer);
+    administration_billing_item_get_all_for_invoice(invoice, buffer);
 
     if (ImGui::BeginTable("TableBillingItems", 9, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg)) {
 
@@ -257,7 +257,7 @@ static void draw_invoice_items_form(invoice* invoice)
             ImGui::TableSetColumnIndex(0);
             if (ImGui::Button("X"))
             {
-                administration_remove_billing_item_from_invoice(invoice, item);
+                administration_billing_item_remove_from_invoice(invoice, item);
             }
             
             ImGui::TableSetColumnIndex(1); 
@@ -328,7 +328,7 @@ static void draw_invoice_items_form(invoice* invoice)
 
             ImGui::PopID();
 
-            administration_update_billing_item_of_invoice(invoice, item);
+            administration_billing_item_update_in_invoice(invoice, item);
         }
 
         ImGui::TableNextRow();
@@ -428,8 +428,8 @@ void draw_invoice_form(invoice* buffer, bool viewing_only = false)
     // 11. New billing item button.
     if (ImGui::Button(localize("+ Billing item")))
     {
-        billing_item item = administration_create_empty_billing_item();
-        administration_add_billing_item_to_invoice(buffer, item);
+        billing_item item = administration_billing_item_create_empty();
+        administration_billing_item_add_to_invoice(buffer, item);
     }
 
     // 12. Dropdown for invoice currency.
@@ -451,15 +451,15 @@ void draw_invoices_list()
 {
     const u32 items_per_page = 50;
     static s32 current_page = 0;
-    s32 max_page = (administration_get_invoice_count() + items_per_page - 1) / items_per_page;
+    s32 max_page = (administration_invoice_count() + items_per_page - 1) / items_per_page;
     if (max_page == 0) max_page = 1;
 
     // Table header controls: create button and pagination.
     if (ImGui::Button(localize("form.create")))
     {
         current_view_state = view_state::CREATE;
-        active_invoice = administration_create_empty_invoice(); // @leak
-        active_invoice.supplier = administration_get_company_info();
+        active_invoice = administration_invoice_create_empty(); // @leak
+        active_invoice.supplier = administration_company_info_get();
         strops_copy(active_invoice.supplier_id, active_invoice.supplier.id, sizeof(active_invoice.supplier_id));
     }
 
@@ -497,7 +497,7 @@ void draw_invoices_list()
         ImGui::TableHeadersRow();
 
         invoice invoice_list[items_per_page];
-        u32 invoice_count = administration_get_invoices(current_page, items_per_page, invoice_list);
+        u32 invoice_count = administration_invoice_get_partial_list(current_page, items_per_page, invoice_list);
 
         for (u32 i = 0; i < invoice_count; i++) {
             invoice c = invoice_list[i];
@@ -513,7 +513,7 @@ void draw_invoices_list()
 
             ImGui::TableSetColumnIndex(3); ImGui::Text(buf);
             ImGui::TableSetColumnIndex(4); ImGui::Text("%.2f %s", c.total, c.currency);
-            ImGui::TableSetColumnIndex(5); ImGui::Text("%s", localize(administration_get_invoice_status_string(&c)));
+            ImGui::TableSetColumnIndex(5); ImGui::Text("%s", localize(administration_invoice_get_status_string(&c)));
             ImGui::TableSetColumnIndex(6);
             
             char btn_name[20];
@@ -535,7 +535,7 @@ void draw_invoices_list()
             }
 
             // ImGui::SameLine();
-            // if (administration_can_contact_be_deleted(c))
+            // if (administration_contact_can_be_deleted(c))
             // {
             //     snprintf(btn_name, sizeof(btn_name), "%s##%d", localize("form.delete"), i);
             //     if (ImGui::Button(btn_name)) {
@@ -551,7 +551,7 @@ void draw_invoices_list()
         //     ImGui::Separator();
 
         //     if (ImGui::Button(localize("form.yes"), ImVec2(120, 0))) { 
-        //         administration_remove_contact(selected_for_removal);
+        //         administration_contact_remove(selected_for_removal);
         //         ImGui::CloseCurrentPopup();
         //     }
         //     ImGui::SameLine();
@@ -574,12 +574,12 @@ static void ui_draw_invoice_update()
     
     draw_invoice_form(&active_invoice);
 
-    bool can_save = administration_is_invoice_valid(&active_invoice);
+    bool can_save = administration_invoice_is_valid(&active_invoice);
     if (!can_save) ImGui::BeginDisabled();
     
     ImGui::Spacing();
     if (ImGui::Button(localize("form.save"))) {
-        administration_update_invoice(&active_invoice);
+        administration_invoice_update(&active_invoice);
         current_view_state = view_state::LIST;
 
         ui_destroy_invoices();
@@ -597,12 +597,12 @@ static void ui_draw_invoice_create()
     
     draw_invoice_form(&active_invoice);
 
-    bool can_save = administration_is_invoice_valid(&active_invoice);
+    bool can_save = administration_invoice_is_valid(&active_invoice);
     if (!can_save) ImGui::BeginDisabled();
     
     ImGui::Spacing();
     if (ImGui::Button(localize("form.save"))) {
-        administration_add_invoice(&active_invoice);
+        administration_invoice_add(&active_invoice);
         current_view_state = view_state::LIST;
 
         ui_destroy_invoices();