diff --git a/Gemfile.lock b/Gemfile.lock index 1b2aee3f8..6ebaf5675 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,12 +82,11 @@ GEM execjs (~> 2) awesome_print (1.9.2) aws-eventstream (1.3.0) - aws-partitions (1.893.0) - aws-sdk-core (3.191.2) + aws-partitions (1.894.0) + aws-sdk-core (3.191.3) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) - base64 jmespath (~> 1, >= 1.6.1) aws-sdk-kms (1.77.0) aws-sdk-core (~> 3, >= 3.191.0) @@ -230,7 +229,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) llhttp-ffi (0.5.0) @@ -279,7 +278,7 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - overcommit (0.62.0) + overcommit (0.63.0) childprocess (>= 0.6.3, < 6) iniparse (~> 1.4) rexml (~> 3.2) @@ -396,7 +395,7 @@ GEM rspec-expectations (~> 3.12) rspec-mocks (~> 3.12) rspec-support (~> 3.12) - rspec-support (3.13.0) + rspec-support (3.13.1) rubocop (1.60.2) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -428,12 +427,12 @@ GEM rubocop-factory_bot (~> 2.22) ruby-graphviz (1.2.5) rexml - ruby-lsp (0.14.1) + ruby-lsp (0.14.3) language_server-protocol (~> 3.17.0) prism (>= 0.22.0, < 0.25) sorbet-runtime (>= 0.5.10782) ruby-progressbar (1.13.0) - ruby-vips (2.2.0) + ruby-vips (2.2.1) ffi (~> 1.12) ruby2_keywords (0.0.5) ruby_parser (3.21.0) @@ -449,7 +448,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (4.17.0) + selenium-webdriver (4.18.1) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -470,7 +469,7 @@ GEM sitemap_generator (6.3.0) builder (~> 3.0) smart_properties (1.17.0) - sorbet-runtime (0.5.11262) + sorbet-runtime (0.5.11268) sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) @@ -480,7 +479,7 @@ GEM sprockets (>= 3.0.0) squasher (0.7.3) stackprof (0.2.26) - sterile (1.0.25) + sterile (1.0.26) nokogiri (>= 1.11.7) stimulus-rails (1.3.3) railties (>= 6.0.0) diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index ae3feedc0..ec15c484b 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -40,15 +40,6 @@ def library render "#{Current.theme}/pages/library" end - # TODO: Delete and all of its views and translation locale YAMLs - def post_order_success - @order_id = params[:ordernum] - @title = PageTitle.new title_for(I18n.t('page_titles.about.store')), - I18n.t('page_titles.about.post_order_success') - - render "#{Current.theme}/pages/post_order_success" - end - # TODO: make this view localizable def submission_guidelines @title = PageTitle.new I18n.t('page_titles.about.submission_guidelines') diff --git a/app/views/2017/pages/post_order_success.html.erb b/app/views/2017/pages/post_order_success.html.erb deleted file mode 100644 index d8d979628..000000000 --- a/app/views/2017/pages/post_order_success.html.erb +++ /dev/null @@ -1,38 +0,0 @@ -
-
-

Post-Order Glow

-

Thanks for your order!

-
- -
-
- -

Your payment has been authorized and you have been assigned order number <%= @order_id %>.

- -

You will shortly receive an email confirmation from us confirming your order.

- -

If you have spam filtering enabled, you might want to add store@crimethinc.com to your address book to make sure you receive the confirmation.

- -

If at any time you wish to check the status of your order, you can visit:

- -

https://www.buyolympia.com/OrderStatus?ordernum=<%= @order_id %>

- -

We bill your credit card when your order ships. If you've used a debit card, sometimes banks will put the money for your order "on hold" before we actually ship — this isn't anything we can control, and is at the discretion of your bank. If you see a charge on your statement before your order ships, that's most likely the cause.

- -

If you have any questions about your order, feel free to contact us at store@crimethinc.com.

- -

Thank you so much for your support!

- - - -
-
-
- -

Don't be alarmed! Styrofoam peanuts are pure evil, we agree.

- -

It's possible that your package may contain styrofoam packing peanuts (most likely with larger orders). Yes, we know the limitless evil of Styrofoam peanuts and we would never, ever buy them for packaging. All packing peanuts we use come from one of several local businesses who give us their used peanuts (from packages they receive full of them). By re-using them, of course, we are not contributing to any more being made, and also reduce the use of other packing material we'd need to use in their place—best to get them at least one more use before they head to the landfill.

- -
-
-
diff --git a/config/application.rb b/config/application.rb index 06eb09b0f..f57e48fdc 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,7 +28,7 @@ class Application < Rails::Application config.middleware.insert_after ActionDispatch::Static, Rack::Deflater # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.1 + config.load_defaults 7.0 # Please, add to the `ignore` list any other `lib` subdirectories that do # not contain `.rb` files, or that should not be reloaded or eager loaded. diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb deleted file mode 100644 index 558795132..000000000 --- a/config/initializers/new_framework_defaults_7_0.rb +++ /dev/null @@ -1,117 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file eases your Rails 7.0 framework defaults upgrade. -# -# Uncomment each configuration one by one to switch to the new default. -# Once your application is ready to run with all new defaults, you can remove -# this file and set the `config.load_defaults` to `7.0`. -# -# Read the Guide for Upgrading Ruby on Rails for more info on each option. -# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html - -# `button_to` view helper will render `