From: Moritz Bunkus Date: Thu, 16 Jun 2011 12:34:28 +0000 (+0200) Subject: ship_to() in io.pl auf Template umgestellt X-Git-Tag: release-2.7.0beta1~385 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6d6eb2decd2f3561ae4f4591269165cffce88b25;p=kivitendo-erp.git ship_to() in io.pl auf Template umgestellt --- diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 7acf49db0..770e1c7f9 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -1615,184 +1615,42 @@ sub post_as_new { sub ship_to { $main::lxdebug->enter_sub(); - my $form = $main::form; - my %myconfig = %main::myconfig; - my $locale = $main::locale; - my $cgi = $main::cgi; - _check_io_auth(); - if ($form->{second_run}) { - $form->{print_and_post} = 0; - } + $::form->{print_and_post} = 0 if $::form->{second_run}; - my $title = $form->{title}; - $form->{title} = $locale->text('Ship to'); + map { $::form->{$_} = $::form->parse_amount(\%::myconfig, $::form->{$_}) } qw(exchangerate creditlimit creditremaining); - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } - qw(exchangerate creditlimit creditremaining); - - my @shipto_vars = - qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry - shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail - shiptodepartment_1 shiptodepartment_2); - - my @addr_vars = - (qw(name department_1 department_2 street zipcode city country - contact email phone fax)); - - # get details for name - call_sub("$form->{vc}_details", @addr_vars); - - my $number = - ($form->{vc} eq 'customer') - ? $locale->text('Customer Number') - : $locale->text('Vendor Number'); - - # sieht nicht nett aus, funktioniert aber - # das vorausgewählte select-feld wird über shiptocp_gender - # entsprechend vorbelegt - my $selected_m=''; - my $selected_f=''; - if ($form->{shiptocp_gender} eq 'm') { - $selected_m='selected'; - $selected_f=''; - } elsif ($form->{shiptocp_gender} eq 'f') { - $selected_m=''; - $selected_f='selected'; - } + # get details for customer/vendor + call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country contact email phone fax), $::form->{vc} . "number"); # get pricegroups for parts - IS->get_pricegroups_for_parts(\%myconfig, \%$form); + IS->get_pricegroups_for_parts(\%::myconfig, \%$::form); # build up html code for prices_$i - set_pricegroup($form->{rowcount}); + set_pricegroup($::form->{rowcount}); - my $nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form"; - - $form->{rowcount}--; + $::form->{rowcount}--; - $form->header; + my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry + shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail + shiptodepartment_1 shiptodepartment_2); + my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id) ]); + $::form->{title} = $::locale->text('Ship to'); + $::form->header; - print qq| - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
| - . $locale->text('Billing Address') . qq|| - . $locale->text('Shipping Address') . qq|
$number$form->{"$form->{vc}number"}
| . $locale->text('Company Name') . qq|$form->{name}
| . $locale->text('Department') . qq|$form->{department_1}
 $form->{department_2}
| . $locale->text('Street') . qq|$form->{street}
| . $locale->text('Zipcode') . qq|$form->{zipcode}
| . $locale->text('City') . qq|$form->{city}
| . $locale->text('Country') . qq|$form->{country}
| . $locale->text('Contact') . qq|$form->{contact}
| . $locale->text('Gender') . qq| -
| . $locale->text('Phone') . qq|$form->{phone}
| . $locale->text('Fax') . qq|$form->{fax}
| . $locale->text('E-mail') . qq|$form->{email}
-
-| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub); -; - - - - # delete shipto - map({ delete $form->{$_} } (@shipto_vars, qw(header shipto_id))); - $form->{title} = $title; - - foreach my $key (keys %$form) { - next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } - - print qq| - -
- -
- -
- - - -|; + print $::form->parse_html_template('io/ship_to', { previousform => $previous_form, + nextsub => $::form->{display_form} || 'display_form', + }); $main::lxdebug->leave_sub(); } +sub ship_to_entered { + $::auth->restore_form_from_session(delete $::form->{previousform}); + call_sub($::form->{nextsub}); +} + sub relink_accounts { $main::lxdebug->enter_sub(); diff --git a/templates/webpages/io/ship_to.html b/templates/webpages/io/ship_to.html new file mode 100644 index 000000000..516460bf5 --- /dev/null +++ b/templates/webpages/io/ship_to.html @@ -0,0 +1,89 @@ +[% USE HTML %][% USE L %][% USE LxERP %] + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[% LxERP.t8('Billing Address') %][% LxERP.t8('Shipping Address') %]
[%- IF vc == "customer" %][%- LxERP.t8('Customer Number') %][%- ELSE %][%- LxERP.t8('Vendor Number') %][%- END %][%- IF vc == "customer" %][%- HTML.escape(customernumber) %][%- ELSE %][%- HTML.escape(vendornumber) %][%- END %]
[% LxERP.t8('Company Name') %][% HTML.escape(name) %][% L.input_tag("shiptoname", shiptoname, "size", "35") %]
[% LxERP.t8('Department') %][% HTML.escape(department_1) %][% L.input_tag("shiptodepartment_1", shiptodepartment_1, "size", "35") %]
 [% HTML.escape(department_2) %][% L.input_tag("shiptodepartment_2", shiptodepartment_2, "size", "35") %]
[% LxERP.t8('Street') %][% HTML.escape(street) %][% L.input_tag("shiptostreet", shiptostreet, "size", "35") %]
[% LxERP.t8('Zipcode') %][% HTML.escape(zipcode) %][% L.input_tag("shiptozipcode", shiptozipcode, "size", "35") %]
[% LxERP.t8('City') %][% HTML.escape(city) %][% L.input_tag("shiptocity", shiptocity, "size", "35") %]
[% LxERP.t8('Country') %][% HTML.escape(country) %][% L.input_tag("shiptocountry", shiptocountry, "size", "35") %]
[% LxERP.t8('Contact') %][% HTML.escape(contact) %][% L.input_tag("shiptocontact", shiptocontact, "size", "35") %]
[% LxERP.t8('Gender') %] + [% L.select_tag("shiptocp_gender", L.options_for_select([ [ "m", LxERP.t8("male") ], [ "f", LxERP.t8("female") ] ], "default", shiptocp_gender)) %] +
[% LxERP.t8('Phone') %][% HTML.escape(phone) %][% L.input_tag("shiptophone", shiptophone, "size", "35") %]
[% LxERP.t8('Fax') %][% HTML.escape(fax) %][% L.input_tag("shiptofax", shiptofax, "size", "35") %]
[% LxERP.t8('E-mail') %][% HTML.escape(email) %][% L.input_tag("shiptoemail", shiptoemail, "size", "35") %]
+ +
+ + [% L.hidden_tag("action", "ship_to_entered") %] + [% L.hidden_tag("nextsub", nextsub) %] + [% L.hidden_tag("previousform", previousform) %] + + [% L.submit_tag("__dummy", LxERP.t8("Continue")) %] +
+ +