Skip to content

Commit 917d567

Browse files
committed
Use new ui/forms/address component
1 parent c27e3ec commit 917d567

File tree

1 file changed

+6
-56
lines changed

1 file changed

+6
-56
lines changed

admin/app/components/solidus_admin/orders/show/component.html.erb

Lines changed: 6 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<%= render component("ui/forms/field").text_field(f, :email) %>
2020

2121
<div class="w-full flex items-center mb-4 border-b pb-4">
22-
<%#= render component('ui/forms/checkbox').new(
22+
<%= render component('ui/forms/checkbox').new(
2323
id: "#{form_id}--guest-checkout",
2424
name: "#{f.object_name}[guest_checkout]",
2525
checked: f.object.user_id.nil?,
@@ -28,66 +28,16 @@
2828
</div>
2929

3030
<h2 class="text-xl mb-4 font-semibold"><%= t(".shipping_address") %></h2>
31-
<div class="flex flex-wrap gap-4 border-b pb-4">
32-
<%= f.fields_for :ship_address do |ba_form| %>
33-
<%= render component("ui/forms/field").text_field(ba_form, :name) %>
34-
<%= render component("ui/forms/field").text_field(ba_form, :address1) %>
35-
<%= render component("ui/forms/field").text_field(ba_form, :address2) %>
36-
<div class="flex w-full space-x-4">
37-
<%= render component("ui/forms/field").text_field(ba_form, :city, class: "flex-1") %>
38-
<%= render component("ui/forms/field").text_field(ba_form, :zipcode, class: "flex-1") %>
39-
</div>
40-
41-
<%= render component("ui/forms/field").select(
42-
ba_form,
43-
:country_id,
44-
Spree::Country.all.map { |c| [c.name, c.id] },
45-
value: @order.ship_address.try(:country_id),
46-
"data-#{stimulus_id}-target": "country",
47-
"data-action": "change->#{stimulus_id}#loadStates"
48-
) %>
49-
50-
<%= render component("ui/forms/field").select(
51-
ba_form,
52-
:state_id,
53-
[],
54-
value: @order.ship_address.try(:state_id),
55-
"data-#{stimulus_id}-target": "state"
56-
) %>
57-
58-
<%= render component("ui/forms/field").text_field(ba_form, :phone) %>
31+
<div class="w-full flex gap-4 border-b pb-4">
32+
<%= f.fields_for :ship_address do |sa_form| %>
33+
<%= render component('ui/forms/address').new(form: sa_form, disabled: false) %>
5934
<% end %>
6035
</div>
6136

6237
<h2 class="text-xl mb-4 mt-4 font-semibold"><%= t(".billing_address") %></h2>
63-
<div class="flex flex-wrap gap-4">
38+
<div class="w-full flex gap-4">
6439
<%= f.fields_for :bill_address do |ba_form| %>
65-
<%= render component("ui/forms/field").text_field(ba_form, :name) %>
66-
<%= render component("ui/forms/field").text_field(ba_form, :address1) %>
67-
<%= render component("ui/forms/field").text_field(ba_form, :address2) %>
68-
<div class="flex w-full space-x-4">
69-
<%= render component("ui/forms/field").text_field(ba_form, :city, class: "flex-1") %>
70-
<%= render component("ui/forms/field").text_field(ba_form, :zipcode, class: "flex-1") %>
71-
</div>
72-
73-
<%= render component("ui/forms/field").select(
74-
ba_form,
75-
:country_id,
76-
Spree::Country.all.map { |c| [c.name, c.id] },
77-
value: @order.bill_address.try(:country_id),
78-
"data-#{stimulus_id}-target": "country",
79-
"data-action": "change->#{stimulus_id}#loadStates"
80-
) %>
81-
82-
<%= render component("ui/forms/field").select(
83-
ba_form,
84-
:state_id,
85-
[],
86-
value: @order.bill_address.try(:state_id),
87-
"data-#{stimulus_id}-target": "state"
88-
) %>
89-
90-
<%= render component("ui/forms/field").text_field(ba_form, :phone) %>
40+
<%= render component('ui/forms/address').new(form: ba_form, disabled: false) %>
9141
<% end %>
9242
</div>
9343
</div>

0 commit comments

Comments
 (0)