X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fcommon.pl;h=d01d19f58d0bc96cbc9914df51eb7ef8f8c14c47;hb=6768ddad54d2a675939e1167536f4943628de2bb;hp=d006c5436e12ef8e36540b56744cebeb9c709315;hpb=2e07a0cdb14d031d325b20f05e916105f385ac19;p=kivitendo-erp.git diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl index d006c5436..d01d19f58 100644 --- a/bin/mozilla/common.pl +++ b/bin/mozilla/common.pl @@ -9,18 +9,25 @@ # ###################################################################### -use SL::Form; use SL::Common; -use SL::MoreCommon; +use SL::DB::Helper::Mappings; +use SL::DB; +use SL::DBUtils qw(do_query); +use SL::Form; +use SL::MoreCommon qw(restore_form save_form); + +use strict; sub build_std_url { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); + + my $form = $main::form; my $script = $form->{script}; my @parts; - foreach my $key ((qw(login password), @_)) { + foreach my $key (@_) { next unless ($key); if ($key =~ /(.*?)=(.*)/) { @@ -31,266 +38,197 @@ sub build_std_url { } } else { - push @parts, "${key}=" . E($form->{$key}); + foreach my $var ($form->flatten_variables($key)) { + push @parts, E($var->{key}) . '=' . E($var->{value}); + } } } my $url = "${script}?" . join('&', @parts); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(2); 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(); -} - -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(); + $main::lxdebug->enter_sub(); my ($callback_sub, @parts) = @_; + my $form = $main::form; + my $locale = $main::locale; + 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 $has_bestbefore = 0; + if (defined($parts[0]->{bestbefore})) { + $has_bestbefore = 1; + map { $_->{has_bestbefore} = 1; } @parts; + } + my $has_ean = 0; + if (defined($parts[0]->{ean})) { + $has_ean = 1; + map { $_->{has_ean} = 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 })); - - $lxdebug->leave_sub(); + 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, + "has_bestbefore" => $has_bestbefore, + "has_ean" => $has_ean, + "remap_parts_id" => $remap_parts_id, + "remap_partnumber" => $remap_partnumber }); + + $main::lxdebug->leave_sub(); } sub select_part_internal { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; 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"}; + $callback_sub = $form->{callback_sub}; - restore_form($form->{"old_form"}); + restore_form($form->{old_form}); call_sub($callback_sub, $new_item); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } sub part_selection_internal { - $lxdebug->enter_sub(); - - $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"})); - - $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')"; - } + $main::lxdebug->enter_sub(); - my $callback = "$form->{script}?action=part_selection_internal&"; - map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login password partnumber description input_partnumber input_description input_partsid), grep({ /^[fl]_/ } keys %$form))); + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - 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(); -} - -sub project_selection_internal { - $lxdebug->enter_sub(); - - $order_by = "description"; - $order_by = $form->{"order_by"} if (defined($form->{"order_by"})); - $order_dir = 1; + my $order_by = "description"; + $order_by = $form->{"order_by"} if (defined($form->{"order_by"})); + my $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 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 = - map(+{ "column_title" => $header_title{$_}, - "column" => $_, - "callback" => $callback . "order_by=${_}&order_dir=" . ($order_by eq $_ ? 1 - $order_dir : $order_dir), - }, - @header_sort); + my %options; - $form->{"title"} = $locale->text("Select a project"); - $form->header(); - print($form->parse_html_template("generic/project_selection", { "HEADER" => \@header, - "PROJECTS" => $projects, - "onload" => $onload })); + foreach my $opt (split m/:/, $form->{options}) { + if ($opt =~ /=/) { + my ($key, $value) = split m/=/, $opt, 2; + $options{$key} = $value; - $lxdebug->leave_sub(); -} + } else { + $options{$opt} = 1; + } + } -sub employee_selection_internal { - $lxdebug->enter_sub(); + map { $form->{$_} = $options{$_} if ($options{$_}) } qw(no_services no_assemblies assemblies click_button); - $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 $parts = Common->retrieve_parts(\%myconfig, $form, $order_by, $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')"; + if (0 == scalar(@{$parts})) { + $form->show_generic_information($locale->text("No part was found matching the search parameters.")); + } elsif (1 == scalar(@{$parts})) { + $::request->{layout}->add_javascripts_inline("part_selected('1')"); } - my $callback = "$form->{script}?action=employee_selection_internal&"; - map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login password name input_name input_id), grep({ /^[fl]_/ } keys %$form))); + map { $parts->[$_]->{selected} = $_ ? 0 : 1; } (0..$#{$parts}); - my @header_sort = qw(name); - my %header_title = ( "name" => $locale->text("Name"), + my $callback = build_std_url('action=part_selection_internal', qw(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), + "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 })); + $form->{formname} ||= 'Form'; + + $form->{title} = $locale->text("Select a part"); + $form->header(no_layout => 1); + print $form->parse_html_template("generic/part_selection", { "HEADER" => \@header, + "PARTS" => $parts, }); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub delivery_customer_selection { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - $order_by = "name"; + my $order_by = "name"; $order_by = $form->{"order_by"} if (defined($form->{"order_by"})); - $order_dir = 1; + my $order_dir = 1; $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"})); - $delivery = Common->retrieve_delivery_customer(\%myconfig, $form, $order_by, $order_dir); + my $delivery = Common->retrieve_delivery_customer(\%myconfig, $form, $order_by, $order_dir); map({ $delivery->[$_]->{"selected"} = $_ ? 0 : 1; } (0..$#{$delivery})); + if (0 == scalar(@{$delivery})) { $form->show_generic_information($locale->text("No Customer was found matching the search parameters.")); } elsif (1 == scalar(@{$delivery})) { - $onload = "customer_selected('1')"; + $::request->{layout}->add_javascripts_inline("customer_selected('1')"); } my $callback = "$form->{script}?action=delivery_customer_selection&"; map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login 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"), @@ -306,33 +244,39 @@ sub delivery_customer_selection { @header_sort); $form->{"title"} = $locale->text("Select a Customer"); - $form->header(); - print($form->parse_html_template("generic/select_delivery_customer", { "HEADER" => \@header, - "DELIVERY" => $delivery, - "onload" => $onload })); + $form->header(no_layout => 1); + print $form->parse_html_template("generic/select_delivery_customer", { "HEADER" => \@header, + "DELIVERY" => $delivery, }); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub vendor_selection { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - $order_by = "name"; + my $order_by = "name"; $order_by = $form->{"order_by"} if (defined($form->{"order_by"})); - $order_dir = 1; + my $order_dir = 1; $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"})); - $vendor = Common->retrieve_vendor(\%myconfig, $form, $order_by, $order_dir); + my $vendor = Common->retrieve_vendor(\%myconfig, $form, $order_by, $order_dir); map({ $vendor->[$_]->{"selected"} = $_ ? 0 : 1; } (0..$#{$vendor})); + if (0 == scalar(@{$vendor})) { $form->show_generic_information($locale->text("No Vendor was found matching the search parameters.")); } elsif (1 == scalar(@{$vendor})) { - $onload = "vendor_selected('1')"; + $::request->{layout}->add_javascripts_inline("vendor_selected('1')"); } my $callback = "$form->{script}?action=vendor_selection&"; map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login 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"), @@ -348,85 +292,67 @@ sub vendor_selection { @header_sort); $form->{"title"} = $locale->text("Select a Customer"); - $form->header(); - print($form->parse_html_template("generic/select_vendor", { "HEADER" => \@header, - "VENDOR" => $vendor, - "onload" => $onload })); + $form->header(no_layout => 1); + print $form->parse_html_template("generic/select_vendor", { "HEADER" => \@header, + "VENDOR" => $vendor, }); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub calculate_qty { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my $locale = $main::locale; - my @variable_sort = (); - my %variable_list = (); - my $unit_list = (); $form->{formel} =~ s/\r\n//g; my ($variable_string, $formel) = split /###/,$form->{formel}; - - - split /;/, $variable_string; - foreach $item (@_) { - my($name, $valueunit) = split /=/,$item; - my($value, $unit) = split / /, $valueunit; - - push(@variable_sort, $value); - $variable_list{$value} = $name; - $unit_list{$value} = $unit; + my @variable; + + foreach my $item (split m/;/, $variable_string) { + next unless $item =~ m/^ \s* (\w+) \s* = \s* (\w+) \s* (\w+) \s* $/x; + push @variable, { + description => $1, + name => $2, + unit => $3, + }; } my @header_sort = qw(variable value unit); - my %header_title = ( "variable" => $locale->text("Variable"), - "value" => $locale->text("Value"), - "unit" => $locale->text("Unit"), - ); - - my @variable = map(+{ "description" => $variable_list{$_}, - "name" => $_, - "unit" => $unit_list{$_} }, @variable_sort); - - my @header = - map(+{ "column_title" => $header_title{$_}, - "column" => $_, - }, - @header_sort); - $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 })); - - $lxdebug->leave_sub(); + my %header_title = ( + variable => $locale->text("Variable"), + value => $locale->text("Value"), + unit => $locale->text("Unit"), + ); + my @header = map +{ + column_title => $header_title{$_}, + column => $_, + }, @header_sort; + + $form->{formel} = $formel; + $form->{title} = $locale->text("Please enter values"); + $form->header(no_layout => 1); + print $form->parse_html_template("generic/calculate_qty", { "HEADER" => \@header, + "VARIABLES" => \@variable, }); + + $main::lxdebug->leave_sub(); } -sub set_longdescription { - $lxdebug->enter_sub(); - - - my $callback = "$form->{script}?action=set_longdescription&"; - map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login password name input_name input_id), grep({ /^[fl]_/ } keys %$form))); - - $form->{"title"} = $locale->text("Enter longdescription"); - $form->header(); - print($form->parse_html_template("generic/set_longdescription")); - - $lxdebug->leave_sub(); -} +# ------------------------------------------------------------------------- sub H { - return $form->quote_html($_[0]); + return $main::locale->quote_special_chars('HTML', $_[0]); } sub Q { - return $form->quote($_[0]); + return $main::locale->quote_special_chars('URL@HTML', $_[0]); } sub E { - return $form->escape($_[0]); + return $main::form->escape($_[0]); } sub NTI { @@ -437,99 +363,61 @@ sub NTI { } sub format_dates { - $lxdebug->enter_sub(); - - my ($dateformat, $longformat, @indices) = @_; - - $dateformat = $myconfig{"dateformat"} unless ($dateformat); - - foreach my $idx (@indices) { - next unless (defined($form->{$idx})); - - if (!ref($form->{$idx})) { - $form->{$idx} = $locale->reformat_date(\%myconfig, $form->{$idx}, - $dateformat, $longformat); - - } elsif (ref($form->{$idx}) eq "ARRAY") { - for (my $i = 0; $i < scalar(@{$form->{$idx}}); $i++) { - $form->{$idx}->[$i] = - $locale->reformat_date(\%myconfig, $form->{$idx}->[$i], - $dateformat, $longformat); - } - } - } - - $lxdebug->leave_sub(); + return $::form->format_dates(@_); } sub reformat_numbers { - $lxdebug->enter_sub(); - - my ($numberformat, $places, @indices) = @_; - - return $lxdebug->leave_sub() - if (!$numberformat || ($numberformat eq $myconfig{"numberformat"})); - - foreach my $idx (@indices) { - next unless (defined($form->{$idx})); - - if (!ref($form->{$idx})) { - $form->{$idx} = $form->parse_amount(\%myconfig, $form->{$idx}); - - } elsif (ref($form->{$idx}) eq "ARRAY") { - for (my $i = 0; $i < scalar(@{$form->{$idx}}); $i++) { - $form->{$idx}->[$i] = - $form->parse_amount(\%myconfig, $form->{$idx}->[$i]); - } - } - } - - my $saved_numberformat = $myconfig{"numberformat"}; - $myconfig{"numberformat"} = $numberformat; + return $::form->reformat_numbers(@_); +} - foreach my $idx (@indices) { - next unless (defined($form->{$idx})); +# ------------------------------------------------------------------------- - if (!ref($form->{$idx})) { - $form->{$idx} = $form->format_amount(\%myconfig, $form->{$idx}, $places); +sub show_history { + $main::lxdebug->enter_sub(); - } elsif (ref($form->{$idx}) eq "ARRAY") { - for (my $i = 0; $i < scalar(@{$form->{$idx}}); $i++) { - $form->{$idx}->[$i] = - $form->format_amount(\%myconfig, $form->{$idx}->[$i], $places); - } - } - } + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; - $myconfig{"numberformat"} = $saved_numberformat; + my $dbh = $form->dbconnect(\%myconfig); + my ($sort, $sortby) = split(/\-\-/, $form->{order}); + $sort =~ s/.*\.(.*)/$1/; - $lxdebug->leave_sub(); + $form->{title} = $locale->text("History"); + $form->header(no_layout => 1); + + my $callback = build_std_url(qw(action longdescription trans_id_type input_name)); + my $restriction; + if ( $form->{trans_id_type} eq 'glid' ) { + $restriction = "AND ( snumbers LIKE 'invnumber%' OR what_done LIKE '%Buchungsnummer%' OR snumbers LIKE 'gltransaction%' ) "; + } elsif ( $form->{trans_id_type} eq 'id' ) { + $restriction = " AND ( snumbers NOT LIKE 'invnumber_%' AND snumbers NOT LIKE 'gltransaction%' AND (what_done NOT LIKE '%Buchungsnummer%' OR what_done IS null))"; + } else { + $restriction = ''; + }; + + print $form->parse_html_template( "common/show_history", { + "DATEN" => $form->get_history($dbh,$form->{input_name},$restriction,$form->{order}), + "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"), + uc($sort) => 1, + uc($sort)."BY" => $sortby, + callback => $callback, + } ); + + $dbh->disconnect(); + $main::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},"",$form->{order}), - "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"), - uc($sort) => 1, - uc($sort)."BY" => $sortby - } ); - - $dbh->disconnect(); - $lxdebug->leave_sub(); -} +# ------------------------------------------------------------------------- sub call_sub { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); my $name = shift; + my $form = $main::form; + my $locale = $main::locale; + if (!$name) { $form->error($locale->text("Trying to call a sub without a name")); } @@ -540,13 +428,22 @@ sub call_sub { $form->error(sprintf($locale->text("Attempt to call an undefined sub named '%s'"), $name)); } - &{ $name }(@_); + { + no strict "refs"; + &{ $name }(@_); + } - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + sub show_vc_details { - $lxdebug->enter_sub(); + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + my $locale = $main::locale; $form->{vc} = $form->{vc} eq "customer" ? "customer" : "vendor"; $form->isblank("vc_id", @@ -555,40 +452,184 @@ sub show_vc_details { $locale->text("No vendor has been selected yet.")); Common->get_vc_details(\%myconfig, $form, $form->{vc}, $form->{vc_id}); + $form->{discount_as_percent} = $form->format_amount(\%::myconfig, $form->parse_amount(\%::myconfig, $form->{discount}) * 100, 2); $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" })); + $form->header(no_layout => 1); + print $form->parse_html_template("common/show_vc_details", { "is_customer" => $form->{vc} eq "customer" }); - $lxdebug->leave_sub(); + $main::lxdebug->leave_sub(); } +# ------------------------------------------------------------------------- + +sub retrieve_partunits { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + + 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}"}}; + } + } + + $main::lxdebug->leave_sub(); +} + +# ------------------------------------------------------------------------- + sub mark_as_paid_common { - $lxdebug->enter_sub(); - use SL::DBUtils; + $main::lxdebug->enter_sub(); + my ($myconfig, $db_name) = @_; + my $form = $main::form; + my $locale = $main::locale; + 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(); + SL::DB->client->with_transaction(sub { + my $dbh ||= SL::DB->client->dbh; + my $query = qq|UPDATE $db_name SET paid = amount, datepaid = current_date WHERE id = ?|; + do_query($form, $dbh, $query, $form->{id}); + 1; + }) or do { $::form->error(SL::DB->client->error) }; $form->redirect($locale->text("Marked as paid")); -} - else { + + } else { my $referer = $ENV{HTTP_REFERER}; - $referer =~ s/^(.*)action\=.*\&(.*)$/$1action\=mark_as_paid\&mark_as_paid\=1\&login\=$form->{login}\&password\=$form->{password}\&id\=$form->{id}\&$2/; + my $script; + my $callback; + if ($referer =~ /action/) { + $referer =~ /^(.*)\?action\=[^\&]*(\&.*)$/; + $script = $1; + $callback = $2; + } elsif ($referer =~ /RESTORE_FORM_FROM_SESSION_ID/){ + $referer =~ /^(.*)\?RESTORE_FORM_FROM_SESSION_ID\=(.*)$/; + $script = $1; + $callback = ""; + } else { + $script = $referer; + $callback = ""; + } + $referer = $script . "?action=mark_as_paid&mark_as_paid=1&id=$form->{id}" . $callback; $form->header(); - print qq|
|; print qq||.$locale->text('Mark as paid?').qq|
|; print qq| |; print qq||; - print qq|