Auftrags-Controller: freie Preise und Rabatte nach der Eingabe neu formatieren.

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 33628ba466317ef711cec221acb31629136a26e9..38f511cb56e224863fd5dc491bcf9afc5d8381a0 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -350,6 +350,7 @@ sub action_add_item {
     ->run('row_table_scroll_down')
     ->run('row_set_keyboard_events_by_id', $item_id)
     ->on('.recalc', 'change', 'recalc_amounts_and_taxes')
+    ->on('.reformat_number', 'change', 'reformat_number')
     ->focus('#add_item_parts_id_name');
 
   $self->_js_redisplay_amounts_and_taxes;

diff --git a/templates/webpages/order/tabs/_row.html b/templates/webpages/order/tabs/_row.html
index d8ec4df0e6698c1b0471dca369a15ebde1aabdae..08fd81d644bd182548e27dd3aef56959fa9eb26e 100644 (file)
--- a/templates/webpages/order/tabs/_row.html
+++ b/templates/webpages/order/tabs/_row.html
@@ -59,7 +59,7 @@
                         size = 10,
                         style='text-align:right',
                         disabled=(EDIT_PRICE? '' : 1),
-                        class="recalc") %]
+                        class="recalc reformat_number") %]
       </div>
       <div name="not_editable_price" [%- IF EDIT_PRICE %]style="display:none"[%- END %]>
         [%- L.div_tag(ITEM.sellprice_as_number, name="sellprice_text", style='text-align:right') %]
@@ -77,7 +77,7 @@
                         size = 5,
                         style='text-align:right',
                         disabled=(EDIT_DISCOUNT? '' : 1),
-                        class="recalc") %]
+                        class="recalc reformat_number") %]
       </div>
       <div name="not_editable_discount" [%- IF EDIT_DISCOUNT %]style="display:none"[%- END %]>
         [%- L.div_tag(ITEM.discount_as_percent, name="discount_text", style='text-align:right') %]

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index c67ed378844b850036f8dec02524890f78259116..ea37fafbed1cc6a3de9c2299903801677bdd8d73 100644 (file)
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -348,6 +348,10 @@ function update_discount_source(item_id, source, discount_str) {
   kivi.io.close_dialog();
 }
 
+function reformat_number(event) {
+  $(event.target).val(kivi.format_amount(kivi.parse_amount($(event.target).val()), -2));
+}
+
 function recalc_amounts_and_taxes() {
   var data = $('#order_form').serialize();
   data += '&action=Order/recalc_amounts_and_taxes';
@@ -446,6 +450,7 @@ $(function(){
   });
   row_set_keyboard_events($('.row_entry'));
   $('.recalc').change(recalc_amounts_and_taxes);
+  $('.reformat_number').change(reformat_number);
 });
 
 </script>