ui improvements

1 files changed, 9 insertions, 4 deletions

diff --git a/src/ui/ui_settings.cpp b/src/ui/ui_settings.cpp
index defe119..d41affa 100644
--- a/src/ui/ui_settings.cpp
+++ b/src/ui/ui_settings.cpp
@@ -48,7 +48,7 @@ void ui::setup_settings()
     select_company_tab = 1;
     company_info = administration::company_info_get();
 
-    if (administration::can_create_invoices()) {
+    if (administration::company_info_is_valid()) {
         tax_rates = (tax_rate*)memops::alloc(sizeof(tax_rate) * 400);
         tax_rate_count = country::get_available_tax_rates(administration::company_info_get().address.country_code, tax_rates, 400);
 
@@ -61,6 +61,12 @@ void ui::setup_settings()
     }
 }
 
+static void _write_company_info_callback()
+{
+    ui::setup_settings();
+    select_company_tab = 0;
+}
+
 static bool is_writing_vat_rate = false;
 static u32 writing_vat_rate_index = 0;
 static void _vat_rate_write_complete_callback()
@@ -384,19 +390,18 @@ void ui::draw_settings()
             select_company_tab = 0;
             ImGui::ContactForm(&company_info, false, false, true);
 
-            // Save button.
             bool can_save = administration::contact_is_valid(company_info) == A_ERR_SUCCESS;
             if (!can_save) ImGui::BeginDisabled();
             ImGui::Spacing();
             if (ImGui::Button(locale::get("form.save"), true)) {
-                administration_writer::set_write_completed_event_callback(0);
+                administration_writer::set_write_completed_event_callback(_write_company_info_callback);
                 administration::company_info_set(company_info);
             }
             if (!can_save) ImGui::EndDisabled();
 
             ImGui::EndTabItem();
         }
-        if (administration::can_create_invoices()) {
+        if (administration::company_info_is_valid()) {
             if (ImGui::BeginTabItem(locale::get("settings.table.vatrates")))
             {
                 draw_vat_rates();