X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.CustomerVendor.js;h=9efb990f1daec6d2952fc42196b9e259dac39ba3;hb=c7e142ae1c2cc44f4ef5de1d9fabc43e5ed6244f;hp=4b4aa3f50975c4c866a4287a8c82e00efce17956;hpb=685108d71043daa0391e75861f0d27340aa44778;p=kivitendo-erp.git

diff --git a/js/kivi.CustomerVendor.js b/js/kivi.CustomerVendor.js
index 4b4aa3f50..9efb990f1 100644
--- a/js/kivi.CustomerVendor.js
+++ b/js/kivi.CustomerVendor.js
@@ -2,28 +2,23 @@ namespace('kivi.CustomerVendor', function(ns) {
 
   this.selectShipto = function(params) {
     var shiptoId = $('#shipto_shipto_id').val();
+    var url      = 'controller.pl?action=CustomerVendor/ajaj_get_shipto&id='+ $('#cv_id').val() +'&db='+ $('#db').val() +'&shipto_id='+ shiptoId;
 
-    if( shiptoId ) {
-      var url = 'controller.pl?action=CustomerVendor/ajaj_get_shipto&id='+ $('#cv_id').val() +'&db='+ $('#db').val() +'&shipto_id='+ shiptoId;
+    $.getJSON(url, function(data) {
+      var shipto = data.shipto;
+      for(var key in shipto)
+        $('#shipto_'+ key).val(shipto[key])
 
-      $.getJSON(url, function(data) {
-        for(var key in data)
-          $(document.getElementById('shipto_'+ key)).val(data[key]);
+      kivi.CustomerVendor.setCustomVariablesFromAJAJ(data.shipto_cvars, 'shipto_cvars_');
 
+      if ( shiptoId )
         $('#action_delete_shipto').show();
+      else
+        $('#action_delete_shipto').hide();
 
-        if( params.onFormSet )
-          params.onFormSet();
-      });
-    }
-    else {
-      $('#shipto :input').not(':button, :submit, :reset, :hidden').val('');
-
-      $('#action_delete_shipto').hide();
-
-      if( params.onFormSet )
+      if ( params.onFormSet )
         params.onFormSet();
-    }
+    });
   };
 
   this.selectDelivery = function(fromDate, toDate) {
@@ -41,12 +36,10 @@ namespace('kivi.CustomerVendor', function(ns) {
     }
   };
 
-  this.setCustomVariablesFromAJAJ = function(cvars) {
+  this.setCustomVariablesFromAJAJ = function(cvars, prefix) {
     for (var key in cvars) {
       var cvar  = cvars[key];
-      var $ctrl = $('#contact_cvars_'+ key);
-
-      console.log($ctrl, cvar);
+      var $ctrl = $('#' + prefix + key);
 
       if (cvar.type == 'bool')
         $ctrl.prop('checked', cvar.value == 1 ? 'checked' : '');
@@ -55,7 +48,7 @@ namespace('kivi.CustomerVendor', function(ns) {
         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 });
+        kivi.Part.Picker($ctrl).set_item({ id: cvar.id, name: cvar.value });
 
       else
         $ctrl.val(cvar.value);
@@ -70,9 +63,9 @@ namespace('kivi.CustomerVendor', function(ns) {
     $.getJSON(url, function(data) {
       var contact = data.contact;
       for(var key in contact)
-        $(document.getElementById('contact_'+ key)).val(contact[key])
+        $('#contact_'+ key).val(contact[key])
 
-      kivi.CustomerVendor.setCustomVariablesFromAJAJ(data.contact_cvars);
+      kivi.CustomerVendor.setCustomVariablesFromAJAJ(data.contact_cvars, 'contact_cvars_');
 
       if ( contactId )
         $('#action_delete_contact').show();
@@ -117,7 +110,7 @@ namespace('kivi.CustomerVendor', function(ns) {
 
     var isNotEmpty = function() {
       for(var i in $mapSearchElements)
-        if( ($mapSearchElements[i].attr('id') != prefix + 'country') && ($mapSearchElements[i].val() == '') )
+        if( ($mapSearchElements[i].attr('id') != prefix + 'country') && ($mapSearchElements[i].val() === '') )
           return false;
       return true;
     };
@@ -137,7 +130,7 @@ namespace('kivi.CustomerVendor', function(ns) {
       }
 
       source_address = source_address || '';
-      var query      = source_address != '' ? 'saddr=' + encodeURIComponent(source_address) + '&daddr=' : 'q=';
+      var query      = source_address !== '' ? 'saddr=' + encodeURIComponent(source_address) + '&daddr=' : 'q=';
       var url        = 'https://maps.google.com/maps?' + query + encodeURIComponent(searchString);
 
       window.open(url, '_blank');
@@ -155,9 +148,7 @@ namespace('kivi.CustomerVendor', function(ns) {
           showMap();
         });
       for(var i in $mapSearchElements)
-        $mapSearchElements[i].keyup(function() {
-          testInputs();
-        });
+        $mapSearchElements[i].keyup(testInputs);
       this.testInputs();
     };
 
@@ -189,7 +180,7 @@ namespace('kivi.CustomerVendor', function(ns) {
       return true;
 
     var number = $input.val().replace(/\s+/g, '');
-    if (number == '')
+    if (number === '')
       $action.hide();
     else
       $action.prop('href', 'controller.pl?action=CTI/call&number=' + encodeURIComponent(number)).show();