From 4be82a31ced886aa08c659fad553e7f9e353d94c Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 13 Jun 2019 20:26:53 +1000
Subject: [PATCH] Remove rows from order form

---
 .../order/order_wizard/select_parts.html      |  9 ++++++--
 .../order/order_wizard/select_pos.html        | 21 +++++++++----------
 InvenTree/static/script/inventree/order.js    | 11 ++++++++++
 InvenTree/templates/base.html                 |  1 +
 4 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 InvenTree/static/script/inventree/order.js

diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html
index 602b88bfe7..755d4812bc 100644
--- a/InvenTree/order/templates/order/order_wizard/select_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/select_parts.html
@@ -25,7 +25,7 @@
     <table class='table table-condensed table-striped' id='order-wizard-part-table'>
         <tr>
             <th>Part</th>
-            <th>Supplier</th>
+            <th colspan='2'>Select Supplier</th>
             <th>Quantity</th>
             <th></th>
         </tr>
@@ -35,6 +35,11 @@
                 {% include "hover_image.html" with image=part.image hover=False %}
                 {{ part.full_name }} <small><i>{{ part.description }}</i></small>
             </td>
+            <td>
+                <button class='btn btn-default btn-create' id='new_supplier_part_{{ part.id }}' title='Create new supplier part for {{ part }}' type='button'>
+                    <span onClick='newSupplierPartFromWizard()' class='glyphicon glyphicon-small glyphicon-plus'></span>
+                </button>
+            </td>
             <td>
                 <div class='control-group'>
                     <div class='controls'>
@@ -59,7 +64,7 @@
             </td>
             <td>
                 <button class='btn btn-default btn-remove' id='del_item_{{ part.id }}' title='Remove part' type='button'>
-                    <span row='part_row_{{ part.id }}' onclick='removeOrderRow()' class='glyphicon glyphicon-small glyphicon-remove'></span>
+                    <span row='part_row_{{ part.id }}' onclick='removeOrderRowFromOrderWizard()' class='glyphicon glyphicon-small glyphicon-remove'></span>
                 </button>
             </td>
         </tr>
diff --git a/InvenTree/order/templates/order/order_wizard/select_pos.html b/InvenTree/order/templates/order/order_wizard/select_pos.html
index fdd6ff3e0b..bed01bbb5c 100644
--- a/InvenTree/order/templates/order/order_wizard/select_pos.html
+++ b/InvenTree/order/templates/order/order_wizard/select_pos.html
@@ -27,8 +27,7 @@
         <tr>
             <th>Supplier</th>
             <th>Items</th>
-            <th>Purchase Order</th>
-            <th></th>
+            <th colspan='2'>Select Purchase Order</th>
         </tr>
         {% for supplier in suppliers %}
         <tr id='suppier_row_{{ supplier.id }}'>
@@ -37,6 +36,15 @@
                 {{ supplier.name }}
             </td>
             <td>{{ supplier.order_items|length }}</td>
+            <td>
+                <button 
+                    class='btn btn-default btn-create'
+                    id='new_po_{{ supplier.id }}'
+                    title='Create new purchase order for {{ supplier.name }}'
+                    type='button'>
+                    <span onclick='newPurchaseOrderFromWizard()' class='glyphicon glyphicon-small glyphicon-plus'></span>
+                </button>
+            </td>
             <td>
                 <div class='control-group'>
                     <div class='controls'>
@@ -57,15 +65,6 @@
                     {% endif %}
                 </div>
             </td>
-            <td>
-                <button
-                    class='btn btn-default btn-create'
-                    id='new_po_{{ supplier.id }}'
-                    title='Create new purchase order for {{ supplier.name }}'
-                    type='button'>
-                    <span onclick='newPurchaseOrderFromWizard()' class='glyphicon glyphicon-small glyphicon-plus'></span>
-                </button>
-            </td>
         </tr>
         {% endfor %}
 
diff --git a/InvenTree/static/script/inventree/order.js b/InvenTree/static/script/inventree/order.js
new file mode 100644
index 0000000000..09e50fa4b6
--- /dev/null
+++ b/InvenTree/static/script/inventree/order.js
@@ -0,0 +1,11 @@
+function removeOrderRowFromOrderWizard(e) {
+    /* Remove a part selection from an order form. */
+
+    e = e || window.event;
+
+    var src = e.target || e.srcElement;
+
+    var row = $(src).attr('row');
+
+    $('#' + row).remove();
+}
\ No newline at end of file
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index cc58d27197..43a9e7678b 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -99,6 +99,7 @@ InvenTree
 <script type='text/javascript' src="{% static 'script/inventree/api.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/inventree/tables.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/inventree/modals.js' %}"></script>
+<script type='text/javascript' src="{% static 'script/inventree/order.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/inventree/notification.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/inventree/sidenav.js' %}"></script>
 {% block js_load %}