refactor price->value and 2 minor changes

Author: IlinDmitry

app/controllers/distributions_controller.rb

@@ -33,7 +33,7 @@ def index
                      .distributions
                      .includes(:partner, :storage_location, :line_items, :items)
                      .order(created_at: :desc)
-    @total_price_all_distributions = total_price(@distributions)
+    @total_value_all_distributions = total_value(@distributions)
   end
 
   def create
@@ -137,11 +137,11 @@ def distribution_params
     params.require(:distribution).permit(:comment, :agency_rep, :issued_at, :partner_id, :storage_location_id, line_items_attributes: %i(item_id quantity _destroy))
   end
 
-  def total_price(distributions)
-    total_price_all_distributions = 0
+  def total_value(distributions)
+    total_value_all_distributions = 0
     distributions.each do |distribution|
-      total_price_all_distributions += distribution.price_per_itemizable
+      total_value_all_distributions += distribution.value_per_itemizable
     end
-    total_price_all_distributions
+    total_value_all_distributions
   end
 end

app/controllers/items_controller.rb

@@ -53,7 +53,7 @@ def destroy
   private
 
   def item_params
-    params.require(:item).permit(:name, :category, :partner_key, :price)
+    params.require(:item).permit(:name, :category, :partner_key, :value)
   end
 
   def filter_params(parameters = nil)

app/helpers/items_helper.rb

@@ -1,9 +1,9 @@
 module ItemsHelper
-  def item_price(price, addition = '')
-    if price.zero?
+  def item_value(value, addition = '')
+    if value.zero?
       ''
     else
-      addition + number_to_currency(price, precision: price.round == price ? 0 : 2)
+      addition + ActionController::Base.helpers.number_to_currency(value, precision: value.round == value ? 0 : 2)
     end
   end
 end

app/models/concerns/itemizable.rb

@@ -72,12 +72,8 @@ def line_items_quantities
     end
   end
 
-  def price_per_itemizable
-    tp = 0
-    line_items.each do |line_item|
-      tp += line_item.item.price * line_item.quantity
-    end
-    tp
+  def value_per_itemizable
+    line_items.sum(&:value_per_line_item)
   end
 
   private

app/models/item.rb

@@ -11,7 +11,7 @@
 #  organization_id :integer
 #  active          :boolean          default(TRUE)
 #  partner_key     :string
-#  price           :decimal(5, 2)    default(0.0)
+#  value           :decimal(5, 2)    default(0.0)
 #
 
 class Item < ApplicationRecord
@@ -20,7 +20,7 @@ class Item < ApplicationRecord
   validates :name, uniqueness: { scope: :organization }
   validates :name, presence: true
   validates :organization, presence: true
-  validates :price, numericality: { greater_than_or_equal_to: 0 }
+  validates :value, numericality: { greater_than_or_equal_to: 0 }
 
   has_many :line_items, dependent: :destroy
   has_many :inventory_items, dependent: :destroy

app/models/line_item.rb

@@ -18,7 +18,7 @@ class LineItem < ApplicationRecord
   validates :item_id, presence: true
   validates :quantity, numericality: { other_than: 0, only_integer: true }
 
-  def price_per_line_item
-    item.price * quantity
+  def value_per_line_item
+    item.value * quantity
   end
 end

app/pdfs/distribution_pdf.rb

@@ -1,7 +1,6 @@
 class DistributionPdf
   include Prawn::View
   include ItemsHelper
-  include ActionView::Helpers::NumberHelper
 
   def initialize(organization, distribution)
     @distribution = distribution
@@ -11,11 +10,11 @@ def initialize(organization, distribution)
       text organization.address, align: :right
       text organization.email, align: :right
     end
-    data = [["Items Received", "Price/item", "Total price", "Quantity"]]
+    data = [["Items Received", "Value/item", "Total value", "Quantity"]]
     data += @distribution.line_items.sorted.map do |c|
-      [c.item.name, item_price(c.item.price), item_price(c.price_per_line_item), c.quantity]
+      [c.item.name, item_value(c.item.value), item_value(c.value_per_line_item), c.quantity]
     end
-    data += [["", "", "", ""], ["Total Items Received", "", item_price(@distribution.price_per_itemizable), @distribution.line_items.total]]
+    data += [["", "", "", ""], ["Total Items Received", "", item_value(@distribution.value_per_itemizable), @distribution.line_items.total]]
 
     move_down 55
 

app/queries/items_by_storage_collection_and_quantity_query.rb

@@ -14,7 +14,7 @@ def call
         @items_by_storage_collection_and_quantity[row.id] = {
           item_name: row.name,
           item_category: row.category,
-          item_price: row.price,
+          item_value: row.value,
           item_barcode_count: row.barcode_count
         }
       end

app/queries/items_by_storage_collection_query.rb

@@ -19,7 +19,7 @@ def call
                         items.category,
                         items.barcode_count,
                         items.partner_key,
-                        items.price,
+                        items.value,
                         storage_locations.name as storage_name,
                         storage_locations.id as storage_id,
                         sum(inventory_items.quantity) as quantity

app/views/distributions/_distribution_item_row.html.erb

@@ -1,6 +1,6 @@
 <tr>
   <td><%= distribution_item_row.quantity %></td>
-  <td><%= item_price(distribution_item_row.item.price) %></td>
-  <td><%= item_price(distribution_item_row.price_per_line_item) %></td>
+  <td><%= item_value(distribution_item_row.item.value) %></td>
+  <td><%= item_value(distribution_item_row.value_per_line_item) %></td>
   <td><%= distribution_item_row.item.name %></td>
 </tr>