Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display billing address to left of shipping address #3773

Merged
merged 1 commit into from
Sep 30, 2020
Merged

Display billing address to left of shipping address #3773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Display billing address to left of shipping address 
This makes the backend views consistent with the frontend.
Fixes #3771
  • Loading branch information
@brchristian
brchristian committed Sep 24, 2020
commit 5ea24e93199a9d5a752e4c20fa0a91359ab37a29
26 changes: 13 additions & 13 deletions backend/app/views/spree/admin/orders/customer_details/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,19 @@
</fieldset>

<div class="row">
<% if Spree::Config[:order_bill_address_used] %>
<div class="col-6" data-hook="bill_address_wrapper">
<fieldset class="no-border-bottom">
<legend align="center"><%= t('spree.billing_address') %></legend>
<div class="js-billing-address">
<%= f.fields_for :bill_address do |ba_form| %>
<%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
<% end %>
</div>
</fieldset>
</div>
<% end %>

<div class="col-6" data-hook="ship_address_wrapper">
<fieldset class="no-border-bottom">
<legend align="center"><%= t('spree.shipping_address') %></legend>
Expand All @@ -62,19 +75,6 @@
</div>
</fieldset>
</div>

<% if Spree::Config[:order_bill_address_used] %>
<div class="col-6" data-hook="bill_address_wrapper">
<fieldset class="no-border-bottom">
<legend align="center"><%= t('spree.billing_address') %></legend>
<div class="js-billing-address">
<%= f.fields_for :bill_address do |ba_form| %>
<%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
<% end %>
</div>
</fieldset>
</div>
<% end %>
</div>

<div class="clear"></div>
Expand Down