X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/8ec0d29a33e23ce962b807e87cc8b577c8c98ec2..7679dfa4ba64c4cc24a027fa5bdfd5e616ca92a8:/bin/mozilla/cp.pl diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl index 8e31a8f1a..c7b85c60a 100644 --- a/bin/mozilla/cp.pl +++ b/bin/mozilla/cp.pl @@ -36,7 +36,8 @@ use SL::OP; use SL::IS; use SL::IR; -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; +require "bin/mozilla/common.pl"; 1; @@ -87,7 +88,7 @@ sub payment { } @{ $form->{PR}{ $form->{ARAP} } }; # currencies - @curr = split /:/, $form->{currencies}; + @curr = split(/:/, $form->{currencies}); chomp $curr[0]; $form->{defaultcurrency} = $form->{currency} = $form->{oldcurrency} = $curr[0]; @@ -183,7 +184,7 @@ sub form_header { # with JavaScript Calendar $button1 = qq| - + text('button') . qq|> |; @@ -195,15 +196,17 @@ sub form_header { # without JavaScript Calendar $button1 = qq| - |; + |; } - + $form->{javascript} .= qq||; $form->header; $arap = lc $form->{ARAP}; - + $onload = qq|focus()|; + $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; + $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; print qq| - +

{script}> @@ -305,7 +308,7 @@ sub form_header { | . $locale->text('Amount') . qq| format_amount(\%myconfig, $form->{amount}, 2) . qq|> + . $form->format_amount(\%myconfig, $form->{amount}, 2) . qq| onBlur=\"check_right_number_format(this)\"> @@ -464,7 +467,6 @@ sub form_footer { {rowcount}> -{path}> {login}> {password}> @@ -668,7 +670,7 @@ sub print { &check_form; - ($whole, $form->{decimal}) = split /\./, $form->{amount}; + ($whole, $form->{decimal}) = split(/\./, $form->{amount}); $form->{amount} = $form->format_amount(\%myconfig, $form->{amount}, 2); @@ -679,7 +681,7 @@ sub print { $check->init; $form->{text_amount} = $check->num2text($whole); - &{"$form->{vc}_details"}; + call_sub("$form->{vc}_details"); $form->{callback} = ""; @@ -693,11 +695,13 @@ sub print { $form->{pdf} = 1; } + delete $form->{OUT}; + if ($form->{media} eq 'printer') { $form->{OUT} = "| $myconfig{printer}"; } if ($form->{media} eq 'queue') { - %queued = split / /, $form->{queued}; + %queued = map { s|.*/|| } split / /, $form->{queued}; if ($filename = $queued{ $form->{formname} }) { unlink "$spool/$filename"; @@ -721,7 +725,7 @@ sub print { if ($form->{media} ne 'screen') { $form->{callback} = - "$form->{script}?action=payment&vc=$form->{vc}&path=$form->{path}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}"; + "$form->{script}?action=payment&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}"; $form->redirect if (CP->process_payment(\%myconfig, \%$form)); $form->error($locale->text('Cannot post payment!'));