Resolve merge conflicts

Author: someykoku

Gemfile.lock

@@ -831,4 +831,4 @@ DEPENDENCIES
   webmock (~> 3.24)
 
 BUNDLED WITH
-   2.6.6
+   2.6.7

app/controllers/donations_controller.rb

@@ -49,7 +49,7 @@ def index
     respond_to do |format|
       format.html
       format.csv do
-        send_data Exports::ExportDonationsCSVService.new(donation_ids: @donations.map(&:id)).generate_csv, filename: "Donations-#{Time.zone.today}.csv"
+        send_data Exports::ExportDonationsCSVService.new(donation_ids: @donations.map(&:id), organization: current_organization).generate_csv, filename: "Donations-#{Time.zone.today}.csv"
       end
     end
   end

app/controllers/organizations_controller.rb

@@ -102,6 +102,7 @@ def organization_params
       :ytd_on_distribution_printout, :one_step_partner_invite,
       :hide_value_columns_on_receipt, :hide_package_column_on_receipt,
       :signature_for_distribution_pdf, :receive_email_on_requests,
+      :include_in_kind_values_in_exported_files,
       partner_form_fields: [],
       request_unit_names: []
     )

app/controllers/requests_controller.rb

@@ -42,6 +42,23 @@ def start
     redirect_to new_distribution_path(request_id: request.id)
   end
 
+  def print_picklist
+    request = current_organization
+      .requests
+      .includes(:item_requests, partner: [:profile])
+      .find(params[:id])
+
+    respond_to do |format|
+      format.any do
+        pdf = PicklistsPdf.new(current_organization, [request])
+        send_data pdf.compute_and_render,
+          filename: format("Picklists_%s.pdf", Time.current.to_fs(:long)),
+          type: "application/pdf",
+          disposition: "inline"
+      end
+    end
+  end
+
   def print_unfulfilled
     requests = current_organization
       .requests

app/helpers/items_helper.rb

@@ -12,7 +12,7 @@ def dollar_value(value)
   end
 
   def cents_to_dollar(value_in_cents)
-    value_in_cents.to_f / 100
+    Money.new(value_in_cents).to_f
   end
 
   def selected_item_request_units(item)

app/models/donation.rb

@@ -119,7 +119,7 @@ def storage_view
   end
 
   def in_kind_value_money
-    Money.new(value_per_itemizable)
+    Money.new(value_per_itemizable).to_f
   end
 
   private

app/models/organization.rb

@@ -2,6 +2,7 @@
 #
 # Table name: organizations
 #
+<<<<<<< HEAD
 #  id                             :integer          not null, primary key
 #  city                           :string
 #  deadline_day                   :integer
@@ -33,6 +34,41 @@
 #  updated_at                     :datetime         not null
 #  account_request_id             :integer
 #  ndbn_member_id                 :bigint
+=======
+#  id                                       :integer          not null, primary key
+#  city                                     :string
+#  deadline_day                             :integer
+#  default_storage_location                 :integer
+#  distribute_monthly                       :boolean          default(FALSE), not null
+#  email                                    :string
+#  enable_child_based_requests              :boolean          default(TRUE), not null
+#  enable_individual_requests               :boolean          default(TRUE), not null
+#  enable_quantity_based_requests           :boolean          default(TRUE), not null
+#  hide_package_column_on_receipt           :boolean          default(FALSE)
+#  hide_value_columns_on_receipt            :boolean          default(FALSE)
+#  include_in_kind_values_in_exported_files :boolean          default(FALSE), not null
+#  intake_location                          :integer
+#  invitation_text                          :text
+#  latitude                                 :float
+#  longitude                                :float
+#  name                                     :string
+#  one_step_partner_invite                  :boolean          default(FALSE), not null
+#  partner_form_fields                      :text             default([]), is an Array
+#  receive_email_on_requests                :boolean          default(FALSE), not null
+#  reminder_day                             :integer
+#  repackage_essentials                     :boolean          default(FALSE), not null
+#  short_name                               :string
+#  signature_for_distribution_pdf           :boolean          default(FALSE)
+#  state                                    :string
+#  street                                   :string
+#  url                                      :string
+#  ytd_on_distribution_printout             :boolean          default(TRUE), not null
+#  zipcode                                  :string
+#  created_at                               :datetime         not null
+#  updated_at                               :datetime         not null
+#  account_request_id                       :integer
+#  ndbn_member_id                           :bigint
+>>>>>>> origin/4977_add_ability_to_delete_unused_item_categories
 #
 
 class Organization < ApplicationRecord

