Merge pull request #25 from Jellyfishboy/feature/stock-filter

Refactored to be more dry for soca asset.
Jellyfishboy · Jul 26, 2016 · 28e7a23 · 28e7a23
2 parents b4f7bdb + 54c7e4e
commit 28e7a23
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/app/assets/javascripts/trado.ready.js b/app/assets/javascripts/trado.ready.js
@@ -6,9 +6,11 @@ ready = function()
     soca.animation.colourCaveat();
     soca.animation.sidebarExtension();
 
-    soca.filter.tableRowTarget();
-    soca.filter.products();
-    soca.filter.orders();
+    soca.index.tableRowTarget();
+    soca.index.sort('#sort-product');
+    soca.index.filter('#filter-product-category');
+    soca.index.filter('#filter-stock');
+    soca.index.filter('#filter-order-delivery');
 
     soca.misc.taxField();
     soca.misc.multiSelect();

diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb
@@ -7,7 +7,7 @@
     <h2 class="widget widget-header">Orders</h2>
   </div>
   <div class="widget-controls">
-    <select class="form-select" id="filter-order">
+    <select class="form-select" id="filter-order-delivery">
       <option class="filter" data-filter="all">Show all</option>
       <option class="filter" data-filter=".order-dispatched">Dispatched</option>
       <option class="filter" data-filter=".order-pending">Pending</option>

diff --git a/app/views/admin/products/stock/index.html.erb b/app/views/admin/products/stock/index.html.erb
@@ -7,7 +7,7 @@
     <h2 class="widget widget-header">Stock management</h2>
   </div>
   <div class="widget-controls">
-    <select class="form-select" id="filter-order">
+    <select class="form-select" id="filter-stock">
       <option class="filter" data-filter="all">Show all</option>
       <option class="filter" data-filter=".stock-low">Low</option>
     </select>

diff --git a/vendor/assets/javascripts/admin/soca.js b/vendor/assets/javascripts/admin/soca.js