X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=f54ffefec646babff01c922a3721bdcc2bc054fc;hb=83914eeb2e95cdf587565952eef54be59dd58693;hp=b661c34dce81d89518607058db80bed521b11f32;hpb=fb4d2ffa6aae03b36e4db77be10c3d9dce4413f8;p=kivitendo-erp.git diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl index b661c34dc..f54ffefec 100644 --- a/bin/mozilla/common.pl +++ b/bin/mozilla/common.pl @@ -9,98 +9,43 @@ # ###################################################################### -use SL::Form; -use YAML; - use SL::Common; +use SL::DBUtils; +use SL::Form; +use SL::MoreCommon; -sub save_form { - $lxdebug->enter_sub(); - - my $old_form = YAML::Dump($form); - $old_form =~ s|!|!!|g; - $old_form =~ s|\n|!n|g; - $old_form =~ s|\r|!r|g; - - $lxdebug->leave_sub(); - - return $old_form; -} - -sub restore_form { - $lxdebug->enter_sub(); - - my ($old_form, $no_delete) = @_; +sub build_std_url { + $lxdebug->enter_sub(2); - map({ delete($form->{$_}); } keys(%{$form})) unless ($no_delete); - $old_form =~ s|!r|\r|g; - $old_form =~ s|!n|\n|g; - $old_form =~ s|!!|!|g; - my $new_form = YAML::Load($old_form); - map({ $form->{$_} = $new_form->{$_}; } keys(%{$new_form})); + my $script = $form->{script}; - $lxdebug->leave_sub(); -} + my @parts; -sub build_std_url { - $lxdebug->enter_sub(); - - my $url = "$form->{script}?"; - my $first = 1; - foreach my $key ((qw(login password), @_)) { + foreach my $key (@_) { next unless ($key); - $url .= "&" unless ($first); - $first = 0; - if ($key =~ /=/) { - $url .= $key; + if ($key =~ /(.*?)=(.*)/) { + if ($1 eq 'script') { + $script = $2; + } else { + push @parts, $key; + } + } else { - $url .= "${key}=" . E($form->{$key}); + foreach my $var ($form->flatten_variables($key)) { + push @parts, E($var->{key}) . '=' . E($var->{value}); + } } } - $lxdebug->leave_sub(); + my $url = "${script}?" . join('&', @parts); - return $url; -} - -sub select_employee { - $lxdebug->enter_sub(); - - my ($callback_sub, @employees) = @_; - - if (0 == scalar(@employees)) { - @employees = SystemBrace->get_all_employees(\%myconfig, $form); - } - - my $old_form = save_form(); - - $form->header(); - print($form->parse_html_template("generic/select_employee", - { "EMPLOYEES" => \@employees, - "old_form" => $old_form, - "title" => $locale->text("Select an employee"), - "nextsub" => "select_employee_internal", - "callback_sub" => $callback_sub })); + $lxdebug->leave_sub(2); - $lxdebug->leave_sub(); + return $url; } -sub select_employee_internal { - $lxdebug->enter_sub(); - - my ($new_id, $new_name, $callback_sub); - - my $new_id = $form->{"new_id_" . $form->{"selection"}}; - my $new_name = $form->{"new_name_" . $form->{"selection"}}; - my $callback_sub = $form->{"callback_sub"}; - - restore_form($form->{"old_form"}); - - call_sub($callback_sub, $new_id, $new_name); - - $lxdebug->leave_sub(); -} +# ------------------------------------------------------------------------- sub select_part { $lxdebug->enter_sub(); @@ -108,35 +53,35 @@ sub select_part { my ($callback_sub, @parts) = @_; my $remap_parts_id = 0; - if (defined($parts[0]->{"parts_id"}) && !defined($parts[0]->{"id"})) { + if (defined($parts[0]->{parts_id}) && !defined($parts[0]->{id})) { $remap_parts_id = 1; - map({ $_->{"id"} = $_->{"parts_id"}; } @parts); + map { $_->{id} = $_->{parts_id}; } @parts; } my $remap_partnumber = 0; - if (defined($parts[0]->{"partnumber"}) && !defined($parts[0]->{"number"})) { + if (defined($parts[0]->{partnumber}) && !defined($parts[0]->{number})) { $remap_partnumber = 1; - map({ $_->{"number"} = $_->{"partnumber"}; } @parts); + map { $_->{number} = $_->{partnumber}; } @parts; } my $has_charge = 0; - if (defined($parts[0]->{"chargenumber"})) { + if (defined($parts[0]->{chargenumber})) { $has_charge = 1; - map({ $_->{"has_charge"} = 1; } @parts); + map { $_->{has_charge} = 1; } @parts; } my $old_form = save_form(); $form->header(); - print($form->parse_html_template("generic/select_part", - { "PARTS" => \@parts, - "old_form" => $old_form, - "title" => $locale->text("Select a part"), - "nextsub" => "select_part_internal", - "callback_sub" => $callback_sub, - "has_charge" => $has_charge, - "remap_parts_id" => $remap_parts_id, - "remap_partnumber" => $remap_partnumber })); + print $form->parse_html_template("generic/select_part", + { "PARTS" => \@parts, + "old_form" => $old_form, + "title" => $locale->text("Select a part"), + "nextsub" => "select_part_internal", + "callback_sub" => $callback_sub, + "has_charge" => $has_charge, + "remap_parts_id" => $remap_parts_id, + "remap_partnumber" => $remap_partnumber }); $lxdebug->leave_sub(); } @@ -146,26 +91,28 @@ sub select_part_internal { my ($new_item, $callback_sub); - my $re = "^new_.*_" . $form->{"selection"}; - map({ - my $key = $_; - $key =~ s/^new_//; - $key =~ s/_\d+$//; - $new_item->{$key} = $form->{$_}; - } grep(/$re/, keys(%{$form}))); - - if ($form->{"remap_parts_id"}) { - $new_item->{"parts_id"} = $new_item->{"id"}; - delete($new_item->{"id"}); + my $re = "^new_.*_" . $form->{selection}; + + foreach (grep /$re/, keys %{ $form }) { + my $new_key = $_; + $new_key =~ s/^new_//; + $new_key =~ s/_\d+$//; + $new_item->{$new_key} = $form->{$_}; + } + + if ($form->{remap_parts_id}) { + $new_item->{parts_id} = $new_item->{id}; + delete $new_item->{id}; } - if ($form->{"remap_partnumber"}) { - $new_item->{"partnumber"} = $new_item->{"number"}; - delete($new_item->{"number"}); + + if ($form->{remap_partnumber}) { + $new_item->{partnumber} = $new_item->{number}; + delete $new_item->{number}; } - my $callback_sub = $form->{"callback_sub"}; + my $callback_sub = $form->{callback_sub}; - restore_form($form->{"old_form"}); + restore_form($form->{old_form}); call_sub($callback_sub, $new_item); @@ -175,124 +122,50 @@ sub select_part_internal { sub part_selection_internal { $lxdebug->enter_sub(); - $order_by = "description"; - $order_by = $form->{"order_by"} if (defined($form->{"order_by"})); + $order_by = "description"; + $order_by = $form->{"order_by"} if (defined($form->{"order_by"})); $order_dir = 1; $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"})); + %options = map { $_ => 1 } split m/:/, $form->{options}; + + map { $form->{$_} = 1 if ($options{$_}) } qw(no_services no_assemblies stockable); + $parts = Common->retrieve_parts(\%myconfig, $form, $order_by, $order_dir); - map({ $parts->[$_]->{"selected"} = $_ ? 0 : 1; } (0..$#{$parts})); + if (0 == scalar(@{$parts})) { $form->show_generic_information($locale->text("No part was found matching the search parameters.")); } elsif (1 == scalar(@{$parts})) { $onload = "part_selected('1')"; } - my $callback = "$form->{script}?action=part_selection_internal&"; - map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login path password partnumber description input_partnumber input_description input_partsid), grep({ /^[fl]_/ } keys %$form))); - - my @header_sort = qw(partnumber description); - my %header_title = ( "partnumber" => $locale->text("Part Number"), - "description" => $locale->text("Part description"), - ); - - my @header = - map(+{ "column_title" => $header_title{$_}, - "column" => $_, - "callback" => $callback . "order_by=${_}&order_dir=" . ($order_by eq $_ ? 1 - $order_dir : $order_dir), - }, - @header_sort); - - $form->{"title"} = $locale->text("Select a part"); - $form->header(); - print($form->parse_html_template("generic/part_selection", { "HEADER" => \@header, - "PARTS" => $parts, - "onload" => $onload })); - - $lxdebug->leave_sub(); -} + map { $parts->[$_]->{selected} = $_ ? 0 : 1; } (0..$#{$parts}); -sub project_selection_internal { - $lxdebug->enter_sub(); + my $callback = build_std_url('action=part_selection_internal', qw(partnumber description input_partnumber input_description input_partsid), + grep({ /^[fl]_/ } keys %{ $form })); - $order_by = "description"; - $order_by = $form->{"order_by"} if (defined($form->{"order_by"})); - $order_dir = 1; - $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"})); - - $projects = Common->retrieve_projects(\%myconfig, $form, $order_by, $order_dir); - map({ $projects->[$_]->{"selected"} = $_ ? 0 : 1; } (0..$#{$projects})); - if (0 == scalar(@{$projects})) { - $form->show_generic_information($locale->text("No project was found matching the search parameters.")); - } elsif (1 == scalar(@{$projects})) { - $onload = "project_selected('1')"; - } - - my $callback = "$form->{script}?action=project_selection_internal&"; - map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login path password projectnumber description input_projectnumber input_description input_project_id), grep({ /^[fl]_/ } keys %$form))); - - my @header_sort = qw(projectnumber description); - my %header_title = ( "projectnumber" => $locale->text("Project Number"), - "description" => $locale->text("Project description"), + my @header_sort = qw(partnumber description); + my %header_title = ( "partnumber" => $locale->text("Part Number"), + "description" => $locale->text("Part description"), ); my @header = map(+{ "column_title" => $header_title{$_}, - "column" => $_, - "callback" => $callback . "order_by=${_}&order_dir=" . ($order_by eq $_ ? 1 - $order_dir : $order_dir), + "column" => $_, + "callback" => $callback . "order_by=${_}&order_dir=" . ($order_by eq $_ ? 1 - $order_dir : $order_dir), }, @header_sort); - $form->{"title"} = $locale->text("Select a project"); + $form->{title} = $locale->text("Select a part"); $form->header(); - print($form->parse_html_template("generic/project_selection", { "HEADER" => \@header, - "PROJECTS" => $projects, - "onload" => $onload })); + print $form->parse_html_template("generic/part_selection", { "HEADER" => \@header, + "PARTS" => $parts, + "onload" => $onload }); $lxdebug->leave_sub(); } -sub employee_selection_internal { - $lxdebug->enter_sub(); - - $order_by = "name"; - $order_by = $form->{"order_by"} if (defined($form->{"order_by"})); - $order_dir = 1; - $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"})); - - $employees = Common->retrieve_employees(\%myconfig, $form, $order_by, $order_dir); - map({ $employees->[$_]->{"selected"} = $_ ? 0 : 1; } (0..$#{$employees})); - if (0 == scalar(@{$employees})) { - $form->show_generic_information($locale->text("No employee was found matching the search parameters.")); - } elsif (1 == scalar(@{$employees})) { - $onload = "employee_selected('1')"; - } - - my $callback = "$form->{script}?action=employee_selection_internal&"; - map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form))); - - my @header_sort = qw(name); - my %header_title = ( "name" => $locale->text("Name"), - ); - - my @header = - map(+{ "column_title" => $header_title{$_}, - "column" => $_, - "callback" => $callback . "order_by=${_}&order_dir=" . ($order_by eq $_ ? 1 - $order_dir : $order_dir), - }, - @header_sort); - - $form->{"title"} = $locale->text("Select an employee"); - $form->header(); - print($form->parse_html_template("generic/employee_selection", { "HEADER" => \@header, - "EMPLOYEES" => $employees, - "onload" => $onload })); - - $lxdebug->leave_sub(); -} +# ------------------------------------------------------------------------- sub delivery_customer_selection { $lxdebug->enter_sub(); @@ -312,7 +185,7 @@ sub delivery_customer_selection { my $callback = "$form->{script}?action=delivery_customer_selection&"; map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form))); + (qw(name input_name input_id), grep({ /^[fl]_/ } keys %$form))); my @header_sort = qw(name customernumber address); my %header_title = ( "name" => $locale->text("Name"), @@ -329,13 +202,15 @@ sub delivery_customer_selection { $form->{"title"} = $locale->text("Select a Customer"); $form->header(); - print($form->parse_html_template("generic/select_delivery_customer", { "HEADER" => \@header, - "DELIVERY" => $delivery, - "onload" => $onload })); + print $form->parse_html_template("generic/select_delivery_customer", { "HEADER" => \@header, + "DELIVERY" => $delivery, + "onload" => $onload }); $lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub vendor_selection { $lxdebug->enter_sub(); @@ -354,7 +229,7 @@ sub vendor_selection { my $callback = "$form->{script}?action=vendor_selection&"; map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form))); + (qw(name input_name input_id), grep({ /^[fl]_/ } keys %$form))); my @header_sort = qw(name customernumber address); my %header_title = ( "name" => $locale->text("Name"), @@ -371,13 +246,15 @@ sub vendor_selection { $form->{"title"} = $locale->text("Select a Customer"); $form->header(); - print($form->parse_html_template("generic/select_vendor", { "HEADER" => \@header, - "VENDOR" => $vendor, - "onload" => $onload })); + print $form->parse_html_template("generic/select_vendor", { "HEADER" => \@header, + "VENDOR" => $vendor, + "onload" => $onload }); $lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub calculate_qty { $lxdebug->enter_sub(); @@ -389,7 +266,7 @@ sub calculate_qty { my ($variable_string, $formel) = split /###/,$form->{formel}; - split /;/, $variable_string; + split m/;/, $variable_string; foreach $item (@_) { my($name, $valueunit) = split /=/,$item; my($value, $unit) = split / /, $valueunit; @@ -414,31 +291,30 @@ sub calculate_qty { "column" => $_, }, @header_sort); - $form->{formel} = $formel; + $form->{formel} = $formel; $form->{"title"} = $locale->text("Please enter values"); $form->header(); - print($form->parse_html_template("generic/calculate_qty", { "HEADER" => \@header, - "VARIABLES" => \@variable, - "onload" => $onload })); + print($form->parse_html_template("generic/calculate_qty", { "HEADER" => \@header, + "VARIABLES" => \@variable, + "onload" => $onload })); $lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub set_longdescription { $lxdebug->enter_sub(); - - my $callback = "$form->{script}?action=set_longdescription&"; - map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login path password name input_name input_id), grep({ /^[fl]_/ } keys %$form))); - - $form->{"title"} = $locale->text("Enter longdescription"); + $form->{title} = $locale->text("Enter longdescription"); $form->header(); - print($form->parse_html_template("generic/set_longdescription")); + print $form->parse_html_template("generic/set_longdescription"); $lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub H { return $form->quote_html($_[0]); } @@ -528,21 +404,29 @@ sub reformat_numbers { $lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub show_history { $lxdebug->enter_sub(); my $dbh = $form->dbconnect(\%myconfig); - + my ($sort, $sortby) = split(/\-\-/, $form->{order}); + $sort =~ s/.*\.(.*)/$1/; + $form->{title} = $locale->text("History"); $form->header(); print $form->parse_html_template( "common/show_history", { - "DATEN" => $form->get_history($dbh,$form->{input_name}), - "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0") + "DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}), + "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"), + uc($sort) => 1, + uc($sort)."BY" => $sortby } ); - + $dbh->disconnect(); - $lxdebug->leave_sub(); + $lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub call_sub { $lxdebug->enter_sub(); @@ -563,6 +447,8 @@ sub call_sub { $lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub show_vc_details { $lxdebug->enter_sub(); @@ -577,10 +463,109 @@ sub show_vc_details { $form->{title} = $form->{vc} eq "customer" ? $locale->text("Customer details") : $locale->text("Vendor details"); $form->header(); - print($form->parse_html_template("common/show_vc_details", - { "is_customer" => $form->{vc} eq "customer" })); + print $form->parse_html_template("common/show_vc_details", { "is_customer" => $form->{vc} eq "customer" }); $lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + +sub retrieve_partunits { + $lxdebug->enter_sub(); + + my @part_ids = grep { $_ } map { $form->{"id_${_}"} } (1..$form->{rowcount}); + + if (@part_ids) { + my %partunits = IO->retrieve_partunits('part_ids' => \@part_ids); + + foreach my $i (1..$form->{rowcount}) { + next unless ($form->{"id_${i}"}); + $form->{"partunit_${i}"} = $partunits{$form->{"id_${i}"}}; + } + } + + $lxdebug->leave_sub(); +} + +# ------------------------------------------------------------------------- + +sub mark_as_paid_common { + $lxdebug->enter_sub(); + + my ($myconfig, $db_name) = @_; + + if($form->{mark_as_paid}) { + my $dbh ||= $form->get_standard_dbh($myconfig); + my $query = qq|UPDATE $db_name SET paid = amount WHERE id = ?|; + do_query($form, $dbh, $query, $form->{id}); + $dbh->commit(); + $form->redirect($locale->text("Marked as paid")); + + } else { + my $referer = $ENV{HTTP_REFERER}; + $referer =~ s/^(.*)action\=.*\&(.*)$/$1action\=mark_as_paid\&mark_as_paid\=1\&id\=$form->{id}\&$2/; + $form->header(); + print qq||; + print qq|