app/pdfs/picklists_pdf.rb

@@ -1,3 +1,5 @@
+require "prawn/table"
+
 # Configures a Prawn PDF template for generating Distribution manifests
 class PicklistsPdf
   include Prawn::View

app/services/exports/export_distributions_csv_service.rb

@@ -136,22 +136,31 @@ def item_headers
       return @item_headers if @item_headers
 
       @item_headers = @organization.items.select("DISTINCT ON (LOWER(name)) items.name").order("LOWER(name) ASC").map(&:name)
+      @item_headers = @item_headers.flat_map { |header| [header, "#{header} In-Kind Value"] } if @organization.include_in_kind_values_in_exported_files
+
+      @item_headers
     end
 
     def build_row_data(distribution)
       row = base_table.values.map { |closure| closure.call(distribution) }
-
-      row += Array.new(item_headers.size, 0)
+      row += make_item_quantity_and_value_slots
 
       distribution.line_items.each do |line_item|
         item_name = line_item.item.name
         item_column_idx = headers_with_indexes[item_name]
         next unless item_column_idx
 
         row[item_column_idx] += line_item.quantity
+        row[item_column_idx + 1] += Money.new(line_item.value_per_line_item) if @organization.include_in_kind_values_in_exported_files
       end
 
       row
     end
+
+    def make_item_quantity_and_value_slots
+      slots = Array.new(item_headers.size, 0)
+      slots = slots.map.with_index { |value, index| index.odd? ? Money.new(0) : value } if @organization.include_in_kind_values_in_exported_files
+      slots
+    end
   end
 end

app/services/exports/export_donations_csv_service.rb

@@ -1,6 +1,6 @@
 module Exports
   class ExportDonationsCSVService
-    def initialize(donation_ids:)
+    def initialize(donation_ids:, organization:)
       # Use a where lookup so that I can eager load all the resources
       # needed rather than depending on external code to do it for me.
       # This makes this code more self contained and efficient!
@@ -13,6 +13,8 @@ def initialize(donation_ids:)
       ).where(
         id: donation_ids,
       ).order(created_at: :asc)
+
+      @organization = organization
     end
 
     def generate_csv
@@ -80,7 +82,7 @@ def base_table
         "Variety of Items" => ->(donation) {
           donation.line_items.map(&:name).uniq.size
         },
-        "In-Kind Value" => ->(donation) {
+        "In-Kind Total" => ->(donation) {
           donation.in_kind_value_money
         },
         "Comments" => ->(donation) {
@@ -105,20 +107,30 @@ def item_headers
       end
 
       @item_headers = item_names.sort
+
+      @item_headers = @item_headers.flat_map { |header| [header, "#{header} In-Kind Value"] } if @organization.include_in_kind_values_in_exported_files
+
+      @item_headers
     end
 
     def build_row_data(donation)
       row = base_table.values.map { |closure| closure.call(donation) }
-
-      row += Array.new(item_headers.size, 0)
+      row += make_item_quantity_and_value_slots
 
       donation.line_items.each do |line_item|
         item_name = line_item.item.name
         item_column_idx = headers_with_indexes[item_name]
         row[item_column_idx] += line_item.quantity
+        row[item_column_idx + 1] += Money.new(line_item.value_per_line_item) if @organization.include_in_kind_values_in_exported_files
       end
 
       row
     end
+
+    def make_item_quantity_and_value_slots
+      slots = Array.new(item_headers.size, 0)
+      slots = slots.map.with_index { |value, index| index.odd? ? Money.new(0) : value } if @organization.include_in_kind_values_in_exported_files
+      slots
+    end
   end
 end