From 8b0592f6bfab584f5a12ff5292954c57d3664250 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Wed, 26 Apr 2017 00:26:13 +0200
Subject: [PATCH] Fixed Order of Products / Category

---
 .../java/ms/warpzone/warppay/data/models/local/Category.java    | 2 +-
 .../java/ms/warpzone/warppay/data/models/local/Product.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Category.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Category.java
index 842816b..67a25b7 100644
--- a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Category.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Category.java
@@ -50,8 +50,8 @@ public class Category extends Model {
     public static List<Category> getAll() {
         return new Select()
                 .from(Category.class)
-                .orderBy("position")
                 .orderBy("name")
+                .orderBy("position")
                 .execute();
     }
 
diff --git a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Product.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Product.java
index 61c1616..8aea409 100644
--- a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Product.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/data/models/local/Product.java
@@ -131,8 +131,8 @@ public class Product extends Model {
         return new Select()
                 .from(Product.class)
                 .where("category = ?", category)
-                .orderBy("position")
                 .orderBy("name")
+                .orderBy("position")
                 .execute();
     }
 
-- 
GitLab