Refactoring: BankTransaction

[mfinanz.git] / SL / Controller / Admin.pm

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index 6c62024d57d7da7793ebeab86e1570b6814523bf..ab4e24fbb22fdb92065b1a470b77b5675bab2a64 100644 (file)
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -6,6 +6,7 @@ use parent qw(SL::Controller::Base);
 
 use IO::Dir;
 use List::Util qw(first);
 
 use IO::Dir;
 use List::Util qw(first);

+use List::UtilsBy qw(sort_by);

 
 use SL::Common ();
 use SL::DB::AuthUser;
 
 use SL::Common ();
 use SL::DB::AuthUser;


@@ -15,12 +16,13 @@ use SL::Helper::Flash;
 use SL::Locale::String qw(t8);
 use SL::System::InstallationLock;
 use SL::User;
 use SL::Locale::String qw(t8);
 use SL::System::InstallationLock;
 use SL::User;

+use SL::Layout::AdminLogin;

 
 use Rose::Object::MakeMethods::Generic
 (
   'scalar --get_set_init' => [ qw(client user group printer db_cfg is_locked
                                   all_dateformats all_numberformats all_countrycodes all_stylesheets all_menustyles all_clients all_groups all_users all_rights all_printers
 
 use Rose::Object::MakeMethods::Generic
 (
   'scalar --get_set_init' => [ qw(client user group printer db_cfg is_locked
                                   all_dateformats all_numberformats all_countrycodes all_stylesheets all_menustyles all_clients all_groups all_users all_rights all_printers

-                                  all_dbsources all_unused_dbsources all_accounting_methods all_inventory_systems all_profit_determinations all_charts) ],
+                                  all_dbsources all_used_dbsources all_accounting_methods all_inventory_systems all_profit_determinations all_charts) ],

 );
 
 __PACKAGE__->run_before(\&setup_layout);
 );
 
 __PACKAGE__->run_before(\&setup_layout);


@@ -80,18 +82,18 @@ sub action_create_auth_tables {
   $::auth->set_session_value('admin_password', $::lx_office_conf{authentication}->{admin_password});
   $::auth->create_or_refresh_session;
 
   $::auth->set_session_value('admin_password', $::lx_office_conf{authentication}->{admin_password});
   $::auth->create_or_refresh_session;
 

+  return if $self->apply_dbupgrade_scripts;
+

   my $group = (SL::DB::Manager::AuthGroup->get_all(limit => 1))[0];
   if (!$group) {
     SL::DB::AuthGroup->new(
       name        => t8('Full Access'),
       description => t8('Full access to all functions'),
   my $group = (SL::DB::Manager::AuthGroup->get_all(limit => 1))[0];
   if (!$group) {
     SL::DB::AuthGroup->new(
       name        => t8('Full Access'),
       description => t8('Full access to all functions'),

-      rights      => [ map { SL::DB::AuthGroupRight->new(right => $_, granted => 1) } SL::Auth::all_rights() ],
+      rights      => [ map { SL::DB::AuthGroupRight->new(right => $_, granted => 1) } $::auth->all_rights ],

     )->save;
   }
 
     )->save;
   }
 

-  if (!$self->apply_dbupgrade_scripts) {
-    $self->action_login;
-  }
+  $self->action_login;

 }
 
 #
 }
 
 #


