Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Zone editing without JS (#12320)

Damian Kaczmarczyk25f20a39702a
diff --git a/admin/app/controllers/spree/admin/zones_controller.rb b/admin/app/controllers/spree/admin/zones_controller.rb
index 62f7be47e6..167d04aa6b 100644
--- a/admin/app/controllers/spree/admin/zones_controller.rb
+++ b/admin/app/controllers/spree/admin/zones_controller.rb
@@ -9,6 +9,10 @@ module Spree
protected
+ def location_after_save
+ edit_object_url(@object, states_country_id: @selected_country&.id)
+ end
+
def collection
params[:q] ||= {}
params[:q][:s] ||= 'name asc'
@@ -17,8 +21,15 @@ module Spree
end
def load_data
+ @selected_country = if params[:states_country_id]
+ Spree::Country.find_by(id: params[:states_country_id])
+ elsif @zone && @zone.state? && @zone.zone_members.exists?
+ @zone.zone_members.first.zoneable.country
+ else
+ current_store.default_country
+ end
@countries = Country.order(:name)
- @states = State.order(:name)
+ @states = @selected_country&.states&.order(:name) || Spree::State.none
@zones = Zone.order(:name)
end
end
diff --git a/admin/app/views/spree/admin/zones/_form.html.erb b/admin/app/views/spree/admin/zones/_form.html.erb
index cdf876ecfb..44ef21db4b 100644
--- a/admin/app/views/spree/admin/zones/_form.html.erb
+++ b/admin/app/views/spree/admin/zones/_form.html.erb
@@ -28,13 +28,13 @@
<strong><%= Spree.t(:type) %></strong>
<div class="radio my-2">
<%= label_tag :country_based do %>
- <%= zone_form.radio_button('kind', 'country', { id: 'country_based' }) %>
+ <%= zone_form.radio_button :kind, :country, id: 'country_based', data: { action: 'auto-submit#submit' } %>
<%= Spree.t(:country_based) %>
<% end %>
</div>
<div class="radio my-2">
<%= label_tag :state_based do %>
- <%= zone_form.radio_button('kind', 'state', { id: 'state_based' }) %>
+ <%= zone_form.radio_button :kind, :state, id: 'state_based', data: { action: 'auto-submit#submit' } %>
<%= Spree.t(:state_based) %>
<% end %>
</div>
@@ -43,7 +43,10 @@
</div>
</div>
<div class="col-12 col-lg-6">
- <%= render partial: 'state_members', locals: { zone_form: zone_form } %>
- <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
+ <% if @zone.country? %>
+ <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
+ <% else %>
+ <%= render partial: 'state_members', locals: { zone_form: zone_form } %>
+ <% end %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/zones/_state_members.html.erb b/admin/app/views/spree/admin/zones/_state_members.html.erb
index 9404d1769a..da0d05155f 100644
--- a/admin/app/views/spree/admin/zones/_state_members.html.erb
+++ b/admin/app/views/spree/admin/zones/_state_members.html.erb
@@ -7,6 +7,11 @@
</div>
<div class="card-body">
+ <div class="form-group">
+ <%= label_tag :states_country_id, Spree.t(:country) %>
+ <%= tom_select_tag :states_country_id, class: 'w-100', options: Spree::Country.joins(:states).to_tom_select_json, active_option: @selected_country&.id, select_data: {action: "auto-submit#submit"} %>
+ </div>
+
<div class="form-group">
<%= zone_form.label :state_ids, Spree.t(:states) %>
<%= tom_select_tag 'zone[state_ids]', multiple: true, class: 'w-100', options: @states.to_tom_select_json, active_option: @zone.state_ids %>
diff --git a/admin/app/views/spree/admin/zones/edit.html.erb b/admin/app/views/spree/admin/zones/edit.html.erb
index 5c1fa1f0f3..609459b107 100644
--- a/admin/app/views/spree/admin/zones/edit.html.erb
+++ b/admin/app/views/spree/admin/zones/edit.html.erb
@@ -5,7 +5,7 @@
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>
-<%= form_for [:admin, @zone] do |f| %>
+<%= form_for [:admin, @zone], data: {controller: 'auto-submit'} do |f| %>
<%= render 'form', zone_form: f %>
<%= render 'spree/admin/shared/edit_resource_links', f: f %>
diff --git a/admin/app/views/spree/admin/zones/new.html.erb b/admin/app/views/spree/admin/zones/new.html.erb
index 937fc311f3..541f922e1a 100644
--- a/admin/app/views/spree/admin/zones/new.html.erb
+++ b/admin/app/views/spree/admin/zones/new.html.erb
@@ -5,7 +5,7 @@
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>
-<%= form_for [:admin, @zone] do |zone_form| %>
+<%= form_for [:admin, @zone], data: {controller: 'auto-submit'} do |zone_form| %>
<%= render partial: 'form', locals: { zone_form: zone_form } %>
<%= render 'spree/admin/shared/new_resource_links' %>
<% end %>