X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4ce66c79400b7019ddcfd4ac7d4f5ae6ff3dadf4..9d6f6ee4598cdce78dead47818dc584292eae5a9:/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 67ce0e2fa..f57cde89d 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -102,43 +102,43 @@
     </tr>
   </table>
 
+  [%- PROCESS order/tabs/_item_input.html %]
+
   <table width="100%">
     <tr>
       <td>
-        <table id="row_table_id" width="100%">
-          <thead>
-            <tr class="listheading">
-              <th class="listheading" style='display:none'></th>
-              <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
-              <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/close.png" alt="[%- LxERP.t8('delete item') %]"></th>
-              <th class="listheading" nowrap >[%- 'Part'         | $T8 %] </th>
-              <th class="listheading" nowrap width="5" >[%- 'Qty'          | $T8 %] </th>
-              <th class="listheading" nowrap width="5" >[%- 'Price Factor' | $T8 %] </th>
-              <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
-              <th class="listheading" nowrap width="15">[%- 'Price'        | $T8 %] </th>
-              <th class="listheading" nowrap width="5" >[%- 'Discount'     | $T8 %] </th>
-              <th class="listheading" nowrap width="10">[%- 'Extended'     | $T8 %] </th>
-            </tr>
-          </thead>
-
-          <tbody>
-            [%- 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>
-      </td>
-    </tr>
+        <div id="row_table_scroll_id" style="overflow-y: scroll; height: 500px;">
+          <table id="row_table_id" width="100%">
+            <thead>
+              <tr class="listheading">
+                <th class="listheading" style='display:none'></th>
+                <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]"></th>
+                <th class="listheading" style='text-align:center' nowrap width="1"><img src="image/close.png" alt="[%- LxERP.t8('delete item') %]"></th>
+                <th class="listheading" nowrap width="15">[%- 'Partnumber'  | $T8 %] </th>
+                <th class="listheading" nowrap           >[%- 'Description'  | $T8 %] </th>
+                <th class="listheading" nowrap width="5" >[%- 'Qty'          | $T8 %] </th>
+                <th class="listheading" nowrap width="5" >[%- 'Price Factor' | $T8 %] </th>
+                <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
+                <th class="listheading" nowrap width="15">[%- 'Price'        | $T8 %] </th>
+                <th class="listheading" nowrap width="5" >[%- 'Discount'     | $T8 %] </th>
+                <th class="listheading" nowrap width="10">[%- 'Extended'     | $T8 %] </th>
+              </tr>
+            </thead>
+
+            <tbody>
+              [%- FOREACH item = SELF.order.items_sorted %]
+                [%- PROCESS order/tabs/_row.html ITEM=item %]
+              [%- END %]
+            </tbody>
+
+          </table>
+        </div>
 
-    <tr>
+      </td>
     </tr>
 
     <tr>
-      <td>[%- L.button_tag('add_order_item_row()', LxERP.t8("Add Row")) -%]</td>
     </tr>
 
     <tr>
@@ -147,18 +147,18 @@
           [%- 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,47 +183,48 @@ 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();
-}
-
-function set_item_values(event) {
-  var cv_id = $('#order_[%- cv_id %]').val();
-  var parts_id = $(event.target).val();
-  var row = $(event.target).parents("tr").first();
 
-  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"]');
+  recalc_amounts_and_taxes()
+}
 
+function recalc_amounts_and_taxes() {
   var data = $('#order_form').serialize();
-  data += '&action=Order/set_item_values';
+  data += '&action=Order/recalc_amounts_and_taxes';
   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 display_linetotal(item_id, amount) {
   $('#item_' + item_id).parents("tr").first().find('[name="linetotal"]').html(amount);
 }
 
+function row_table_scroll_down() {
+  $('#row_table_scroll_id').scrollTop($('#row_table_scroll_id')[0].scrollHeight);
+}
 
 $(function(){
   $('#order_[%- cv_id %]').change(reload_cv_dependend_selections);
-  $('[id^="order_orderitems"][id$="parts_id"]').change(set_item_values);
+  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.sellprice, -2)) });
+  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_description').val(o.description) });
+  $('.add_item_input').keydown(function(event) {
+    if(event.keyCode == 13) {
+      event.preventDefault();
+      add_item();
+      return false;
+    }
+  });
 });
+
 </script>