From 13e82ca10a1a732b93c26db1877667b2695afeea Mon Sep 17 00:00:00 2001
From: Florian Lentsch <office@florian-lentsch.at>
Date: Sat, 12 Oct 2024 19:24:39 +0200
Subject: [PATCH] On #101: Fixes missing sorting

---
 app/models/article_unit_ratio.rb | 2 ++
 app/models/order.rb              | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/article_unit_ratio.rb b/app/models/article_unit_ratio.rb
index 69381b20..f90eb357 100644
--- a/app/models/article_unit_ratio.rb
+++ b/app/models/article_unit_ratio.rb
@@ -1,6 +1,8 @@
 class ArticleUnitRatio < ApplicationRecord
   belongs_to :article_version
 
+  default_scope { order(sort: :asc) }
+
   validates :quantity, :sort, :unit, presence: true
   validates :quantity, numericality: { greater_than: 0, less_than: 10**35 }
 end
diff --git a/app/models/order.rb b/app/models/order.rb
index def3d19d..2336e5f8 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -180,7 +180,7 @@ def articles_grouped_by_category
     @articles_grouped_by_category ||= order_articles
                                       .includes([:group_order_articles,
                                                  { article_version: %i[article_category article_unit_ratios] }])
-                                      .order('article_versions.name')
+                                      .order('article_versions.name', 'article_unit_ratios.sort')
                                       .group_by { |oa| oa.article_version.article_category.name }
                                       .sort { |a, b| a[0] <=> b[0] }
   end