Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
V-3041 CHG account addresses to handle modals (#12681)
brozeke39dc1893675
diff --git a/storefront/app/controllers/spree/addresses_controller.rb b/storefront/app/controllers/spree/addresses_controller.rbindex 07fb0d601c..37d4615f38 100644--- a/storefront/app/controllers/spree/addresses_controller.rb+++ b/storefront/app/controllers/spree/addresses_controller.rb@@ -26,6 +26,8 @@ module Spreeelseredirect_to spree.account_addresses_path, notice: Spree.t('address_book.successfully_created')end+ elsif params[:from_modal].present?+ render turbo_stream: turbo_stream.update(:new_address_modal, partial: 'spree/account/addresses/new_address_modal', locals: { address: @address }), status: :unprocessable_entityelserender action: 'new', status: :unprocessable_entityend@@ -69,6 +71,8 @@ module Spreeelseredirect_back_or_default(spree.account_addresses_path)end+ elsif params[:from_modal].present?+ render turbo_stream: turbo_stream.update("edit_address_modal_#{@address.id}", partial: 'spree/account/addresses/edit_address_modal', locals: { address: @address }), status: :unprocessable_entityelserender :edit, status: :unprocessable_entityenddiff --git a/storefront/app/views/spree/addresses/edit.html.erb b/storefront/app/views/spree/addresses/edit.html.erbindex 8f04057c82..c58444be66 100644--- a/storefront/app/views/spree/addresses/edit.html.erb+++ b/storefront/app/views/spree/addresses/edit.html.erb@@ -15,6 +15,10 @@</div><% end %><% end %>+<% elsif turbo_frame_request? %>+ <%= turbo_frame_tag "edit_address_modal_#{@address.id}" do %>+ <%= render partial: 'spree/account/addresses/edit_address_modal', locals: { address: @address } %>+ <% end %><% else %><div class="page-container grid grid-cols-1 lg:grid-cols-12 lg:gap-6 lg:mt-6"><div class="lg:col-span-2">diff --git a/storefront/app/views/spree/addresses/new.html.erb b/storefront/app/views/spree/addresses/new.html.erbindex 7f0bda8851..31c2f7ee99 100644--- a/storefront/app/views/spree/addresses/new.html.erb+++ b/storefront/app/views/spree/addresses/new.html.erb@@ -15,6 +15,9 @@<% end %></div><% end %>+ <%= turbo_frame_tag :new_address_modal do %>+ <%= render partial: 'spree/account/addresses/new_address_modal', locals: { address: @address } %>+ <% end %><% else %><% if params[:checkout].present? %><div class="card-dialog mx-auto lg:w-1/3">diff --git a/storefront/app/views/themes/default/spree/account/addresses/_address.html.erb b/storefront/app/views/themes/default/spree/account/addresses/_address.html.erbindex 95406079fd..be7b99258e 100644--- a/storefront/app/views/themes/default/spree/account/addresses/_address.html.erb+++ b/storefront/app/views/themes/default/spree/account/addresses/_address.html.erb@@ -1,10 +1,20 @@<li class="p-4 my-4 border border-accent lg:flex justify-between relative" id="<%= dom_id(address) %>"><%= render 'spree/shared/address', address: address %><div class="flex gap-6 h-6 lg:h-10 mt-6 lg:mt-0">- <%= link_to spree.edit_address_path(address), class: 'flex gap-2 lg:p-2' do %>- <%= render 'spree/shared/icons/edit' %>- <span class="uppercase text-sm font-semibold tracking-widest"><%= Spree.t(:edit_address) %></span>- <% end %>+ <div data-controller="modal" data-modal-allow-background-close="true">+ <%= button_tag type: "button", class: 'flex gap-2 lg:p-2', data: { action: "click->modal#open" } do %>+ <%= render 'spree/shared/icons/edit' %>+ <span class="uppercase text-sm font-semibold tracking-widest"><%= Spree.t(:edit) %></span>+ <% end %>+ <%= turbo_frame_tag "edit_address_modal_#{address.id}",+ src: spree.edit_address_path(address),+ loading: :lazy,+ data: {+ modal_target: "container",+ action: "click->modal#closeBackground keyup@window->modal#closeWithKeyboard"+ },+ class: "hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center z-[9999]" %>+ </div><divdata-controller="modal"data-modal-allow-background-close="true"diff --git a/storefront/app/views/themes/default/spree/account/addresses/_edit_address_modal.html.erb b/storefront/app/views/themes/default/spree/account/addresses/_edit_address_modal.html.erbnew file mode 100644index 0000000000..b8b7c596ac--- /dev/null+++ b/storefront/app/views/themes/default/spree/account/addresses/_edit_address_modal.html.erb@@ -0,0 +1,38 @@+<div class="bg-white h-[90vh] lg:h-[70vh] w-full lg:w-1/3 flex flex-col overflow-hidden">+ <%= form_for @address, method: :put, html: { class: "flex flex-col h-full", data: { turbo_frame: "_top" } } do |f| %>+ <div class="px-8 py-6 border-b shrink-0">+ <div class="flex justify-between items-center">+ <h3 class="text-xl lg:text-2xl font-medium lg:font-semibold capitalize">+ <%= Spree.t(:edit_address) %>+ </h3>+ <button data-action="click->modal#close" class="ml-4">+ <%= render 'spree/shared/icons/close' %>+ <span class="sr-only"><%= Spree.t(:close) %></span>+ </button>+ </div>+ <%= render 'spree/shared/error_messages', target: @address, class: 'alert-error text-center mt-4 p-2' %>+ </div>+ <div class="overflow-y-auto px-8 py-2 grow">+ <div class="py-4 text-left">+ <%= render 'spree/addresses/form',+ address_name: 'address',+ address_form: f,+ address_type: 'shipping',+ address: @address %>+ </div>+ <%= label_tag "default_shipping", class: "flex items-center gap-2 text-sm mb-4" do %>+ <%= check_box_tag "default_shipping", "true", @address.user_default_shipping?, class: 'input-checkbox input-address-default', disabled: @address.user_default_shipping? %>+ <%= Spree.t('address_book.set_as_default_delivery_address') %>+ <% end %>+ <%= label_tag "default_billing", class: "flex items-center gap-2 text-sm mb-4" do %>+ <%= check_box_tag "default_billing", "true", @address.user_default_billing?, class: 'input-checkbox input-address-default', disabled: @address.user_default_billing? %>+ <%= Spree.t('address_book.set_as_default_billing_address') %>+ <% end %>+ </div>+ <div class="border-t border-default px-8 py-4 flex justify-end gap-8 shrink-0">+ <%= button_tag Spree.t(:cancel), class: 'uppercase text-sm font-semibold', data: { action: 'click->modal#close' } %>+ <%= hidden_field_tag :from_modal, "true" %>+ <%= f.submit Spree.t(:update), class: 'btn-primary w-48' %>+ </div>+ <% end %>+</div>diff --git a/storefront/app/views/themes/default/spree/account/addresses/_new_address_modal.html.erb b/storefront/app/views/themes/default/spree/account/addresses/_new_address_modal.html.erbnew file mode 100644index 0000000000..43a4bdc7c3--- /dev/null+++ b/storefront/app/views/themes/default/spree/account/addresses/_new_address_modal.html.erb@@ -0,0 +1,38 @@+<div class="bg-white h-[90vh] lg:h-[70vh] w-full lg:w-1/3 flex flex-col overflow-hidden">+ <%= form_for @address, html: { class: "flex flex-col h-full", data: { turbo_frame: "_top" } } do |f| %>+ <div class="px-8 py-6 border-b shrink-0">+ <div class="flex justify-between items-center">+ <h3 class="text-xl lg:text-2xl font-medium lg:font-semibold capitalize">+ <%= Spree.t(:add_address) %>+ </h3>+ <button data-action="click->modal#close" class="ml-4">+ <%= render 'spree/shared/icons/close' %>+ <span class="sr-only"><%= Spree.t(:close) %></span>+ </button>+ </div>+ <%= render 'spree/shared/error_messages', target: @address, class: 'alert-error text-center mt-4 p-2' %>+ </div>+ <div class="overflow-y-auto px-8 py-2 grow">+ <div class="py-4 text-left">+ <%= render 'spree/addresses/form',+ address_name: 'address',+ address_form: f,+ address_type: 'shipping',+ address: @address %>+ </div>+ <%= label_tag "default_shipping", class: "flex items-center gap-2 text-sm mb-4" do %>+ <%= check_box_tag "default_shipping", "true", true, class: 'input-checkbox' %>+ <%= Spree.t('address_book.set_as_default_delivery_address') %>+ <% end %>+ <%= label_tag "default_billing", class: "flex items-center gap-2 text-sm mb-4" do %>+ <%= check_box_tag "default_billing", "true", true, class: 'input-checkbox' %>+ <%= Spree.t('address_book.set_as_default_billing_address') %>+ <% end %>+ </div>+ <div class="border-t border-default px-8 py-4 flex justify-end gap-8 shrink-0">+ <%= button_tag Spree.t(:cancel), class: 'uppercase text-sm font-semibold', data: { action: 'click->modal#close' } %>+ <%= hidden_field_tag :from_modal, "true" %>+ <%= f.submit Spree.t(:add), class: 'btn-primary w-48' %>+ </div>+ <% end %>+</div>diff --git a/storefront/app/views/themes/default/spree/account/addresses/index.html.erb b/storefront/app/views/themes/default/spree/account/addresses/index.html.erbindex 5f38ff52a6..5d0bd26257 100644--- a/storefront/app/views/themes/default/spree/account/addresses/index.html.erb+++ b/storefront/app/views/themes/default/spree/account/addresses/index.html.erb@@ -12,14 +12,34 @@<%= render partial: 'spree/account/addresses/address', collection: @addresses, cached: ->a {[*spree_base_cache_scope.call(a), try_spree_current_user.ship_address_id, try_spree_current_user.bill_address_id]}, as: :address %></ul><div class="flex">- <%= link_to Spree.t(:add_address), spree.new_address_path, class: 'btn-primary block w-full lg:w-auto' %>+ <div data-controller="modal" data-modal-allow-background-close="true">+ <%= button_tag Spree.t(:add), type: "button", class: "btn-primary block w-full lg:w-auto", data: { action: "click->modal#open" } %>+ <%= turbo_frame_tag :new_address_modal,+ src: spree.new_address_path,+ loading: :lazy,+ data: {+ modal_target: "container",+ action: "click->modal#closeBackground keyup@window->modal#closeWithKeyboard"+ },+ class: "hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center z-[9999]" %>+ </div></div><% else %><div class="text-center py-6"><p class="mb-2 font-medium uppercase"><%= Spree.t('storefront.account.no_addresses_title') %></p><p><%= Spree.t('storefront.account.no_addresses_description') %></p><div class="flex mt-8 justify-center">- <%= link_to Spree.t(:add), spree.new_address_path, class: 'btn-primary block' %>+ <div data-controller="modal" data-modal-allow-background-close="true">+ <%= button_tag Spree.t(:add), type: "button", class: "btn-primary block", data: { action: "click->modal#open" } %>+ <%= turbo_frame_tag :new_address_modal,+ src: spree.new_address_path,+ loading: :lazy,+ data: {+ modal_target: "container",+ action: "click->modal#closeBackground keyup@window->modal#closeWithKeyboard"+ },+ class: "hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center z-[9999]" %>+ </div></div></div><% end %>diff --git a/storefront/app/views/themes/default/spree/shared/_error_messages.html.erb b/storefront/app/views/themes/default/spree/shared/_error_messages.html.erbindex 58e8bb0d42..6380588d61 100644--- a/storefront/app/views/themes/default/spree/shared/_error_messages.html.erb+++ b/storefront/app/views/themes/default/spree/shared/_error_messages.html.erb@@ -1,5 +1,5 @@<% if target && target.errors.any? %>- <div id="errorExplanation" class="alert-error text-center mb-4 p-2">+ <div id="errorExplanation" class="<%= local_assigns[:class] || 'alert-error text-center mb-4 p-2' %>"><ul><% target.errors.full_messages.each do |msg| %><li><%= msg %></li>diff --git a/storefront/spec/controllers/spree/addresses_controller_spec.rb b/storefront/spec/controllers/spree/addresses_controller_spec.rbindex 10548a5ce6..c74b2f8812 100644--- a/storefront/spec/controllers/spree/addresses_controller_spec.rb+++ b/storefront/spec/controllers/spree/addresses_controller_spec.rb@@ -20,9 +20,9 @@ describe Spree::AddressesController, type: :controller doenddescribe '#create' do- subject :post_create do- post :create, params: { address: address_params, default_billing: default_billing, default_shipping: default_shipping }- end+ subject(:post_create) { post :create, params: params }++ let(:params) { { address: address_params, default_billing: default_billing, default_shipping: default_shipping } }context 'when data is valid' dolet(:address_params) do@@ -100,13 +100,24 @@ describe Spree::AddressesController, type: :controller doit 'renders address form template' doexpect(post_create).to render_template(:new)end++ context 'and new_address_modal frame request' do+ let(:params) { { address: address_params, default_billing: default_billing, default_shipping: default_shipping, from_modal: 'true' } }++ before { post_create }++ it 'responds with Turbo Stream and sets a unprocessable_entity status' do+ expect(response.status).to eq(422)+ expect(response.media_type).to eq("text/vnd.turbo-stream.html")+ end+ endendenddescribe '#update' do- subject :put_update do- put :update, params: { address: address_params, id: address.id }- end+ subject(:put_update) { put :update, params: params }++ let(:params) { { address: address_params, id: address.id } }before { controller.instance_variable_set(:@address, address) }@@ -153,6 +164,17 @@ describe Spree::AddressesController, type: :controller doit 'renders address form template' doexpect(put_update).to render_template(:edit)end++ context 'and edit_address_modal frame request' do+ let(:params) { { address: address_params, id: address.id, from_modal: 'true' } }++ before { put_update }++ it 'responds with Turbo Stream and sets a unprocessable_entity status' do+ expect(response.status).to eq(422)+ expect(response.media_type).to eq("text/vnd.turbo-stream.html")+ end+ endendend