Merge branch 'master' of https://github.com/foodcoopsat/foodsoft_hack…

…athon

app/models/article.rb

@@ -49,6 +49,8 @@ class Article < ApplicationRecord
   #   @return [Array<Order>] Orders this article appears in.
   has_many :orders, through: :order_articles
 
+  has_many :article_unit_conversions
+
   # Replace numeric seperator with database format
   localize_input_of :price, :tax, :deposit
   # Get rid of unwanted whitespace. {Unit#new} may even bork on whitespace.
@@ -232,6 +234,15 @@ def mark_as_deleted
     update_column :deleted_at, Time.now
   end
 
+  def unit_quantity
+    first_conversion = article_unit_conversions.first
+    if first_conversion.nil?
+      '1'
+    else
+      first_conversion.amount
+    end
+  end
+
   protected
 
   # Checks if the article is in use before it will deleted

app/models/article_unit_conversion.rb

@@ -0,0 +1,3 @@
+class ArticleUnitConversion < ApplicationRecord
+  belongs_to :article
+end