projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test in branch test eingefügt
[kivitendo-erp.git]
/
js
/
kivi.Order.js
diff --git
a/js/kivi.Order.js
b/js/kivi.Order.js
index
6226755
..
a96f49f
100644
(file)
--- a/
js/kivi.Order.js
+++ b/
js/kivi.Order.js
@@
-63,9
+63,10
@@
namespace('kivi.Order', function(ns) {
$.post("controller.pl", data, kivi.eval_json_result);
};
$.post("controller.pl", data, kivi.eval_json_result);
};
- ns.show_print_options = function(warn_on_duplicates) {
+ ns.show_print_options = function(warn_on_duplicates
, warn_on_reqdate
) {
if (!ns.check_cv()) return;
if (warn_on_duplicates && !ns.check_duplicate_parts(kivi.t8("Do you really want to print?"))) return;
if (!ns.check_cv()) return;
if (warn_on_duplicates && !ns.check_duplicate_parts(kivi.t8("Do you really want to print?"))) return;
+ if (warn_on_reqdate && !ns.check_valid_reqdate()) return;
kivi.popup_dialog({
id: 'print_options',
kivi.popup_dialog({
id: 'print_options',
@@
-134,6
+135,9
@@
namespace('kivi.Order', function(ns) {
};
ns.send_email = function() {
};
ns.send_email = function() {
+ // push button only once -> slow response from mail server
+ ns.email_dialog_disable_send();
+
var data = $('#order_form').serializeArray();
data = data.concat($('[name^="email_form."]').serializeArray());
data = data.concat($('[name^="print_options."]').serializeArray());
var data = $('#order_form').serializeArray();
data = data.concat($('[name^="email_form."]').serializeArray());
data = data.concat($('[name^="print_options."]').serializeArray());
@@
-141,6
+145,12
@@
namespace('kivi.Order', function(ns) {
$.post("controller.pl", data, kivi.eval_json_result);
};
$.post("controller.pl", data, kivi.eval_json_result);
};
+ ns.email_dialog_disable_send = function() {
+ // disable mail send event to prevent
+ // impatient users to send multiple times
+ $('#send_email').prop('disabled', true);
+ };
+
ns.close_email_dialog = function() {
email_dialog.dialog("close");
};
ns.close_email_dialog = function() {
email_dialog.dialog("close");
};
@@
-458,6
+468,14
@@
namespace('kivi.Order', function(ns) {
$.post("controller.pl", data, kivi.eval_json_result);
};
$.post("controller.pl", data, kivi.eval_json_result);
};
+ ns.open_multi_items_dialog = function() {
+ if (!ns.check_cv()) return;
+
+ var pp = $("#add_item_parts_id").data("part_picker");
+ pp.o.multiple=1;
+ pp.open_dialog();
+ };
+
ns.add_multi_items = function(data) {
var insert_before_item_id = ns.get_insert_before_item_id($('#multi_items_position').val());
data = data.concat($('#order_form').serializeArray());
ns.add_multi_items = function(data) {
var insert_before_item_id = ns.get_insert_before_item_id($('#multi_items_position').val());
data = data.concat($('#order_form').serializeArray());
@@
-819,6
+837,13
@@
namespace('kivi.Order', function(ns) {
follow_up_window();
};
follow_up_window();
};
+ ns.create_part = function() {
+ var data = $('#order_form').serializeArray();
+ data.push({ name: 'action', value: 'Order/create_part' });
+
+ $.post("controller.pl", data, kivi.eval_json_result);
+ };
+
});
$(function() {
});
$(function() {