X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=53324c6c5568fe567501482d7361a975cb86c1ef;hb=f5e340dfd90576faa5130ca4530840e6d2ce5e81;hp=f43578bb623e43a5c15fb7e5deef0c0a8529215d;hpb=91ab1ef646193de9359076a876a33a74d7691145;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index f43578bb6..53324c6c5 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -38,17 +38,22 @@
package Form;
use Data::Dumper;
-use Cwd;
-use Template;
-use SL::Template;
+use CGI;
use CGI::Ajax;
+use Cwd;
+use List::Util qw(min max);
+use SL::Auth;
+use SL::Auth::DB;
+use SL::Auth::LDAP;
+use SL::AM;
+use SL::Common;
use SL::DBUtils;
use SL::Mailer;
use SL::Menu;
+use SL::Template;
use SL::User;
-use SL::Common;
-use CGI;
-use List::Util qw(max min sum);
+use Template;
+use List::Util qw(first max min sum);
my $standard_dbh;
@@ -59,36 +64,71 @@ sub DESTROY {
}
}
+sub _store_value {
+ $main::lxdebug->enter_sub(2);
+
+ my $self = shift;
+ my $key = shift;
+ my $value = shift;
+
+ my $curr = $self;
+
+ while ($key =~ /\[\+?\]\.|\./) {
+ substr($key, 0, $+[0]) = '';
+
+ if ($& eq '.') {
+ $curr->{$`} ||= { };
+ $curr = $curr->{$`};
+
+ } else {
+ $curr->{$`} ||= [ ];
+ if (!scalar @{ $curr->{$`} } || $& eq '[+].') {
+ push @{ $curr->{$`} }, { };
+ }
+
+ $curr = $curr->{$`}->[-1];
+ }
+ }
+
+ $curr->{$key} = $value;
+
+ $main::lxdebug->leave_sub(2);
+
+ return \$curr->{$key};
+}
+
sub _input_to_hash {
$main::lxdebug->enter_sub(2);
- my $input = $_[0];
- my %in = ();
+ my $self = shift;
+ my $input = shift;
+
my @pairs = split(/&/, $input);
foreach (@pairs) {
- my ($name, $value) = split(/=/, $_, 2);
- $in{$name} = unescape(undef, $value);
+ my ($key, $value) = split(/=/, $_, 2);
+ $self->_store_value($self->unescape($key), $self->unescape($value));
}
$main::lxdebug->leave_sub(2);
-
- return %in;
}
sub _request_to_hash {
$main::lxdebug->enter_sub(2);
- my ($input) = @_;
+ my $self = shift;
+ my $input = shift;
if (!$ENV{'CONTENT_TYPE'}
|| ($ENV{'CONTENT_TYPE'} !~ /multipart\/form-data\s*;\s*boundary\s*=\s*(.+)$/)) {
+
+ $self->_input_to_hash($input);
+
$main::lxdebug->leave_sub(2);
- return _input_to_hash($input);
+ return;
}
- my ($name, $filename, $headers_done, $content_type, $boundary_found, $need_cr);
- my %params;
+ my ($name, $filename, $headers_done, $content_type, $boundary_found, $need_cr, $previous);
my $boundary = '--' . $1;
@@ -96,9 +136,9 @@ sub _request_to_hash {
last if (($line eq "${boundary}--") || ($line eq "${boundary}--\r"));
if (($line eq $boundary) || ($line eq "$boundary\r")) {
- $params{$name} =~ s|\r?\n$|| if $name;
+ ${ $previous } =~ s|\r?\n$|| if $previous;
- undef $name;
+ undef $previous;
undef $filename;
$headers_done = 0;
@@ -130,8 +170,8 @@ sub _request_to_hash {
substr $line, $-[0], $+[0] - $-[0], "";
}
- $params{$name} = "";
- $params{FILENAME} = $filename if ($filename);
+ $previous = $self->_store_value($name, '');
+ $self->{FILENAME} = $filename if ($filename);
next;
}
@@ -143,15 +183,14 @@ sub _request_to_hash {
next;
}
- next unless $name;
+ next unless $previous;
- $params{$name} .= "${line}\n";
+ ${ $previous } .= "${line}\n";
}
- $params{$name} =~ s|\r?\n$|| if $name;
+ ${ $previous } =~ s|\r?\n$|| if $previous;
$main::lxdebug->leave_sub(2);
- return %params;
}
sub new {
@@ -176,17 +215,86 @@ sub new {
$_ = $ARGV[0];
}
- my %parameters = _request_to_hash($_);
- map({ $self->{$_} = $parameters{$_}; } keys(%parameters));
+ bless $self, $type;
- $self->{action} = lc $self->{action};
- $self->{action} =~ s/( |-|,|\#)/_/g;
+ $self->_request_to_hash($_);
- $self->{version} = "2.4.3";
+ $self->{action} = lc $self->{action};
+ $self->{action} =~ s/( |-|,|\#)/_/g;
+
+ $self->{version} = "2.4.3";
$main::lxdebug->leave_sub();
- bless $self, $type;
+ return $self;
+}
+
+sub _flatten_variables_rec {
+ $main::lxdebug->enter_sub(2);
+
+ my $self = shift;
+ my $curr = shift;
+ my $prefix = shift;
+ my $key = shift;
+
+ my @result;
+
+ if ('' eq ref $curr->{$key}) {
+ @result = ({ 'key' => $prefix . $key, 'value' => $curr->{$key} });
+
+ } elsif ('HASH' eq ref $curr->{$key}) {
+ foreach my $hash_key (sort keys %{ $curr->{$key} }) {
+ push @result, $self->_flatten_variables_rec($curr->{$key}, $prefix . $key . '.', $hash_key);
+ }
+
+ } else {
+ foreach my $idx (0 .. scalar @{ $curr->{$key} } - 1) {
+ my $first_array_entry = 1;
+
+ foreach my $hash_key (sort keys %{ $curr->{$key}->[$idx] }) {
+ push @result, $self->_flatten_variables_rec($curr->{$key}->[$idx], $prefix . $key . ($first_array_entry ? '[+].' : '[].'), $hash_key);
+ $first_array_entry = 0;
+ }
+ }
+ }
+
+ $main::lxdebug->leave_sub(2);
+
+ return @result;
+}
+
+sub flatten_variables {
+ $main::lxdebug->enter_sub(2);
+
+ my $self = shift;
+ my @keys = @_;
+
+ my @variables;
+
+ foreach (@keys) {
+ push @variables, $self->_flatten_variables_rec($self, '', $_);
+ }
+
+ $main::lxdebug->leave_sub(2);
+
+ return @variables;
+}
+
+sub flatten_standard_variables {
+ $main::lxdebug->enter_sub(2);
+
+ my $self = shift;
+ my %skip_keys = map { $_ => 1 } (qw(login password header stylesheet titlebar version), @_);
+
+ my @variables;
+
+ foreach (grep { ! $skip_keys{$_} } keys %{ $self }) {
+ push @variables, $self->_flatten_variables_rec($self, '', $_);
+ }
+
+ $main::lxdebug->leave_sub(2);
+
+ return @variables;
}
sub debug {
@@ -201,6 +309,24 @@ sub debug {
$main::lxdebug->leave_sub();
}
+sub dumper {
+ $main::lxdebug->enter_sub(2);
+
+ my $self = shift;
+ my $password = $self->{password};
+
+ $self->{password} = 'X' x 8;
+
+ local $Data::Dumper::Sortkeys = 1;
+ my $output = Dumper($self);
+
+ $self->{password} = $password;
+
+ $main::lxdebug->leave_sub(2);
+
+ return $output;
+}
+
sub escape {
$main::lxdebug->enter_sub(2);
@@ -250,25 +376,6 @@ sub unquote {
}
-sub quote_html {
- $main::lxdebug->enter_sub(2);
-
- my ($self, $str) = @_;
-
- my %replace =
- ('order' => ['"', '<', '>'],
- '<' => '<',
- '>' => '>',
- '"' => '"',
- );
-
- map({ $str =~ s/$_/$replace{$_}/g; } @{ $replace{"order"} });
-
- $main::lxdebug->leave_sub(2);
-
- return $str;
-}
-
sub hide_form {
my $self = shift;
@@ -336,13 +443,16 @@ sub info {
# can be capped with maxrows
sub numtextrows {
$main::lxdebug->enter_sub();
- my ($self, $str, $cols, $maxrows) = @_;
+ my ($self, $str, $cols, $maxrows, $minrows) = @_;
+
+ $minrows ||= 1;
my $rows = sum map { int((length() - 2) / $cols) + 1 } split /\r/, $str;
$maxrows ||= $rows;
$main::lxdebug->leave_sub();
- return min $rows, $maxrows;
+
+ return max(min($rows, $maxrows), $minrows);
}
sub dberror {
@@ -360,12 +470,59 @@ sub isblank {
my ($self, $name, $msg) = @_;
- if ($self->{$name} =~ /^\s*$/) {
- $self->error($msg);
+ my $curr = $self;
+ foreach my $part (split /\./, $name) {
+ if (!$curr->{$part} || ($curr->{$part} =~ /^\s*$/)) {
+ $self->error($msg);
+ }
+ $curr = $curr->{$part};
}
+
$main::lxdebug->leave_sub();
}
+sub create_http_response {
+ $main::lxdebug->enter_sub();
+
+ my $self = shift;
+ my %params = @_;
+
+ my $cgi = $main::cgi;
+ $cgi ||= CGI->new('');
+
+ my $base_path;
+
+ if ($ENV{HTTP_X_FORWARDED_FOR}) {
+ $base_path = $ENV{HTTP_REFERER};
+ $base_path =~ s|^.*?://.*?/|/|;
+ } else {
+ $base_path = $ENV{REQUEST_URI};
+ }
+ $base_path =~ s|[^/]+$||;
+ $base_path =~ s|/$||;
+
+ my $session_cookie;
+ if (defined $main::auth) {
+ my $session_cookie_value = $main::auth->get_session_id();
+ $session_cookie_value ||= 'NO_SESSION';
+
+ $session_cookie = $cgi->cookie('-name' => $main::auth->get_session_cookie_name(),
+ '-value' => $session_cookie_value,
+ '-path' => $base_path);
+ }
+
+ my %cgi_params = ('-type' => $params{content_type});
+ $cgi_params{'-charset'} = $params{charset} if ($parmas{charset});
+
+ my $output = $cgi->header('-cookie' => $session_cookie,
+ %cgi_params);
+
+ $main::lxdebug->leave_sub();
+
+ return $output;
+}
+
+
sub header {
$main::lxdebug->enter_sub();
@@ -420,6 +577,7 @@ sub header {
if ($self->{jsscript} == 1) {
$jsscript = qq|
+
@@ -436,9 +594,10 @@ sub header {
foreach $item (@ { $self->{AJAX} }) {
$ajax .= $item->show_javascript();
}
- print qq|Content-Type: text/html; charset=${db_charset};
-${doctype}
+ print $self->create_http_response('content_type' => 'text/html',
+ 'charset' => $db_charset,);
+ print qq|${doctype}
$self->{titlebar}
$stylesheet
@@ -541,6 +700,12 @@ sub _prepare_html_template {
map { $additional_params->{'DEBUG_' . uc($_)} = $main::debug_options{$_} } keys %main::debug_options;
}
+ if ($main::auth && $main::auth->{RIGHTS} && $main::auth->{RIGHTS}->{$self->{login}}) {
+ while (my ($key, $value) = each %{ $main::auth->{RIGHTS}->{$self->{login}} }) {
+ $additional_params->{"AUTH_RIGHTS_" . uc($key)} = $value;
+ }
+ }
+
$main::lxdebug->leave_sub();
return $file;
@@ -578,23 +743,26 @@ sub parse_html_template {
}
sub show_generic_error {
- my ($self, $error, $title, $action) = @_;
+ my ($self, $error, %params) = @_;
my $add_params = {
- 'title_error' => $title,
+ 'title_error' => $params{title},
'label_error' => $error,
};
- my @vars;
- if ($action) {
- map({ delete($self->{$_}); } qw(action));
- map({ push(@vars, { "name" => $_, "value" => $self->{$_} })
- if (!ref($self->{$_})); }
- keys(%{$self}));
- $add_params->{"SHOW_BUTTON"} = 1;
- $add_params->{"BUTTON_LABEL"} = $action;
+ if ($params{action}) {
+ my @vars;
+
+ map { delete($self->{$_}); } qw(action);
+ map { push @vars, { "name" => $_, "value" => $self->{$_} } if (!ref($self->{$_})); } keys %{ $self };
+
+ $add_params->{SHOW_BUTTON} = 1;
+ $add_params->{BUTTON_LABEL} = $params{label} || $params{action};
+ $add_params->{VARIABLES} = \@vars;
+
+ } elsif ($params{back_button}) {
+ $add_params->{SHOW_BACK_BUTTON} = 1;
}
- $add_params->{"VARIABLES"} = \@vars;
$self->{title} = $title if ($title);
@@ -745,7 +913,71 @@ sub format_amount {
$main::lxdebug->leave_sub(2);
return $amount;
}
-#
+
+sub format_amount_units {
+ $main::lxdebug->enter_sub();
+
+ my $self = shift;
+ my %params = @_;
+
+ Common::check_params(\%params, qw(amount part_unit));
+
+ my $myconfig = \%main::myconfig;
+ my $amount = $params{amount};
+ my $places = $params{places};
+ my $part_unit_name = $params{part_unit};
+ my $amount_unit_name = $params{amount_unit};
+ my $conv_units = $params{conv_units};
+ my $max_places = $params{max_places};
+
+ AM->retrieve_all_units();
+ my $all_units = $main::all_units;
+
+ if (('' eq ref $conv_units) && ($conv_units =~ /convertible/)) {
+ $conv_units = AM->convertible_units($all_units, $part_unit_name, $conv_units eq 'convertible_not_smaller');
+ }
+
+ if (!scalar @{ $conv_units }) {
+ my $result = $self->format_amount($myconfig, $amount, $places, undef, $max_places) . " " . $part_unit_name;
+ $main::lxdebug->leave_sub();
+ return $result;
+ }
+
+ my $part_unit = $all_units->{$part_unit_name};
+ my $conv_unit = ($amount_unit_name && ($amount_unit_name ne $part_unit_name)) ? $all_units->{$amount_unit_name} : $part_unit;
+
+ $amount *= $conv_unit->{factor};
+
+ my @values;
+
+ foreach my $unit (@$conv_units) {
+ my $last = $unit->{name} eq $part_unit->{name};
+ if (!$last) {
+ $num = int($amount / $unit->{factor});
+ $amount -= $num * $unit->{factor};
+ }
+
+ if ($last ? $amount : $num) {
+ push @values, { "unit" => $unit->{name},
+ "amount" => $last ? $amount / $unit->{factor} : $num,
+ "places" => $last ? $places : 0 };
+ }
+
+ last if $last;
+ }
+
+ if (!@values) {
+ push @values, { "unit" => $part_unit_name,
+ "amount" => 0,
+ "places" => 0 };
+ }
+
+ my $result = join " ", map { $self->format_amount($myconfig, $_->{amount}, $_->{places}, undef, $max_places), $_->{unit} } @values;
+
+ $main::lxdebug->leave_sub();
+
+ return $result;
+}
sub format_string {
$main::lxdebug->enter_sub(2);
@@ -762,6 +994,8 @@ sub format_string {
return $input;
}
+#
+
sub parse_amount {
$main::lxdebug->enter_sub(2);
@@ -845,9 +1079,6 @@ sub parse_template {
map({ $self->{"employee_${_}"} = $myconfig->{$_}; }
qw(email tel fax name signature company address businessnumber
co_ustid taxnumber duns));
- map({ $self->{"employee_${_}"} =~ s/\\n/\n/g; }
- qw(company address signature));
- map({ $self->{$_} =~ s/\\n/\n/g; } qw(company address signature));
map({ $self->{"${_}"} = $myconfig->{$_}; }
qw(co_ustid));
@@ -902,14 +1133,15 @@ sub parse_template {
$mail->{to} = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email};
$mail->{from} = qq|"$myconfig->{name}" <$myconfig->{email}>|;
$mail->{fileid} = "$fileid.";
- $myconfig->{signature} =~ s/\\r\\n/\\n/g;
+ $myconfig->{signature} =~ s/\r//g;
# if we send html or plain text inline
if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {
$mail->{contenttype} = "text/html";
- $mail->{message} =~ s/\r\n/
\n/g;
- $myconfig->{signature} =~ s/\\n/
\n/g;
+ $mail->{message} =~ s/\r//g;
+ $mail->{message} =~ s/\n/
\n/g;
+ $myconfig->{signature} =~ s/\n/
\n/g;
$mail->{message} .= "
\n--
\n$myconfig->{signature}\n
";
open(IN, $self->{tmpfile})
@@ -929,9 +1161,8 @@ sub parse_template {
$self->{"attachment_filename"} : $self->{"tmpfile"} });
}
- $mail->{message} =~ s/\r\n/\n/g;
- $myconfig->{signature} =~ s/\\n/\n/g;
- $mail->{message} .= "\n-- \n$myconfig->{signature}";
+ $mail->{message} =~ s/\r//g;
+ $mail->{message} .= "\n-- \n$myconfig->{signature}";
}
@@ -997,43 +1228,59 @@ sub get_formname_translation {
$formname ||= $self->{formname};
my %formname_translations = (
- bin_list => $main::locale->text('Bin List'),
- credit_note => $main::locale->text('Credit Note'),
- invoice => $main::locale->text('Invoice'),
- packing_list => $main::locale->text('Packing List'),
- pick_list => $main::locale->text('Pick List'),
- proforma => $main::locale->text('Proforma Invoice'),
- purchase_order => $main::locale->text('Purchase Order'),
- request_quotation => $main::locale->text('RFQ'),
- sales_order => $main::locale->text('Confirmation'),
- sales_quotation => $main::locale->text('Quotation'),
- storno_invoice => $main::locale->text('Storno Invoice'),
- storno_packing_list => $main::locale->text('Storno Packing List'),
+ bin_list => $main::locale->text('Bin List'),
+ credit_note => $main::locale->text('Credit Note'),
+ invoice => $main::locale->text('Invoice'),
+ packing_list => $main::locale->text('Packing List'),
+ pick_list => $main::locale->text('Pick List'),
+ proforma => $main::locale->text('Proforma Invoice'),
+ purchase_order => $main::locale->text('Purchase Order'),
+ request_quotation => $main::locale->text('RFQ'),
+ sales_order => $main::locale->text('Confirmation'),
+ sales_quotation => $main::locale->text('Quotation'),
+ storno_invoice => $main::locale->text('Storno Invoice'),
+ storno_packing_list => $main::locale->text('Storno Packing List'),
+ sales_delivery_order => $main::locale->text('Delivery Order'),
+ purchase_delivery_order => $main::locale->text('Delivery Order'),
);
return $formname_translations{$formname}
}
+sub get_number_prefix_for_type {
+ my ($self) = @_;
+
+ my $prefix =
+ (first { $self->{type} eq $_ } qw(invoice credit_note)) ? 'inv'
+ : ($self->{type} =~ /_quotation$/) ? 'quo'
+ : ($self->{type} =~ /_delivery_order$/) ? 'do'
+ : 'ord';
+
+ return $prefix;
+}
+
+sub get_extension_for_format {
+ my ($self) = @_;
+
+ my $extension = $self->{format} =~ /pdf/i ? ".pdf"
+ : $self->{format} =~ /postscript/i ? ".ps"
+ : $self->{format} =~ /opendocument/i ? ".odt"
+ : $self->{format} =~ /html/i ? ".html"
+ : "";
+
+ return $extension;
+}
+
sub generate_attachment_filename {
my ($self) = @_;
- my $attachment_filename = $self->get_formname_translation();
- my $prefix =
- (grep { $self->{"type"} eq $_ } qw(invoice credit_note)) ? "inv"
- : ($self->{"type"} =~ /_quotation$/) ? "quo"
- : "ord";
+ my $attachment_filename = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());
+ my $prefix = $self->get_number_prefix_for_type();
if ($attachment_filename && $self->{"${prefix}number"}) {
- $attachment_filename .= "_" . $self->{"${prefix}number"}
- . ( $self->{format} =~ /pdf/i ? ".pdf"
- : $self->{format} =~ /postscript/i ? ".ps"
- : $self->{format} =~ /opendocument/i ? ".odt"
- : $self->{format} =~ /html/i ? ".html"
- : "");
- $attachment_filename =~ s/ /_/g;
- my %umlaute = ( "ä" => "ae", "ö" => "oe", "ü" => "ue",
- "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", "ß" => "ss");
- map { $attachment_filename =~ s/$_/$umlaute{$_}/g } keys %umlaute;
+ $attachment_filename .= "_" . $self->{"${prefix}number"} . $self->get_extension_for_format();
+ $attachment_filename = $main::locale->quote_special_chars('filenames', $attachment_filename);
+ $attachment_filename =~ s|[\s/\\]+|_|g;
} else {
$attachment_filename = "";
}
@@ -1041,6 +1288,19 @@ sub generate_attachment_filename {
return $attachment_filename;
}
+sub generate_email_subject {
+ my ($self) = @_;
+
+ my $subject = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());
+ my $prefix = $self->get_number_prefix_for_type();
+
+ if ($subject && $self->{"${prefix}number"}) {
+ $subject .= " " . $self->{"${prefix}number"}
+ }
+
+ return $subject;
+}
+
sub cleanup {
$main::lxdebug->enter_sub();
@@ -1319,8 +1579,6 @@ sub check_exchangerate {
my ($exchangerate) = selectrow_query($self, $dbh, $query, $currency, $transdate);
- $exchangerate = 1 if ($exchangerate eq "");
-
$main::lxdebug->leave_sub();
return $exchangerate;
@@ -1596,8 +1854,6 @@ sub get_salesman {
$self->{salesman_name} = $login
if ($self->{salesman_name} eq "");
-
- map({ $self->{"salesman_$_"} =~ s/\\n/\n/g; } qw(address company));
}
$main::lxdebug->leave_sub();
@@ -1770,7 +2026,7 @@ sub _get_employees {
my ($self, $dbh, $default_key, $key) = @_;
$key = $default_key unless ($key);
- $self->{$key} = selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee ORDER BY name|);
+ $self->{$key} = selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee ORDER BY lower(name)|);
$main::lxdebug->leave_sub();
}
@@ -1886,14 +2142,86 @@ sub _get_departments {
$main::lxdebug->leave_sub();
}
-sub _get_price_factors {
+sub _get_warehouses {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $dbh, $param) = @_;
+
+ my ($key, $bins_key, $q_access, @values);
+
+ if ('' eq ref $param) {
+ $key = $param;
+ } else {
+ $key = $param->{key};
+ $bins_key = $param->{bins};
+
+ if ($param->{access}) {
+ $q_access =
+ qq| AND EXISTS (
+ SELECT wa.employee_id
+ FROM warehouse_access wa
+ WHERE (wa.employee_id = (SELECT id FROM employee WHERE login = ?))
+ AND (wa.warehouse_id = w.id)
+ AND (wa.access IN ('ro', 'rw')))|;
+ push @values, $param->{access};
+ }
+
+ if ($param->{no_personal}) {
+ $q_access .= qq| AND (w.personal_warehouse_of IS NULL)|;
+
+ } elsif ($param->{personal}) {
+ $q_access .= qq| AND (w.personal_warehouse_of = ?)|;
+ push @values, conv_i($param->{personal});
+ }
+ }
+
+ my $query = qq|SELECT w.* FROM warehouse w
+ WHERE (NOT w.invalid) AND
+ ((SELECT COUNT(b.*) FROM bin b WHERE b.warehouse_id = w.id) > 0)
+ $q_access
+ ORDER BY w.sortkey|;
+
+ $self->{$key} = selectall_hashref_query($self, $dbh, $query, @values);
+
+ if ($bins_key) {
+ $query = qq|SELECT id, description FROM bin WHERE warehouse_id = ?|;
+ my $sth = prepare_query($self, $dbh, $query);
+
+ foreach my $warehouse (@{ $self->{$key} }) {
+ do_statement($self, $sth, $query, $warehouse->{id});
+ $warehouse->{$bins_key} = [];
+
+ while (my $ref = $sth->fetchrow_hashref()) {
+ push @{ $warehouse->{$bins_key} }, $ref;
+ }
+ }
+ $sth->finish();
+ }
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _get_simple {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $dbh, $table, $key, $sortkey) = @_;
+
+ my $query = qq|SELECT * FROM $table|;
+ $query .= qq| ORDER BY $sortkey| if ($sortkey);
+
+ $self->{$key} = selectall_hashref_query($self, $dbh, $query);
+
+ $main::lxdebug->leave_sub();
+}
+
+sub _get_groups {
$main::lxdebug->enter_sub();
my ($self, $dbh, $key) = @_;
- $key ||= "all_price_factors";
+ $key ||= "all_groups";
- my $query = qq|SELECT * FROM price_factors ORDER BY sortkey|;
+ my $groups = $main::auth->read_groups();
$self->{$key} = selectall_hashref_query($self, $dbh, $query);
@@ -1991,7 +2319,18 @@ sub get_lists {
}
if ($params{price_factors}) {
- $self->_get_price_factors($dbh, $params{price_factors});
+ $self->_get_simple($dbh, 'price_factors', $params{price_factors}, 'sortkey');
+ }
+
+ if ($params{warehouses}) {
+ $self->_get_warehouses($dbh, $params{warehouses});
+ }
+
+ if ($params{groups}) {
+ $self->_get_groups($dbh, $params{groups});
+ }
+ if ($params{partsgroup}) {
+ $self->get_partsgroup(\%main::myconfig, { all => 1, target => $params{partsgroup} });
}
$main::lxdebug->leave_sub();
@@ -2782,6 +3121,7 @@ sub get_partsgroup {
$main::lxdebug->enter_sub();
my ($self, $myconfig, $p) = @_;
+ my $target = $p->{target} || 'all_partsgroup';
my $dbh = $self->get_standard_dbh($myconfig);
@@ -2820,7 +3160,7 @@ sub get_partsgroup {
@values = ($p->{language_code});
}
- $self->{all_partsgroup} = selectall_hashref_query($self, $dbh, $query, @values);
+ $self->{$target} = selectall_hashref_query($self, $dbh, $query, @values);
$main::lxdebug->leave_sub();
}
@@ -2886,4 +3226,25 @@ sub all_years {
$main::lxdebug->leave_sub();
}
+sub backup_vars {
+ $main::lxdebug->enter_sub();
+ my $self = shift;
+ my @vars = @_;
+
+ map { $self->{_VAR_BACKUP}->{$_} = $self->{$_} if $self->{$_} } @vars;
+
+ $main::lxdebug->leave_sub();
+}
+
+sub restore_vars {
+ $main::lxdebug->enter_sub();
+
+ my $self = shift;
+ my @vars = @_;
+
+ map { $self->{$_} = $self->{_VAR_BACKUP}->{$_} if $self->{_VAR_BACKUP}->{$_} } @vars;
+
+ $main::lxdebug->leave_sub();
+}
+
1;