spree_storefront 5.1.0.beta2 → 5.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19206e7652c00c3c568c84ae06211d42a4fdabdba0fa298a18d46a0d615596eb
-  data.tar.gz: '087dc7b697bf1d964038de67822f36c3939155f5d944995846ebdd36d95ef946'
+  metadata.gz: c1dbc02737b8c05caa58fafb4584ef7c49e619654a1209e2f83c72c95f596961
+  data.tar.gz: e070440be4bb251b30a0b6d8f3d57f12cd50bd75e564966799eef441c9a3b4aa
 SHA512:
-  metadata.gz: 1de7ae9be59cd3bac1201867e7b4e4b056415d7c632242ba364d86b858d458e3b5e79226d0db4b83d2baa2f0208a2dbd28ba3481721f89b51982bf20124cb751
-  data.tar.gz: 3ffa2172bc13b5632b012c0f27f22b8a0669bfdfe711bbd440042dabecefa72c1c63aa71466aff380219e8de0dcd3004111b266a9564ac05a3785ed43bf43616
+  metadata.gz: 487843eb1f23fc955b6bc4d45b2a89112edf2d0cb68075f8714e0a1da197b3e2692dcc434859c3e59b53d4286b1af0da65ba532e016559930dcb90e20e7d08a5
+  data.tar.gz: e791a45a470fe19e42d9daea9ae3b7b5152dec22f65c4bdc2eeb141a2be7bca42b1f099777588de234e44e42fc2a7fc9be6ea6be46ee4034507630897ea9fc48

data/app/controllers/spree/addresses_controller.rb

@@ -1,7 +1,7 @@
 module Spree
   class AddressesController < Spree::StoreController
     helper Spree::AddressesHelper
-    load_and_authorize_resource class: Spree::Address
+    before_action :load_and_authorize_address, except: [:index]
 
     def create
       order_token = params[:order_token]
@@ -98,6 +98,18 @@ module Spree
       Spree::Dependencies.address_update_service.constantize
     end
 
+    def load_and_authorize_address
+      action = params[:action].to_sym
+
+      @address ||= if [:new, :create].include?(action)
+                    Spree::Address.new(country: current_store.default_country, user: try_spree_current_user)
+                  else
+                    Spree::Address.find(params[:id])
+                  end
+
+      authorize! action, @address
+    end
+
     def address_changes_except
       []
     end

data/app/views/spree/checkout/_address.html.erb

@@ -61,6 +61,9 @@
         <%= form.hidden_field :state_lock_version %>
         <%= form.hidden_field :ship_address_id, data: { 'checkout-address-book-target': 'addressId' } %>
       </div>
+
+      <%= render 'spree/checkout/special_instructions', form: form %>
+
       <div>
         <%= button_tag Spree.t(:save_and_continue),
                         data: {
@@ -140,6 +143,8 @@
         </div>
       </div>
 
+      <%= render 'spree/checkout/special_instructions', form: form %>
+
       <%= hidden_field_tag 'save_user_address', true, data: { hook: "save_user_address" } %>
     </div>
     <div class="flex justify-end w-full">

data/app/views/spree/checkout/_special_instructions.html.erb

@@ -0,0 +1,10 @@
+<% if current_store.prefers_special_instructions_enabled? %>
+  <div class="mt-8 mb-4">
+    <h5 class="font-body mb-3">
+      <%= I18n.t('activerecord.attributes.spree/order.special_instructions') %>
+    </h5>
+    <div class="form-group">
+      <%= form.text_area :special_instructions, class: 'w-full text-input', rows: 2, placeholder: Spree.t('storefront.checkout.special_instructions_placeholder') %>
+    </div>
+  </div>
+<% end %>

data/app/views/themes/default/spree/shared/_order_details.html.erb

@@ -24,6 +24,17 @@
   <%= render partial: 'spree/shared/order_shipment', collection: shipments, as: :shipment, cached: spree_base_cache_scope %>
 </ul>
 
+<% if order.special_instructions.present? %>
+  <div class="p-4 lg:p-6 text-sm border">
+    <div class="uppercase tracking-widest mb-1">
+      <%= I18n.t('activerecord.attributes.spree/order.special_instructions') %>
+    </div>
+    <div class="!leading-[1.375rem] text-neutral-800">
+      <%= simple_format(order.special_instructions) %>
+    </div>
+  </div>
+<% end %>
+
 <div class="mt-6 bg-accent mb-24">
   <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-6 p-4 lg:p-6 text-sm bg-border bg-accent-100">
     <!-- billing address -->

data/config/locales/en.yml

@@ -37,6 +37,7 @@ en:
         payment_processing_message: You will receive an email confirmation when your payment is processed.
         shipping_not_available: Shipping not available
         signup_for_an_account: Create an account for faster future purchases, order tracking, and more.
+        special_instructions_placeholder: Here you can add any special instructions for your order
         store_credits_amount_applied: You applied a %{amount} store credit to your order.
         thanks_for_your_order: Thanks %{name} for your order!
         you_will_need_to_pay_only: You will need to pay only %{amount} with your payment method of choosing.

data/lib/generators/spree/storefront/install/templates/application.tailwind.css

@@ -78,7 +78,7 @@ html {
 }
 
 textarea.text-input {
-  height: auto;
+  height: auto !important;
   min-height: 3rem;
   border-radius: 0;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_storefront
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta2
+  version: 5.1.0.beta3
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta2
+        version: 5.1.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta2
+        version: 5.1.0.beta3
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -319,6 +319,7 @@ files:
 - app/views/spree/checkout/_payment_sources.html.erb
 - app/views/spree/checkout/_quick_checkout.html.erb
 - app/views/spree/checkout/_sidebar.html.erb
+- app/views/spree/checkout/_special_instructions.html.erb
 - app/views/spree/checkout/_store_credit.html.erb
 - app/views/spree/checkout/_summary.html.erb
 - app/views/spree/checkout/_user_account.html.erb
@@ -549,9 +550,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta2
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta3
 post_install_message:
 rdoc_options: []
 require_paths: