cvars in aufträgen bei update korrekt parsen und formatieren

diff --git a/SL/CVar.pm b/SL/CVar.pm
index e91a2366dbb0cb6bab9b9b214cb79a988b9ceec8..2408222782c2ab8a13b0e573a2336415ccf1723e 100644 (file)
--- a/SL/CVar.pm
+++ b/SL/CVar.pm
@@ -3,6 +3,7 @@ package CVar;
 use strict;
 
 use List::Util qw(first);
 use strict;
 
 use List::Util qw(first);

+use Scalar::Util qw(blessed);

 use Data::Dumper;
 
 use SL::DBUtils;
 use Data::Dumper;
 
 use SL::DBUtils;


@@ -706,6 +707,15 @@ sub custom_variables_validity_by_trans_id {
   return sub { !$invalids{+shift} };
 }
 
   return sub { !$invalids{+shift} };
 }
 

+sub parse {
+  my ($self, $value, $config) = @_;
+
+  return $::form->parse_amount(\%::myconfig, $value)          if $config->{type} eq 'number';
+  return DateTime->from_lxoffice($value)                      if $config->{type} eq 'date';
+  return !ref $value ? SL::DB::Manager::Customer->find_by(id => $value * 1) : $value  if $config->{type} eq 'customer';
+  return $value;
+}
+

 1;
 
 __END__
 1;
 
 __END__

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 3479485d54a8584e85c9945c2033355c48c3eece..e647db69312ab8d6a3bcddd924db687f315f9432 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1796,6 +1796,8 @@ sub _render_custom_variables_inputs {
       $description = $cvar->{description} . ' ';
     }
 
       $description = $cvar->{description} . ' ';
     }
 

+    my $form_key = "ic_cvar_" . $cvar->{name} . "_$params{row}";
+

     push @{ $params{ROW2} }, {
       line_break     => $num_visible_cvars == 1,
       description    => $description,
     push @{ $params{ROW2} }, {
       line_break     => $num_visible_cvars == 1,
       description    => $description,


@@ -1806,7 +1808,7 @@ sub _render_custom_variables_inputs {
          name_prefix       => 'ic_',
          name_postfix      => "_$params{row}",
          valid             => $cvar->{valid},
          name_prefix       => 'ic_',
          name_postfix      => "_$params{row}",
          valid             => $cvar->{valid},

-         value             => $form->{"ic_cvar_" . $cvar->{name} . "_$params{row}"},
+         value             => CVar->parse($::form->{$form_key}, $cvar),

       }
     };
   }
       }
     };
   }

diff --git a/templates/webpages/amcvar/render_inputs_block.html b/templates/webpages/amcvar/render_inputs_block.html
index e769291e6a77a82e545917dbb5e63a6522697b0e..329b94cd8810e6f7808fb1bbaeee0f8a4cbdca7f 100644 (file)
--- a/templates/webpages/amcvar/render_inputs_block.html
+++ b/templates/webpages/amcvar/render_inputs_block.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE L %]
 [%- USE T8 %]
 [%- USE HTML %]
 [%- USE L %]

+[%- USE LxERP %]

 [%- BLOCK cvar_name %][% HTML.escape(cvar.name_prefix) _ "cvar_" _ HTML.escape(cvar.var.name) _ HTML.escape(cvar.name_postfix) -%][% END %]
 [%- BLOCK cvar_inputs %]
 [% render_input_blocks__cvar_name = PROCESS cvar_name %]
 [%- BLOCK cvar_name %][% HTML.escape(cvar.name_prefix) _ "cvar_" _ HTML.escape(cvar.var.name) _ HTML.escape(cvar.name_postfix) -%][% END %]
 [%- BLOCK cvar_inputs %]
 [% render_input_blocks__cvar_name = PROCESS cvar_name %]


@@ -27,7 +28,11 @@
  [%- END %]
 </select>
 [%- ELSIF cvar.var.type == 'customer' %]
  [%- END %]
 </select>
 [%- ELSIF cvar.var.type == 'customer' %]

-[% render_input_blocks__cvar_name = PROCESS cvar_name %][% L.customer_picker(render_input_blocks__cvar_name, cvar.value) %]
+[%- L.customer_picker(render_input_blocks__cvar_name, cvar.value) %]
+
+[%- ELSIF cvar.var.type == 'number' %]
+[%- L.input_tag(render_input_blocks__cvar_name, LxERP.format_amount(cvar.value, -2)) %]
+

 [%- ELSE %]
 <input name="[% PROCESS cvar_name %]" value="[% HTML.escape(cvar.value) %]" [%- IF cvar.var.maxlength %] maxlength="[% HTML.escape(cvar.var.maxlength) %]"[% END -%]>
 [%- END %]
 [%- ELSE %]
 <input name="[% PROCESS cvar_name %]" value="[% HTML.escape(cvar.value) %]" [%- IF cvar.var.maxlength %] maxlength="[% HTML.escape(cvar.var.maxlength) %]"[% END -%]>
 [%- END %]