projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bankimport: CSV- und MT940-Menüpunkte in Untermenü in »Zahlungsverkehr«
[kivitendo-erp.git]
/
js
/
kivi.CustomerVendor.js
diff --git
a/js/kivi.CustomerVendor.js
b/js/kivi.CustomerVendor.js
index
38afb74
..
9efb990
100644
(file)
--- 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();
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();
$('#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();
params.onFormSet();
- }
+ }
);
};
this.selectDelivery = function(fromDate, toDate) {
};
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];
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' : '');
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.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);
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)
$.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();
if ( contactId )
$('#action_delete_contact').show();
@@
-117,7
+110,7
@@
namespace('kivi.CustomerVendor', function(ns) {
var isNotEmpty = function() {
for(var i in $mapSearchElements)
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;
};
return false;
return true;
};
@@
-137,7
+130,7
@@
namespace('kivi.CustomerVendor', function(ns) {
}
source_address = source_address || '';
}
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');
var url = 'https://maps.google.com/maps?' + query + encodeURIComponent(searchString);
window.open(url, '_blank');
@@
-187,7
+180,7
@@
namespace('kivi.CustomerVendor', function(ns) {
return true;
var number = $input.val().replace(/\s+/g, '');
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();
$action.hide();
else
$action.prop('href', 'controller.pl?action=CTI/call&number=' + encodeURIComponent(number)).show();