X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.CustomerVendor.js;h=67820bea511b7d668b2609c26a920585108183e4;hb=cf63992efd6843a38de948fc509cdcc3bf51f1b6;hp=bfef730d4f793a01912005e8bfa525e48a64a439;hpb=53d80f2a01439ee73cf679c53326ec8fb32ab1ed;p=kivitendo-erp.git

diff --git a/js/kivi.CustomerVendor.js b/js/kivi.CustomerVendor.js
index bfef730d4..67820bea5 100644
--- a/js/kivi.CustomerVendor.js
+++ b/js/kivi.CustomerVendor.js
@@ -41,6 +41,27 @@ namespace('kivi.CustomerVendor', function(ns) {
     }
   };
 
+  this.setCustomVariablesFromAJAJ = function(cvars) {
+    for (var key in cvars) {
+      var cvar  = cvars[key];
+      var $ctrl = $('#contact_cvars_'+ key);
+
+      console.log($ctrl, cvar);
+
+      if (cvar.type == 'bool')
+        $ctrl.prop('checked', cvar.value == 1 ? 'checked' : '');
+
+      else if ((cvar.type == 'customer') || (cvar.type == 'vendor'))
+        kivi.CustomerVendorPicker($ctrl).set_item({ id: cvar.id, name: cvar.value });
+
+      else if (cvar.type == 'part')
+        kivi.PartPicker($ctrl).set_item({ id: cvar.id, name: cvar.value });
+
+      else
+        $ctrl.val(cvar.value);
+    }
+  };
+
   this.selectContact = function(params) {
     var contactId = $('#contact_cp_id').val();
 
@@ -51,9 +72,7 @@ namespace('kivi.CustomerVendor', function(ns) {
       for(var key in contact)
         $(document.getElementById('contact_'+ key)).val(contact[key])
 
-      var cvars = data.contact_cvars;
-      for(var key in cvars)
-        $(document.getElementById('contact_cvars_'+ key)).val(cvars[key]);
+      kivi.CustomerVendor.setCustomVariablesFromAJAJ(data.contact_cvars);
 
       if ( contactId )
         $('#action_delete_contact').show();
@@ -77,7 +96,7 @@ namespace('kivi.CustomerVendor', function(ns) {
     '#country'
   ];
 
-  this.MapWidget = function(prefix)
+  this.MapWidget = function(prefix, source_address)
   {
     var $mapSearchElements = [];
     var $widgetWrapper;
@@ -117,7 +136,9 @@ namespace('kivi.CustomerVendor', function(ns) {
           searchString += stmt;
       }
 
-      var url = 'https://maps.google.com/maps?q='+ encodeURIComponent(searchString);
+      source_address = source_address || '';
+      var query      = source_address != '' ? 'saddr=' + encodeURIComponent(source_address) + '&daddr=' : 'q=';
+      var url        = 'https://maps.google.com/maps?' + query + encodeURIComponent(searchString);
 
       window.open(url, '_blank');
       window.focus();