diff --git a/langs/en/items.json b/langs/en/items.json
index 4e06df1..8089631 100644
--- a/langs/en/items.json
+++ b/langs/en/items.json
@@ -10,8 +10,6 @@
"itemid": "Item ID",
"id": "ID",
"Edit Item": "Edit Item",
- "Adding stock": "Adding stock",
"adding stock": "Adding stock for {item}",
- "Removing stock": "Removing stock",
"removing stock": "Removing stock from {item}"
}
diff --git a/lib/getitemtable.php b/lib/getitemtable.php
index ab3f296..ab1cf80 100644
--- a/lib/getitemtable.php
+++ b/lib/getitemtable.php
@@ -32,25 +32,25 @@ if ($VARS['order'][0]['dir'] == 'asc') {
$sortby = "ASC";
}
switch ($VARS['order'][0]['column']) {
- case 2:
+ case 1:
$order = ["name" => $sortby];
break;
- case 3:
+ case 2:
$order = ["catname" => $sortby];
break;
- case 4:
+ case 3:
$order = ["locname" => $sortby];
break;
- case 5:
+ case 4:
$order = ["code1" => $sortby];
break;
- case 6:
+ case 5:
$order = ["code2" => $sortby];
break;
- case 7:
+ case 6:
$order = ["qty" => $sortby];
break;
- case 8:
+ case 7:
$order = ["want" => $sortby];
break;
// Note: We're not going to sort by assigned user. It's too hard. Maybe later.
diff --git a/pages.php b/pages.php
index e4b8bcd..f11026d 100644
--- a/pages.php
+++ b/pages.php
@@ -24,19 +24,6 @@ define("PAGES", [
"static/js/items.js"
],
],
- "locations" => [
- "title" => "Locations",
- "navbar" => true,
- "icon" => "fas fa-map-marker",
- "styles" => [
- "static/css/datatables.min.css",
- "static/css/tables.css"
- ],
- "scripts" => [
- "static/js/datatables.min.js",
- "static/js/locations.js"
- ],
- ],
"categories" => [
"title" => "Categories",
"navbar" => true,
@@ -50,6 +37,19 @@ define("PAGES", [
"static/js/categories.js"
],
],
+ "locations" => [
+ "title" => "Locations",
+ "navbar" => true,
+ "icon" => "fas fa-map-marker",
+ "styles" => [
+ "static/css/datatables.min.css",
+ "static/css/tables.css"
+ ],
+ "scripts" => [
+ "static/js/datatables.min.js",
+ "static/js/locations.js"
+ ],
+ ],
"item" => [
"title" => "Item",
"navbar" => false
diff --git a/pages/categories.php b/pages/categories.php
index d76f598..d21df2b 100644
--- a/pages/categories.php
+++ b/pages/categories.php
@@ -14,9 +14,9 @@ redirectifnotloggedin();
- get('actions'); ?>
get('category'); ?>
get('item count'); ?>
+ get('actions'); ?>