|
19 | 19 | <%= render component("ui/forms/field").text_field(f, :email) %>
|
20 | 20 |
|
21 | 21 | <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( |
23 | 23 | id: "#{form_id}--guest-checkout",
|
24 | 24 | name: "#{f.object_name}[guest_checkout]",
|
25 | 25 | checked: f.object.user_id.nil?,
|
|
28 | 28 | </div>
|
29 | 29 |
|
30 | 30 | <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) %> |
59 | 34 | <% end %>
|
60 | 35 | </div>
|
61 | 36 |
|
62 | 37 | <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"> |
64 | 39 | <%= 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) %> |
91 | 41 | <% end %>
|
92 | 42 | </div>
|
93 | 43 | </div>
|
|
0 commit comments