Compare commits
No commits in common. 'e227eff66aae95407e5e846e26d232586d960cc1' and 'fbcad0e5b034115d6f215fa681d963862eeabae8' have entirely different histories.
e227eff66a
...
fbcad0e5b0
61 changed files with 866 additions and 1176 deletions
@ -1,13 +1,9 @@
|
||||
<%= govuk_header( |
||||
classes: "app-header", |
||||
classes: "app-header app-header--orange", |
||||
homepage_url: Rails.application.routes.url_helpers.root_path, |
||||
) %> |
||||
|
||||
<%= govuk_service_navigation( |
||||
service_name: t("service_name"), |
||||
service_url: Rails.application.routes.url_helpers.root_path, |
||||
classes: "app-main-service-navigation app-service-navigation--orange", |
||||
) do |component| %> |
||||
<%= component.with_navigation_item(text: "Your account", href: Rails.application.routes.url_helpers.account_path) %> |
||||
<%= component.with_navigation_item(text: "Sign out", href: Rails.application.routes.url_helpers.destroy_user_session_path) %> |
||||
<% end %> |
||||
navigation_classes: "govuk-header__navigation--end", |
||||
) do |component| |
||||
component.with_product_name(name: t("service_name")) |
||||
component.with_navigation_item(text: "Your account", href: Rails.application.routes.url_helpers.account_path) |
||||
component.with_navigation_item(text: "Sign out", href: Rails.application.routes.url_helpers.destroy_user_session_path) |
||||
end %> |
||||
|
||||
@ -1,15 +1,13 @@
|
||||
desc "We tightened the validation between initial purchase date in 2026, last transaction date and sale date so the two can no longer be equal. To avoid invalid logs we clear initialpurchase if it equals saledate and if initialpurchase = lasttransaction we clear both" |
||||
desc "We tightened the validation in 2026 between initial purchase date, last transaction date and sale date so that no two can be equal and initial purchase date < last transaction date < sale date. To avoid invalid logs we clear lasttransaction if it equals saledate and if initialpurchase = lasttransaction we clear both" |
||||
task fix_sales_logs_with_invalid_initialpurchase_lasttransaction: :environment do |
||||
initial_purchase_equal_lasttransaction_logs = SalesLog.filter_by_year_or_later(2026).where("initialpurchase = lasttransaction") |
||||
lasttransaction_equal_saledate_logs = SalesLog.filter_by_year_or_later(2026).where("lasttransaction = saledate") |
||||
initial_purchase_equal_lasttransaction_logs = SalesLog.filter_by_year_or_later(2026).where("initialpurchase = lasttransaction") |
||||
|
||||
# this one must happen first since this will always result in a log that passes date validations |
||||
puts "Updating #{initial_purchase_equal_lasttransaction_logs.count} logs where initialpurchase = lasttransaction, #{initial_purchase_equal_lasttransaction_logs.map(&:id)}" |
||||
initial_purchase_equal_lasttransaction_logs.update!(initialpurchase: nil, lasttransaction: nil) |
||||
|
||||
# this one could fail if lasttransaction == saledate == initialpurchase, but the above case will have already reset these logs |
||||
puts "Updating #{lasttransaction_equal_saledate_logs.count} logs where lasttransaction = saledate, #{lasttransaction_equal_saledate_logs.map(&:id)}" |
||||
lasttransaction_equal_saledate_logs.update!(lasttransaction: nil) |
||||
|
||||
puts "Updating #{initial_purchase_equal_lasttransaction_logs.count} logs where initialpurchase = lasttransaction, #{initial_purchase_equal_lasttransaction_logs.map(&:id)}" |
||||
initial_purchase_equal_lasttransaction_logs.update!(initialpurchase: nil, lasttransaction: nil) |
||||
|
||||
puts "Done" |
||||
end |
||||
|
||||
Loading…
Reference in new issue