diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php
index 12f7626..d18e8bd 100644
--- a/app/Http/Controllers/teamstore/TeamStoreController.php
+++ b/app/Http/Controllers/teamstore/TeamStoreController.php
@@ -78,7 +78,7 @@ class TeamStoreController extends Controller {
 												->with('thumbnails', $thumbnails);
 	}
 
-	public function storelist()
+	public function storelist(Request $request)
 	{
 		// $analyticsData = Analytics::getMostVisitedPages(14, 50);
 
@@ -100,10 +100,47 @@ class TeamStoreController extends Controller {
 		// var_dump(array_unique($arr_teamstore));
 
 		$m 		= new TeamStoreModel;
-		$stores_array 	= $m->selectAllTeamStore();
+		$q 		= null;
+		$sort	= null;
+		
+		$q = $request->input('q');
+		$sort = $request->input('s');
+      
+        if(isset($q) && isset($sort)){
+           
+			if($sort == "al-asc"){
+                $field = "StoreName";
+                $sort_value = "ASC";
+            }elseif($sort == "al-desc"){
+                $field = "StoreName";
+				$sort_value = "DESC";
+			}elseif($sort == "oldest"){
+				$field = "Id";
+                $sort_value = "ASC";
+            }else{
+                $field = "Id";
+                $sort_value = "DESC";
+            }
 
+            if($q != ""){
+                // keyword and sort
+                $stores_array 	= $m->selectTeamstoreSearch($field, $sort_value, $q);
+            }else{
+                // sort only
+                $stores_array 	= $m->selectTeamstoreFilter($field, $sort_value);
+            }
+
+        }else{
+            // first load
+            $stores_array 	= $m->selectAllTeamStore();
+        }
+		// $stores_array 	= $m->selectAllTeamStore();
+
+		// var_dump($stores_array);
 		return view('teamstore-sublayouts.stores')
-												->with('stores_array', $stores_array);
+												->with('stores_array', $stores_array)
+												->with('keyword', $q)
+                                            	->with('filter', $sort);
 	
 
 
@@ -467,17 +504,18 @@ class TeamStoreController extends Controller {
 	
 		$item_thumbs 	= $m->selectDisplayCartThumb();	
 		$store_array 	= $m->selectTeamStore('Id', $defId);
-		// var_dump($$grouped_item[0]->StoreId);
-		$voucherIds = array();
 		
-		foreach($items as $item){
-			if($item->VoucherId != null){
-				$voucherIds[] = $item->VoucherId;
-			}
-		}
 
-		$vouchers 	= $m->selectVoucherWhereIn($voucherIds);		
-		
+		if($items){
+			$voucherIds = array();
+			foreach($items as $item){
+				if($item->VoucherId != null){
+					$voucherIds[] = $item->VoucherId;
+				}
+			}
+			$vouchers 	= $m->selectVoucherWhereIn($voucherIds);		
+		}
+				
 		$totalValue = 0;
 		if(!empty($vouchers)){
 			foreach($vouchers as $voucher){
diff --git a/app/Models/teamstore/TeamStoreModel.php b/app/Models/teamstore/TeamStoreModel.php
index b2a8370..1587e49 100644
--- a/app/Models/teamstore/TeamStoreModel.php
+++ b/app/Models/teamstore/TeamStoreModel.php
@@ -9,7 +9,8 @@ class TeamStoreModel extends Model {
 	{
 		$i = DB::table('teamstores')
 						->where("IsActive", "true")
-						->get();
+						->orderBy('Id', 'DESC')
+						->paginate(16);
         return $i;
 	}
 
@@ -190,5 +191,24 @@ class TeamStoreModel extends Model {
 					->update($data);			
         return $i;
 	}
+
+	function selectTeamstoreSearch($field, $value, $keyword){
+
+		$i = DB::table('teamstores')
+								->where("StoreName", "LIKE","%$keyword%")
+								->where("IsActive", "true")
+								->orderby($field, $value)
+								->paginate(16);
+		return $i;
+	}
+
+	function selectTeamstoreFilter($field, $value){
+
+		$i = DB::table('teamstores')
+								->where("IsActive", "true")
+								->orderby($field, $value)
+								->paginate(16);
+		return $i;
+	}
 	
 }
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index 84dbb3c..79bca55 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -143,6 +143,12 @@
 
 			});
 
+			$(document).on('change', '#select_sort_stores', function(event) {
+				event.preventDefault();
+				$('#frm_search_store').submit();
+			});
+                
+
 		}); // end document ready
 
 		function submitLoginForm (){
diff --git a/resources/views/teamstore-sublayouts/stores.blade.php b/resources/views/teamstore-sublayouts/stores.blade.php
index 3564c52..4378644 100644
--- a/resources/views/teamstore-sublayouts/stores.blade.php
+++ b/resources/views/teamstore-sublayouts/stores.blade.php
@@ -35,8 +35,45 @@
 	<div class="row">
         <div class="col-lg-12">
             <h2 style="font-size: 20px; font-weight: bold; ">TEAM STORES</h2>
+            <hr>
         </div>
 	</div><!-- /row -->
+    <div class="row">
+        <!-- <div class="col-sm-12"> -->
+            <!-- <div class="well"> -->
+                <form class="form-horizontal" role="search" id="frm_search_store">
+                    <div class="col-lg-7">
+                        <div class="form-group">
+                            <div class="col-sm-12">
+                                <label>Seach Store</label>
+                                <div class="input-group">
+                                    <input type="text" class="form-control" placeholder="Search Store" value="{{ $keyword }}"  name="q">
+                                    <div class="input-group-btn">
+                                        <button class="btn btn-default" type="submit"><i class="glyphicon glyphicon-search"></i></button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-lg-5">
+                        <div class="form-group">
+                            <label  class="col-sm-7 control-label hidden-xs">&nbsp;</label>
+                            <div class="col-sm-5">
+                                <label>Sory by:</label>
+                                <select class="form-control" name="s" id="select_sort_stores">
+                                    <option  @if($filter == "latest") selected @endif  value="latest">Newest &rarr; Oldest</option>
+                                    <option  @if($filter == "oldest") selected @endif  value="oldest">Oldest &rarr; Newest</option>
+                                    <option  @if($filter == "al-asc") selected @endif  value="al-asc">Store Name A &rarr; Z</option>
+                                    <option  @if($filter == "al-desc") selected @endif  value="al-desc">Store Name Z &rarr; A</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+                <div class="clearfix"></div>
+            <!-- </div> -->
+        <!-- </div> -->
+    </div>
     <div class="row" id="slider-thumbs">
             <!-- Bottom switcher of slider -->
         <ul class="hide-bullets">
@@ -59,6 +96,13 @@
             @endforeach 
         </ul>                 
     </div>
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="text-center">
+                {!! $stores_array->render() !!}
+            </div>
+        </div>
+    </div>
 </div><!-- /container -->