From e09ebcaff9cf1e59071e517db7be6ac2050b0c36 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Wed, 20 Apr 2016 17:59:12 +0200
Subject: [PATCH] Filters in items module working and on one line (#293)

---
 application/controllers/Items.php  |  3 ++-
 application/views/items/manage.php | 27 +++++++++++++++------------
 css/ospos.css                      |  5 +++++
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/application/controllers/Items.php b/application/controllers/Items.php
index 78e975771..a41c6f740 100644
--- a/application/controllers/Items.php
+++ b/application/controllers/Items.php
@@ -54,7 +54,8 @@ class Items extends Secure_area implements iData_controller
 						'is_deleted' => FALSE);
 		
 		// check if any filter is set in the multiselect dropdown
-		$filters = array_merge($filters, $this->input->get('filters'));
+		$filledup = array_fill_keys($this->input->get('filters'), true);
+		$filters = array_merge($filters, $filledup);
 
 		$items = $this->Item->search($search, $filters, $offset, $limit);
 		$total_rows = $this->Item->get_found_rows($search, $filters);
diff --git a/application/views/items/manage.php b/application/views/items/manage.php
index 0ec095042..84a012e90 100644
--- a/application/views/items/manage.php
+++ b/application/views/items/manage.php
@@ -38,7 +38,7 @@ $(document).ready(function()
         return $.extend(arguments[0], {
             start_date: start_date,
             end_date: end_date,
-            filters: $("#filters").val() || []
+            filters: $("#filters").val() || [""]
         });
     });
     table_support.init_delete('<?php echo $this->lang->line($controller_name."_confirm_delete")?>');
@@ -94,19 +94,22 @@ function post_bulk_form_submit(response)
         <button id="generate_barcodes" class="btn btn-default btn-sm" data-href='<?php echo site_url($controller_name."/generate_barcodes"); ?>' title='<?php echo $this->lang->line('items_generate_barcodes');?>'>
             <span class="glyphicon glyphicon-barcode"></span>
             <?php echo $this->lang->line("items_generate_barcodes");?></button>
-    </div>
-    <div class="pull-right btn-toolbar">
-        <div>
+        <div class="col-xs-4">
             <?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?>
         </div>
-
-        <?php echo form_multiselect('filters[]', $filters, '', array('id'=>'filters', 'class'=>'selectpicker show-menu-arrow', 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
-        <?php
-        if (count($stock_locations) > 1)
-        {
-            echo form_dropdown('stock_location', $stock_locations, $stock_location, array('id'=>'stock_location', 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit'));
-        }
-        ?>
+        <div class="col-xs-2" style="vertical-align: none;">
+            <?php echo form_multiselect('filters[]', $filters, '', array('id'=>'filters', 'class'=>'selectpicker show-menu-arrow', 'data-selected-text-format'=>'count > 1', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+        </div>
+            <?php
+            if (count($stock_locations) > 1)
+            {
+                ?>
+                <div class="col-xs-2">
+                <?php echo form_dropdown('stock_location', $stock_locations, $stock_location, array('id'=>'stock_location', 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
+                </div>
+                <?php
+            }
+            ?>
     </div>
 </div>
 
diff --git a/css/ospos.css b/css/ospos.css
index 3a4d08f48..3ebf4495e 100644
--- a/css/ospos.css
+++ b/css/ospos.css
@@ -142,6 +142,11 @@ a.rollover img
 	padding: 3px;	
 }
 
+#filters.btn-group
+{
+	vertical-align: none;
+}
+
 button.btn.dropdown-toggle.btn-sm
 {
 	background-color: white;