X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/763d39921a6e901b2322525404c358907036ec36..39663b90b3737962a31f230814073ebe7bb1dd40:/templates/webpages/order/tabs/basic_data.html

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 93f954a7b..40badd23f 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -102,6 +102,8 @@
     </tr>
   </table>
 
+  [%- PROCESS order/tabs/_item_input.html %]
+
   <table width="100%">
     <tr>
       <td>
@@ -125,9 +127,6 @@
             [%- FOREACH item = SELF.order.items_sorted %]
               [%- PROCESS order/tabs/_row.html ITEM=item %]
             [%- END %]
-            [%- IF !SELF.order.items.size %]
-              [%- PROCESS order/tabs/_row.html ITEM='' %]
-            [%- END %]
           </tbody>
 
         </table>
@@ -137,28 +136,24 @@
     <tr>
     </tr>
 
-    <tr>
-      <td>[%- L.button_tag('add_order_item_row()', LxERP.t8("Add Row")) -%]</td>
-    </tr>
-
     <tr>
       <td align="right">
         <table>
           [%- IF NOT taxincluded %]
           <tr>
             <th align="right">[%- 'Subtotal' | $T8 %]</th>
-            <td align="right">[%- SELF.order.netamount_as_number %]</td>
+            <td align="right">
+              [%- L.div_tag(SELF.order.netamount_as_number, id='netamount_id') %]
+            </td>
           </tr>
           [%- END %]
           [%- FOREACH tax = SELF.taxes %]
-          <tr>
-            <th align="right">[%- tax.tax.description %] [% tax.tax.rate_as_percent %]%</th>
-            <td align="right">[%- LxERP.format_amount(tax.amount, 2, 0) %]</td>
-          </tr>
+            [%- PROCESS order/tabs/_tax_row.html TAX=tax %]
           [%- END %]
-          <tr>
+          <tr id="amount_row_id">
             <th align="right">[%- 'Total' | $T8 %]</th>
-            <td align="right">[%- SELF.order.amount_as_number %]</td>
+            <td align="right">
+              [%- L.div_tag(SELF.order.amount_as_number, id='amount_id') %]
           </tr>
         </table>
       </td>
@@ -183,15 +178,19 @@ function reload_cv_dependend_selections() {
                           }, kivi.eval_json_result);
 }
 
-function add_order_item_row() {
-  $.post("controller.pl", { 'action': 'Order/add_item_row',
-                            'type'  : function(){ return $('#type').val() }
-                          }, kivi.eval_json_result);
+function add_item() {
+  var data = $('#order_form').serialize();
+  data += '&action=Order/add_item';
+  data += '&type=' + $('#type').val();
+
+  $.post("controller.pl", data, kivi.eval_json_result);
 }
 
 function delete_order_item_row(clicked) {
   var row = $(clicked).parents("tr").first();
   $(row).remove();
+
+  recalc_amounts_and_taxes()
 }
 
 function set_item_values(event) {
@@ -199,28 +198,33 @@ function set_item_values(event) {
   var parts_id = $(event.target).val();
   var row = $(event.target).parents("tr").first();
 
-  var item_id_dom = $(row).find('[name="item_id"]');
+  var item_id_dom = $(row).find('[name="order.orderitems[+].id"]');
   var qty_dom = $(row).find('[id^="order_orderitems"][id$="qty_as_number"]');
   var unit_dom = $(row).find('[id^="order_orderitems"][id$="unit"]');
   var sellprice_dom = $(row).find('[id^="order_orderitems"][id$="sellprice_as_number"]');
   var discount_dom = $(row).find('[id^="order_orderitems"][id$="discount_as_percent"]');
 
-  $.post("controller.pl", { 'action': 'Order/set_item_values',
-                            'item_id': item_id_dom.val(),
-                            'cv_id': cv_id,
-                            'parts_id': parts_id,
-                            'qty': qty_dom.val(),
-                            'discount': discount_dom.val(),
-                            'sellprice': sellprice_dom.val(),
-                            'qty_dom_id': qty_dom.attr("id"),
-                            'unit_dom_id': unit_dom.attr("id"),
-                            'sellprice_dom_id': sellprice_dom.attr("id"),
-                            'discount_dom_id': discount_dom.attr("id"),
-                            'type': function(){ return $('#type').val() }
-                          }, kivi.eval_json_result);
+  var data = $('#order_form').serialize();
+  data += '&action=Order/set_item_values';
+  data += '&type=' + $('#type').val();
+  data += '&item_id=' + item_id_dom.val();
+  data += '&qty_dom_id=' + qty_dom.attr("id");
+  data += '&unit_dom_id=' + unit_dom.attr("id");
+  data += '&sellprice_dom_id=' + sellprice_dom.attr("id");
+  data += '&discount_dom_id=' + discount_dom.attr("id");
+
+  $.post("controller.pl", data, kivi.eval_json_result);
 }
 
-function recalc_linetotal(item_id, amount) {
+function recalc_amounts_and_taxes() {
+  var data = $('#order_form').serialize();
+  data += '&action=Order/recalc_amounts_and_taxes';
+  data += '&type=' + $('#type').val();
+
+  $.post("controller.pl", data, kivi.eval_json_result);
+}
+
+function display_linetotal(item_id, amount) {
   $('#item_' + item_id).parents("tr").first().find('[name="linetotal"]').html(amount);
 }
 
@@ -228,5 +232,13 @@ function recalc_linetotal(item_id, amount) {
 $(function(){
   $('#order_[%- cv_id %]').change(reload_cv_dependend_selections);
   $('[id^="order_orderitems"][id$="parts_id"]').change(set_item_values);
+  $('.add_item_input').keydown(function(event) {
+    if(event.keyCode == 13) {
+      event.preventDefault();
+      add_item();
+      return false;
+    }
+  });
 });
+
 </script>