-
-
- | . $locale->text('To') . qq| |
- |
- | . $locale->text('Cc') . qq| |
- |
-
-
- | . $locale->text('Subject') . qq| |
- |
- $bcc
-
+
-
-
- | . $locale->text('Message') . qq| |
-
-
- |
-
+
+
+ | . $locale->text('Message') . qq| |
+
+
+ |
+
@@ -1345,21 +1426,21 @@ sub e_mail {
# save all other variables
foreach $key (keys %$form) {
$form->{$key} =~ s/\"/"/g;
- print qq|\n|;
+ print qq|\n|;
}
print qq|
-
|
+
|
-
+
-
@@ -1397,6 +1478,16 @@ sub print_options {
$myconfig{"copies"} ? $myconfig{"copies"} :
3;
+ $form->{"media"} =
+ $form->{"media"} ? $form->{"media"} :
+ $myconfig{"default_media"} ? $myconfig{"default_media"} :
+ "screen";
+
+ $form->{"printer_id"} =
+ defined($form->{"printer_id"}) ? $form->{"printer_id"} :
+ $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} :
+ "";
+
$form->{PD}{ $form->{formname} } = "selected";
$form->{DF}{ $form->{format} } = "selected";
$form->{OP}{ $form->{media} } = "selected";
@@ -1458,20 +1549,6 @@ sub print_options {
. $locale->text('Credit Note');
}
- if ($form->{type} eq 'ship_order') {
- $type = qq| |
| . $locale->text('Phone') . qq| |
- $form->{"$form->{vc}phone"} |
+ $form->{phone} |
|
| . $locale->text('Fax') . qq| |
- $form->{"$form->{vc}fax"} |
+ $form->{fax} |
|
@@ -2153,8 +2240,7 @@ sub ship_to {
|;
# delete shipto
- map { delete $form->{$_} }
- qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2 header);
+ map({ delete $form->{$_} } (@shipto_vars, qw(header)));
$form->{title} = $title;
foreach $key (keys %$form) {
|