X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/982a94229615d330902a99d1d941f4ef9d4d5d3f..598383b3b6b63428fcabc5fb6e5595ec59de28e3:/js/kivi.Order.js

diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index f50d2a8b6..592909686 100644
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -174,9 +174,29 @@ namespace('kivi.Order', function(ns) {
     $(event.target).val(kivi.format_amount(kivi.parse_amount($(event.target).val()), -2));
   };
 
+  ns.reformat_number_as_null_number = function(event) {
+    if ($(event.target).val() === '') {
+      return;
+    }
+    ns.reformat_number(event);
+  };
+
   ns.update_exchangerate = function(event) {
+    if (!ns.check_cv()) {
+      $('#order_currency_id').val($('#old_currency_id').val());
+      return;
+    }
+
     var rate_input = $('#order_exchangerate_as_null_number');
-    rate_input.prop('disabled', true);
+    // unset exchangerate if currency changed
+    if ($('#order_currency_id').val() !== $('#old_currency_id').val()) {
+      rate_input.val('');
+    }
+
+    // only set exchangerate if unset
+    if (rate_input.val() !== '') {
+      return;
+    }
 
     var data = $('#order_form').serializeArray();
     data.push({ name: 'action', value: 'Order/update_exchangerate' });
@@ -189,22 +209,19 @@ namespace('kivi.Order', function(ns) {
       success: function(data){
         if (!data.is_standard) {
           $('#currency_name').text(data.currency_name);
-          var rate_text = $('#exchangerate_text');
           if (data.exchangerate) {
-            rate_text.text(data.exchangerate);
-            rate_input.hide();
+            rate_input.val(data.exchangerate);
           } else {
-            rate_text.text('');
-            rate_input.prop('disabled', false);
-            rate_input.show().val(0);
+            rate_input.val('');
           }
           $('#exchangerate_settings').show();
         } else {
+          rate_input.val('');
           $('#exchangerate_settings').hide();
         }
         if ($('#order_currency_id').val() != $('#old_currency_id').val() ||
             !data.is_standard && data.exchangerate != $('#old_exchangerate').val()) {
-          kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please update prices.'));
+          kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please check prices.'));
         }
         $('#old_currency_id').val($('#order_currency_id').val());
         $('#old_exchangerate').val(data.exchangerate);
@@ -214,7 +231,7 @@ namespace('kivi.Order', function(ns) {
 
   ns.exchangerate_changed = function(event) {
     if (kivi.parse_amount($('#order_exchangerate_as_null_number').val()) != kivi.parse_amount($('#old_exchangerate').val())) {
-      kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please update prices.'));
+      kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please check prices.'));
       $('#old_exchangerate').val($('#order_exchangerate_as_null_number').val());
     }
   };
@@ -887,4 +904,6 @@ $(function() {
     return false;
   });
 
+  $('.reformat_number_as_null_number').change(kivi.Order.reformat_number_as_null_number);
+
 });