From 502b13e79341b0b7abb92f1e4c3ef0d43060cd6c Mon Sep 17 00:00:00 2001
From: Frank John Begornia <frank.begornia@yahoo.com>
Date: Sat, 24 Aug 2019 15:59:33 +0800
Subject: [PATCH] change sort order

---
 .../teamstore/TeamStoreController.php         | 32 +++++++++----------
 .../teamstore-sublayouts/stores.blade.php     |  4 +--
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php
index d18e8bd..7f583dc 100644
--- a/app/Http/Controllers/teamstore/TeamStoreController.php
+++ b/app/Http/Controllers/teamstore/TeamStoreController.php
@@ -100,17 +100,15 @@ class TeamStoreController extends Controller {
 		// var_dump(array_unique($arr_teamstore));
 
 		$m 		= new TeamStoreModel;
-		$q 		= null;
-		$sort	= null;
-		
-		$q = $request->input('q');
-		$sort = $request->input('s');
+
+		$q 		= $request->input('q');
+		$sort 	= $request->input('s');
       
         if(isset($q) && isset($sort)){
            
-			if($sort == "al-asc"){
-                $field = "StoreName";
-                $sort_value = "ASC";
+			if($sort == "latest"){
+				$field = "Id";
+                $sort_value = "DESC";
             }elseif($sort == "al-desc"){
                 $field = "StoreName";
 				$sort_value = "DESC";
@@ -118,10 +116,10 @@ class TeamStoreController extends Controller {
 				$field = "Id";
                 $sort_value = "ASC";
             }else{
-                $field = "Id";
-                $sort_value = "DESC";
+				$field = "StoreName";
+				$sort_value = "ASC";
             }
-
+			
             if($q != ""){
                 // keyword and sort
                 $stores_array 	= $m->selectTeamstoreSearch($field, $sort_value, $q);
@@ -131,12 +129,12 @@ class TeamStoreController extends Controller {
             }
 
         }else{
-            // first load
-            $stores_array 	= $m->selectAllTeamStore();
-        }
-		// $stores_array 	= $m->selectAllTeamStore();
-
-		// var_dump($stores_array);
+			$field = "StoreName";
+			$sort_value = "ASC";
+			$sort = "al-asc";
+			$stores_array 	= $m->selectTeamstoreFilter($field, $sort_value);
+		}
+		
 		return view('teamstore-sublayouts.stores')
 												->with('stores_array', $stores_array)
 												->with('keyword', $q)
diff --git a/resources/views/teamstore-sublayouts/stores.blade.php b/resources/views/teamstore-sublayouts/stores.blade.php
index 4378644..7a333f9 100644
--- a/resources/views/teamstore-sublayouts/stores.blade.php
+++ b/resources/views/teamstore-sublayouts/stores.blade.php
@@ -61,10 +61,10 @@
                             <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>
+                                    <option  @if($filter == "latest") selected @endif  value="latest">Newest &rarr; Oldest</option>
+                                    <option  @if($filter == "oldest") selected @endif  value="oldest">Oldest &rarr; Newest</option>
                                 </select>
                             </div>
                         </div>