add price_per quantity unit to group order new

app/models/article.rb

@@ -142,7 +142,14 @@ class Article < ApplicationRecord
       new_unit_quantity = new_article.unit_quantity
       new_unit = new_article.unit
     end
-
+    puts "
+    " + "______________" + "
+    " + "______________" + "
+    " + "_____oha_________" + "
+    " + "#{new_article.unit_symbol}" + "
+    " + "______________"+ "
+    " + "______________"+ "
+    " + "______________"
     return Article.compare_attributes(
       {
         :name => [self.name, new_article.name],
@@ -153,6 +160,7 @@ class Article < ApplicationRecord
         :tax => [self.tax, new_article.tax],
         :deposit => [self.deposit.to_f.round(2), new_article.deposit.to_f.round(2)],
         :price_per => [self.price_per.to_f.round(2), new_article.price_per.to_f.round(2)],
+        :unit_symbol => [self.unit_symbol, new_article.unit_symbol],
         # take care of different num-objects.
         :unit_quantity => [self.unit_quantity.to_s.to_f, new_unit_quantity.to_s.to_f],
         :note => [self.note.to_s, new_article.note.to_s]

app/models/concerns/price_calculation.rb

@@ -12,6 +12,14 @@ module PriceCalculation
     add_percent(gross_price, FoodsoftConfig[:price_markup])
   end
 
+  def fc_price_per
+    if price_per > 0
+      add_percent(add_percent(price_per, tax), FoodsoftConfig[:price_markup])
+    else
+      fc_price
+    end
+  end
+
   private
 
   def add_percent(value, percent)

app/models/group_order.rb

@@ -45,6 +45,8 @@ class GroupOrder < ApplicationRecord
         # Build hash with relevant data
         data[:order_articles][order_article.id] = {
           :price => order_article.article.fc_price,
+          :price_per => order_article.article.fc_price_per,
+          :unit_symbol => order_article.article.unit_symbol,
           :unit => order_article.article.unit_quantity,
           :quantity => (goa ? goa.quantity : 0),
           :others_quantity => order_article.quantity - (goa ? goa.quantity : 0),

app/models/supplier.rb

@@ -112,6 +112,7 @@ class Supplier < ApplicationRecord
     if options[:outlist_absent]
       outlisted_articles += articles.undeleted.where.not(order_number: all_order_numbers + [nil])
     end
+    # TODO: change price_per to scale factor
     return [updated_article_pairs, outlisted_articles, new_articles]
   end