Browse Source

update sales logs controller

pull/858/head
Kat 3 years ago
parent
commit
b99a40ac58
  1. 2
      app/controllers/organisations_controller.rb
  2. 16
      app/controllers/sales_logs_controller.rb
  3. 4
      spec/requests/sales_logs_controller_spec.rb

2
app/controllers/organisations_controller.rb

@ -139,7 +139,7 @@ class OrganisationsController < ApplicationController
end end
end end
private private
def org_params def org_params
params.require(:organisation).permit(:name, :address_line1, :address_line2, :postcode, :phone, :holds_own_stock, :provider_type, :housing_registration_no) params.require(:organisation).permit(:name, :address_line1, :address_line2, :postcode, :phone, :holds_own_stock, :provider_type, :housing_registration_no)

16
app/controllers/sales_logs_controller.rb

@ -1,25 +1,23 @@
class SalesLogsController < LogsController class SalesLogsController < LogsController
before_action :session_filters, if: :current_user
before_action :set_session_filters, if: :current_user
def create def create
super { SalesLog.new(log_params) } super { SalesLog.new(log_params) }
end end
def index def index
set_session_filters
all_logs = current_user.sales_logs
unpaginated_filtered_logs = filtered_logs(filtered_collection(all_logs, search_term))
respond_to do |format| respond_to do |format|
format.html do format.html do
all_logs = current_user.sales_logs
unpaginated_filtered_logs = filtered_logs(all_logs, search_term, @session_filters)
@search_term = search_term
@pagy, @logs = pagy(unpaginated_filtered_logs) @pagy, @logs = pagy(unpaginated_filtered_logs)
@searched = search_term.presence @searched = search_term.presence
@total_count = all_logs.size @total_count = all_logs.size
render "logs/index" render "logs/index"
end end
format.csv do
send_data byte_order_mark + unpaginated_filtered_logs.to_csv(current_user), filename: "logs-#{Time.zone.now}.csv"
end
end end
end end

4
spec/requests/sales_logs_controller_spec.rb

@ -355,10 +355,6 @@ RSpec.describe SalesLogsController, type: :request do
expect(page).to have_title("Logs - Submit social housing lettings and sales data (CORE) - GOV.UK") expect(page).to have_title("Logs - Submit social housing lettings and sales data (CORE) - GOV.UK")
end end
it "shows the download csv link" do
expect(page).to have_link("Download (CSV)", href: "/sales-logs.csv")
end
it "does not show the organisation filter" do it "does not show the organisation filter" do
expect(page).not_to have_field("organisation-field") expect(page).not_to have_field("organisation-field")
end end

Loading…
Cancel
Save