X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPresenter%2FCustomerVendor.pm;h=d00c54d7ec450ae843e46c14e3a01173d2bb3e5f;hb=808bfd679e48691da8f0b9bbb8c778ab7805cbda;hp=4a370297040ce97f26d6bff3531eba7f51236166;hpb=a7177e631661ee3e6b74e24dc230571ab2b24837;p=kivitendo-erp.git

diff --git a/SL/Presenter/CustomerVendor.pm b/SL/Presenter/CustomerVendor.pm
index 4a3702970..d00c54d7e 100644
--- a/SL/Presenter/CustomerVendor.pm
+++ b/SL/Presenter/CustomerVendor.pm
@@ -5,10 +5,15 @@ use strict;
 use parent qw(Exporter);
 
 use Exporter qw(import);
-our @EXPORT = qw(customer vendor customer_vendor_picker);
+our @EXPORT = qw(customer_vendor customer vendor customer_vendor_picker);
 
 use Carp;
 
+sub customer_vendor {
+  my ($self, $customer_vendor, %params) = @_;
+  return _customer_vendor($self, $customer_vendor, ref($customer_vendor) eq 'SL::DB::Customer' ? 'customer' : 'vendor', %params);
+}
+
 sub customer {
   my ($self, $customer, %params) = @_;
   return _customer_vendor($self, $customer, 'customer', %params);
@@ -40,7 +45,7 @@ sub customer_vendor_picker {
   my ($self, $name, $value, %params) = @_;
 
   croak 'Unknown "type" parameter' unless $params{type} =~ m{^(?:customer|vendor)$};
-  croak 'Unknown value class'      if     $value && (ref($value) !~ m{^SL::DB::(?:Customer|Vendor)$});
+  croak 'Unknown value class'      if     $value && ref($value) && (ref($value) !~ m{^SL::DB::(?:Customer|Vendor)$});
 
   if ($value && !ref $value) {
     my $class = $params{type} eq 'customer' ? 'SL::DB::Manager::Customer' : 'SL::DB::Manager::Vendor';
@@ -48,17 +53,17 @@ sub customer_vendor_picker {
   }
 
   my $id = delete($params{id}) || $self->name_to_id($name);
-  my $fat_set_item = delete $params{fat_set_item};
 
   my @classes = $params{class} ? ($params{class}) : ();
   push @classes, 'customer_vendor_autocomplete';
-  push @classes, 'customer-vendor-picker-fat-set-item' if $fat_set_item;
 
   my $ret =
-    $self->input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id) .
-    join('', map { $params{$_} ? $self->input_tag("", delete $params{$_}, id => "${id}_${_}", type => 'hidden') : '' } qw(type)) .
-    $self->input_tag("", (ref $value && $value->can('name')) ? $value->name : '', id => "${id}_name", %params);
+    $self->input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id,
+      'data-customer-vendor-picker-data' => JSON::to_json(\%params),
+    ) .
+    $self->input_tag("", ref $value  ? $value->displayable_name : '', id => "${id}_name", %params);
 
+  $::request->layout->add_javascripts('kivi.CustomerVendor.js');
   $::request->presenter->need_reinit_widgets($id);
 
   $self->html_tag('span', $ret, class => 'customer_vendor_picker');
@@ -135,6 +140,14 @@ the "edit vendor" dialog from the master data menu.
 
 =back
 
+=item C<customer_vendor $object, %params>
+
+Returns a rendered version (actually an instance of
+L<SL::Presenter::EscapedText>) of the customer or vendor object
+C<$object> by calling either L</customer> or L</vendor> depending on
+C<$object>'s type. See the respective functions for available
+parameters.
+
 =back
 
 =head1 BUGS