|.$locale->text('Mark as paid?').qq|

|; + print qq| |; + print qq||; + print qq||; + } + + $lxdebug->leave_sub(); +} + +sub cov_selection_internal { + $lxdebug->enter_sub(); + + $order_by = "name"; + $order_by = $form->{"order_by"} if (defined($form->{"order_by"})); + $order_dir = 1; + $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"})); + + my $type = $form->{"is_vendor"} ? $locale->text("vendor") : $locale->text("customer"); + + $covs = Common->retrieve_customers_or_vendors(\%myconfig, $form, $order_by, $order_dir, $form->{"is_vendor"}, $form->{"allow_both"}); + map({ $covs->[$_]->{"selected"} = $_ ? 0 : 1; } (0..$#{$covs})); + if (0 == scalar(@{$covs})) { + $form->show_generic_information(sprintf($locale->text("No %s was found matching the search parameters."), $type)); + } elsif (1 == scalar(@{$covs})) { + $onload = "cov_selected('1')"; + } + + my $callback = "$form->{script}?action=cov_selection_internal&"; + map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } + (qw(name input_name input_id is_vendor allow_both), grep({ /^[fl]_/ } keys %$form))); + + my @header_sort = qw(name address contact); + my %header_title = ( "name" => $locale->text("Name"), + "address" => $locale->text("Address"), + "contact" => $locale->text("Contact"), + ); + + my @header = + map(+{ "column_title" => $header_title{$_}, + "column" => $_, + "callback" => $callback . "order_by=${_}&order_dir=" . ($order_by eq $_ ? 1 - $order_dir : $order_dir), + }, + @header_sort); + + foreach my $cov (@{ $covs }) { + $cov->{address} = "$cov->{street}, $cov->{zipcode} $cov->{city}"; + $cov->{address} =~ s{^,}{}x; + $cov->{address} =~ s{\ +}{\ }gx; + + $cov->{contact} = join " ", map { $cov->{$_} } qw(cp_greeting cp_title cp_givenname cp_name); + $cov->{contact} =~ s{\ +}{\ }gx; + } + + $form->{"title"} = $form->{is_vendor} ? $locale->text("Select a vendor") : $locale->text("Select a customer"); + $form->header(); + print($form->parse_html_template("generic/cov_selection", { "HEADER" => \@header, + "COVS" => $covs, + "onload" => $onload })); + + $lxdebug->leave_sub(); +} + 1;