From 2ff7e65d296b2d94775715bc566ae28843cee397 Mon Sep 17 00:00:00 2001
From: jack <jack@botahead.com>
Date: Wed, 11 Apr 2018 16:52:05 +0800
Subject: [PATCH] make shipping order descending order

---
 assets/modul-js/common/dashboard/dashboard.so.js | 2 +-
 modul/common/dashboard/dashboard.so.list.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/modul-js/common/dashboard/dashboard.so.js b/assets/modul-js/common/dashboard/dashboard.so.js
index 616596f..275969c 100755
--- a/assets/modul-js/common/dashboard/dashboard.so.js
+++ b/assets/modul-js/common/dashboard/dashboard.so.js
@@ -117,7 +117,7 @@ $(document).ready(function() {
 	            success: function(data, statusText, xhr) {
 					if (xhr.status === 200){
 						// alert 
-						alert('success');
+						alert('Canceled Order');
 						location.reload();
 					}
 					else if(xhr.status === 201){
diff --git a/modul/common/dashboard/dashboard.so.list.php b/modul/common/dashboard/dashboard.so.list.php
index 0517d95..5995aea 100755
--- a/modul/common/dashboard/dashboard.so.list.php
+++ b/modul/common/dashboard/dashboard.so.list.php
@@ -24,7 +24,7 @@ $requestData= $_REQUEST;
 
 	$data = $db->query($sql);
 	$totalFiltered = count($data);
-	$sql.=" ORDER BY ". $columns[$requestData['order'][0]['column']]."   ".$requestData['order'][0]['dir']."  LIMIT ".$requestData['start']." ,".$requestData['length']."   ";
+	$sql.=" ORDER BY so_id DESC,". $columns[$requestData['order'][0]['column']]."   ".$requestData['order'][0]['dir']."  LIMIT ".$requestData['start']." ,".$requestData['length']."   ";
 	$data = $db->query($sql);
 	$qweqwe = array();
 	foreach ($data as $key => $value) {