On #101: Fixes missing sorting

foodcoopsat · Oct 12, 2024 · 13e82ca · 13e82ca
1 parent 4df5ba5
commit 13e82ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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