@@ -110,12 +112,13 @@ sub action_show {
 sub action_new_user {
   my ($self) = @_;
 
 sub action_new_user {
   my ($self) = @_;
 

+  my $defaults = SL::DefaultManager->new($::lx_office_conf{system}->{default_manager});

   $self->user(SL::DB::AuthUser->new(
     config_values => {
       vclimit      => 200,
   $self->user(SL::DB::AuthUser->new(
     config_values => {
       vclimit      => 200,

-      countrycode  => "de",
-      numberformat => "1.000,00",
-      dateformat   => "dd.mm.yy",
+      countrycode  => $defaults->language('de'),
+      numberformat => $defaults->numberformat('1.000,00'),
+      dateformat   => $defaults->dateformat('dd.mm.yy'),

       stylesheet   => "kivitendo.css",
       menustyle    => "neu",
     },
       stylesheet   => "kivitendo.css",
       menustyle    => "neu",
     },


@@ -135,6 +138,10 @@ sub action_save_user {
   my $props  = delete($params->{config_values}) || { };
   my $is_new = !$params->{id};
 
   my $props  = delete($params->{config_values}) || { };
   my $is_new = !$params->{id};
 

+  # Assign empty arrays if the browser doesn't send those controls.
+  $params->{clients} ||= [];
+  $params->{groups}  ||= [];
+

   $self->user($is_new ? SL::DB::AuthUser->new : SL::DB::AuthUser->new(id => $params->{id})->load)
     ->assign_attributes(%{ $params })
     ->config_values({ %{ $self->user->config_values }, %{ $props } });
   $self->user($is_new ? SL::DB::AuthUser->new : SL::DB::AuthUser->new(id => $params->{id})->load)
     ->assign_attributes(%{ $params })
     ->config_values({ %{ $self->user->config_values }, %{ $props } });


@@ -162,6 +169,10 @@ sub action_delete_user {
 
   my @clients = @{ $self->user->clients || [] };
 
 
   my @clients = @{ $self->user->clients || [] };
 

+  # backup user metadata (email, name, etc)
+  my $user_config_values_ref = $self->user->config_values();
+  my $login =$self->user->login;
+

   if (!$self->user->delete) {
     flash('error', t8('The user could not be deleted.'));
     $self->edit_user_form(title => t8('Edit User'));
   if (!$self->user->delete) {
     flash('error', t8('The user could not be deleted.'));
     $self->edit_user_form(title => t8('Edit User'));


@@ -169,9 +180,15 @@ sub action_delete_user {
   }
 
   # Flag corresponding entries in 'employee' as deleted.
   }
 
   # Flag corresponding entries in 'employee' as deleted.

+  # and restore the most important user data in employee
+  # TODO try and catch the whole transaction {user->delete; update employee} {exception}

   foreach my $client (@clients) {
     my $dbh = $client->dbconnect(AutoCommit => 1) || next;
   foreach my $client (@clients) {
     my $dbh = $client->dbconnect(AutoCommit => 1) || next;

-    $dbh->do(qq|UPDATE employee SET deleted = TRUE WHERE login = ?|, undef, $self->user->login);
+    $dbh->do(qq|UPDATE employee SET deleted = TRUE, name = ?, deleted_email = ?,
+                deleted_tel = ?, deleted_fax = ?, deleted_signature = ? WHERE login = ?|,undef,
+              $user_config_values_ref->{name}, $user_config_values_ref->{email},
+              $user_config_values_ref->{tel}, $user_config_values_ref->{fax},
+              $user_config_values_ref->{signature}, $self->user->login);

     $dbh->disconnect;
   }
 
     $dbh->disconnect;
   }
 


@@ -206,6 +223,10 @@ sub action_save_client {
   my $params = delete($::form->{client}) || { };
   my $is_new = !$params->{id};
 
   my $params = delete($::form->{client}) || { };
   my $is_new = !$params->{id};
 

+  # Assign empty arrays if the browser doesn't send those controls.
+  $params->{groups} ||= [];
+  $params->{users}  ||= [];
+

   $self->client($is_new ? SL::DB::AuthClient->new : SL::DB::AuthClient->new(id => $params->{id})->load)->assign_attributes(%{ $params });
 
   my @errors = $self->client->validate;
   $self->client($is_new ? SL::DB::AuthClient->new : SL::DB::AuthClient->new(id => $params->{id})->load)->assign_attributes(%{ $params });
 
   my @errors = $self->client->validate;


@@ -278,6 +299,10 @@ sub action_save_group {
   my $params = delete($::form->{group}) || { };
   my $is_new = !$params->{id};
 
   my $params = delete($::form->{group}) || { };
   my $is_new = !$params->{id};
 

+  # Assign empty arrays if the browser doesn't send those controls.
+  $params->{clients} ||= [];
+  $params->{users}   ||= [];
+

   $self->group($is_new ? SL::DB::AuthGroup->new : SL::DB::AuthGroup->new(id => $params->{id})->load)->assign_attributes(%{ $params });
 
   my @errors = $self->group->validate;
   $self->group($is_new ? SL::DB::AuthGroup->new : SL::DB::AuthGroup->new(id => $params->{id})->load)->assign_attributes(%{ $params });
 
   my @errors = $self->group->validate;


@@ -366,16 +391,13 @@ sub action_delete_printer {
 # actions: database administration
 #
 
 # actions: database administration
 #
 

-sub action_database_administration {
+sub action_create_dataset_login {

   my ($self) = @_;
 
   my ($self) = @_;
 

-  $::form->{dbhost}    ||= $::auth->{DB_config}->{host} || 'localhost';
-  $::form->{dbport}    ||= $::auth->{DB_config}->{port} || 5432;
-  $::form->{dbuser}    ||= $::auth->{DB_config}->{user} || 'kivitendo';
-  $::form->{dbpasswd}  ||= $::auth->{DB_config}->{password};
-  $::form->{dbdefault} ||= 'template1';
-
-  $self->render('admin/dbadmin', title => t8('Database Administration'));
+  $self->database_administration_login_form(
+    title       => t8('Create Dataset'),
+    next_action => 'create_dataset',
+  );

 }
 
 sub action_create_dataset {
 }
 
 sub action_create_dataset {


@@ -399,7 +421,16 @@ sub action_do_create_dataset {
   User->new->dbcreate($::form);
 
   flash_later('info', t8("The dataset #1 has been created.", $::form->{db}));
   User->new->dbcreate($::form);
 
   flash_later('info', t8("The dataset #1 has been created.", $::form->{db}));

-  $self->redirect_to(action => 'database_administration');
+  $self->redirect_to(action => 'show');
+}
+
+sub action_delete_dataset_login {
+  my ($self) = @_;
+
+  $self->database_administration_login_form(
+    title       => t8('Delete Dataset'),
+    next_action => 'delete_dataset',
+  );

 }
 
 sub action_delete_dataset {
 }
 
 sub action_delete_dataset {


@@ -421,13 +452,22 @@ sub action_do_delete_dataset {
   User->new->dbdelete($::form);
 
   flash_later('info', t8("The dataset #1 has been deleted.", $::form->{db}));
   User->new->dbdelete($::form);
 
   flash_later('info', t8("The dataset #1 has been deleted.", $::form->{db}));

-  $self->redirect_to(action => 'database_administration');
+  $self->redirect_to(action => 'show');

 }
 
 #
 # actions: locking, unlocking
 #
 
 }
 
 #
 # actions: locking, unlocking
 #
 

+sub action_show_lock {
+  my ($self) = @_;
+
+  $self->render(
+    "admin/show_lock",
+    title => "kivitendo " . t8('Administration'),
+  );
+}
+

 sub action_unlock_system {
   my ($self) = @_;
 
 sub action_unlock_system {
   my ($self) = @_;
 


@@ -439,7 +479,7 @@ sub action_unlock_system {
 sub action_lock_system {
   my ($self) = @_;
 
 sub action_lock_system {
   my ($self) = @_;
 

-  SL::System::InstallationLock->unlock;
+  SL::System::InstallationLock->lock;

   flash_later('info', t8('Lockfile created!'));
   $self->redirect_to(action => 'show');
 }
   flash_later('info', t8('Lockfile created!'));
   $self->redirect_to(action => 'show');
 }


@@ -450,7 +490,7 @@ sub action_lock_system {
 
 sub init_db_cfg            { $::lx_office_conf{'authentication/database'}                                                    }
 sub init_is_locked         { SL::System::InstallationLock->is_locked                                                         }
 
 sub init_db_cfg            { $::lx_office_conf{'authentication/database'}                                                    }
 sub init_is_locked         { SL::System::InstallationLock->is_locked                                                         }

-sub init_client            { SL::DB::Manager::AuthClient->find_by(id => ($::form->{id} || ($::form->{client}  || {})->{id})) }
+sub init_client            { SL::DB::Manager::AuthClient->find_by(id => (($::form->{client} || {})->{id} || $::form->{id}))  }

 sub init_user              { SL::DB::AuthUser  ->new(id => ($::form->{id} || ($::form->{user}    || {})->{id}))->load        }
 sub init_group             { SL::DB::AuthGroup ->new(id => ($::form->{id} || ($::form->{group}   || {})->{id}))->load        }
 sub init_printer           { SL::DB::Printer   ->new(id => ($::form->{id} || ($::form->{printer} || {})->{id}))->load        }
 sub init_user              { SL::DB::AuthUser  ->new(id => ($::form->{id} || ($::form->{user}    || {})->{id}))->load        }
 sub init_group             { SL::DB::AuthGroup ->new(id => ($::form->{id} || ($::form->{group}   || {})->{id}))->load        }
 sub init_printer           { SL::DB::Printer   ->new(id => ($::form->{id} || ($::form->{printer} || {})->{id}))->load        }


@@ -459,10 +499,10 @@ sub init_all_users         { SL::DB::Manager::AuthUser  ->get_all_sorted
 sub init_all_groups        { SL::DB::Manager::AuthGroup ->get_all_sorted                                                     }
 sub init_all_printers      { SL::DB::Manager::Printer   ->get_all_sorted                                                     }
 sub init_all_dateformats   { [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd)      ]                                              }
 sub init_all_groups        { SL::DB::Manager::AuthGroup ->get_all_sorted                                                     }
 sub init_all_printers      { SL::DB::Manager::Printer   ->get_all_sorted                                                     }
 sub init_all_dateformats   { [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd)      ]                                              }

-sub init_all_numberformats { [ qw(1,000.00 1000.00 1.000,00 1000,00)          ]                                              }
+sub init_all_numberformats { [ '1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00" ]                                    }

 sub init_all_stylesheets   { [ qw(lx-office-erp.css Mobile.css kivitendo.css) ]                                              }
 sub init_all_dbsources             { [ sort User->dbsources($::form)                               ] }
 sub init_all_stylesheets   { [ qw(lx-office-erp.css Mobile.css kivitendo.css) ]                                              }
 sub init_all_dbsources             { [ sort User->dbsources($::form)                               ] }

-sub init_all_unused_dbsources      { [ sort User->dbsources_unused($::form)                        ] }
+sub init_all_used_dbsources        { { map { (join(':', $_->dbhost || 'localhost', $_->dbport || 5432, $_->dbname) => $_->name) } @{ $_[0]->all_clients }  } }

 sub init_all_accounting_methods    { [ { id => 'accrual',   name => t8('Accrual accounting')  }, { id => 'cash',     name => t8('Cash accounting')       } ] }
 sub init_all_inventory_systems     { [ { id => 'perpetual', name => t8('Perpetual inventory') }, { id => 'periodic', name => t8('Periodic inventory')    } ] }
 sub init_all_profit_determinations { [ { id => 'balance',   name => t8('Balancing')           }, { id => 'income',   name => t8('Cash basis accounting') } ] }
 sub init_all_accounting_methods    { [ { id => 'accrual',   name => t8('Accrual accounting')  }, { id => 'cash',     name => t8('Cash accounting')       } ] }
 sub init_all_inventory_systems     { [ { id => 'perpetual', name => t8('Perpetual inventory') }, { id => 'periodic', name => t8('Periodic inventory')    } ] }
 sub init_all_profit_determinations { [ { id => 'balance',   name => t8('Balancing')           }, { id => 'income',   name => t8('Cash basis accounting') } ] }


@@ -490,13 +530,13 @@ sub init_all_rights {
   my (@sections, $current_section);
 
   foreach my $entry ($::auth->all_rights_full) {
   my (@sections, $current_section);
 
   foreach my $entry ($::auth->all_rights_full) {

-    if ($entry->[0] =~ m/^--/) {
-      push @sections, { description => $entry->[1], rights => [] };
+    if ($entry->[2]) {
+      push @sections, { description => t8($entry->[1]), rights => [] };

 
     } elsif (@sections) {
       push @{ $sections[-1]->{rights} }, {
         name        => $entry->[0],
 
     } elsif (@sections) {
       push @{ $sections[-1]->{rights} }, {
         name        => $entry->[0],

-        description => $entry->[1],
+        description => t8($entry->[1]),

       };
 
     } else {
       };
 
     } else {


@@ -519,19 +559,23 @@ sub init_all_countrycodes {
 sub setup_layout {
   my ($self, $action) = @_;
 
 sub setup_layout {
   my ($self, $action) = @_;
 

+  my $defaults = SL::DefaultManager->new($::lx_office_conf{system}->{default_manager});

   $::request->layout(SL::Layout::Dispatcher->new(style => 'admin'));
   $::request->layout(SL::Layout::Dispatcher->new(style => 'admin'));

-  $::request->layout->use_stylesheet("lx-office-erp.css");

   $::form->{favicon} = "favicon.ico";
   $::form->{favicon} = "favicon.ico";

+  %::myconfig        = (
+    countrycode      => $defaults->language('de'),
+    numberformat     => $defaults->numberformat('1.000,00'),
+    dateformat       => $defaults->dateformat('dd.mm.yy'),
+  ) if !%::myconfig;

 }
 
 sub setup_client {
   my ($self) = @_;
 
 }
 
 sub setup_client {
   my ($self) = @_;
 

-  $self->client((first { $_->is_default } @{ $self->all_clients }) || $self->all_clients->[0]) if !$self->client;
+  $self->client(SL::DB::Manager::AuthClient->get_default || $self->all_clients->[0]) if !$self->client;

   $::auth->set_client($self->client->id);
 }
 
   $::auth->set_client($self->client->id);
 }
 

-

 #
 # displaying forms
 #
 #
 # displaying forms
 #


@@ -545,6 +589,7 @@ sub use_multiselect_js {
 
 sub login_form {
   my ($self, %params) = @_;
 
 sub login_form {
   my ($self, %params) = @_;

+  $::request->layout(SL::Layout::AdminLogin->new);

   my $version         = $::form->read_version;
   $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version);
 }
   my $version         = $::form->read_version;
   $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version);
 }


@@ -569,8 +614,33 @@ sub edit_printer_form {
   $self->render('admin/edit_printer', %params);
 }
 
   $self->render('admin/edit_printer', %params);
 }
 

+sub database_administration_login_form {
+  my ($self, %params) = @_;
+
+  $self->render(
+    'admin/dbadmin',
+    dbhost    => $::form->{dbhost}    || $::auth->{DB_config}->{host} || 'localhost',
+    dbport    => $::form->{dbport}    || $::auth->{DB_config}->{port} || 5432,
+    dbuser    => $::form->{dbuser}    || $::auth->{DB_config}->{user} || 'kivitendo',
+    dbpasswd  => $::form->{dbpasswd}  || $::auth->{DB_config}->{password},
+    dbdefault => $::form->{dbdefault} || 'template1',
+    %params,
+  );
+}
+

 sub create_dataset_form {
   my ($self, %params) = @_;
 sub create_dataset_form {
   my ($self, %params) = @_;

+
+  my $defaults = SL::DefaultManager->new($::lx_office_conf{system}->{default_manager});
+  $::form->{favicon} = "favicon.ico";
+  $::form->{countrymode}          = $defaults->country('DE');
+  $::form->{chart}                = $defaults->chart_of_accounts('Germany-DATEV-SKR03EU');
+  $::form->{defaultcurrency}      = $defaults->currency('EUR');
+  $::form->{precision}            = $defaults->precision(0.01);
+  $::form->{accounting_method}    = $defaults->accounting_method('cash');
+  $::form->{inventory_system}     = $defaults->inventory_system('periodic');
+  $::form->{profit_determination} = $defaults->profit_determination('balance');
+

   $self->render('admin/create_dataset', title => (t8('Database Administration') . " / " . t8('Create Dataset')));
 }
 
   $self->render('admin/create_dataset', title => (t8('Database Administration') . " / " . t8('Create Dataset')));
 }
 


@@ -616,4 +686,12 @@ sub authenticate_root {
   return undef;
 }
 
   return undef;
 }
 

+sub is_user_used_for_task_server {
+  my ($self, $user) = @_;
+
+  return undef if !$user;
+  return join ', ', sort_by { lc } map { $_->name } @{ SL::DB::Manager::AuthClient->get_all(where => [ task_server_user_id => $user->id ]) };
+}
+
+

 1;
 1;