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

Fix bug with user address forms #2766

Merged
merged 4 commits into from Jun 14, 2018
Merged

Fix bug with user address forms #2766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a2b2c6
Edit User Address functionality
Jun 5, 2018
8bca228
fix location drop down menus
jacobherrington Jun 6, 2018
917acb8
Change name of locations.js to addresses.js
Jun 6, 2018
ef62fdf
Rename CSS class 'js-locations-form' to 'js-addresses-form'
Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/app/assets/javascripts/spree/backend.js
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@
//= require spree/backend/collections
//= require spree/backend/views
//
//= require spree/backend/addresses
//= require spree/backend/adjustments
//= require spree/backend/admin
//= require spree/backend/calculator
Expand Down Expand Up @@ -52,7 +53,6 @@
//= require spree/backend/routes
//= require spree/backend/shipments
//= require spree/backend/spree-select2
//= require spree/backend/stock_location
//= require spree/backend/stock_management
//= require spree/backend/store_credits
//= require spree/backend/style_guide
Expand Down
2 changes: 1 addition & 1 deletion ...vascripts/spree/backend/stock_location.js → ...ts/javascripts/spree/backend/addresses.js
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
Spree.ready(function() {
"use strict";

_.each(document.querySelectorAll('.js-stock-locations-form'), function(el) {
_.each(document.querySelectorAll('.js-addresses-form'), function(el) {
var countrySelect = el.querySelector('.js-country_id');
var model = new Backbone.Model({
country_id: countrySelect.value
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/stock_locations/_form.html.erb
View file
Open in desktop
@@ -1,4 +1,4 @@
<div data-hook="admin_stock_locations_form_fields" class="js-stock-locations-form">
<div data-hook="admin_stock_locations_form_fields" class="js-addresses-form">
<fieldset class="no-border-bottom">
<legend><%= t('.general') %></legend>

Expand Down
6 changes: 3 additions & 3 deletions backend/app/views/spree/admin/users/_addresses_form.html.erb
View file
Open in desktop
@@ -1,6 +1,6 @@
<div class="row">
<div data-hook="bill_address_wrapper" class="col-6">

<div data-hook="bill_address_wrapper" class="col-6 js-addresses-form">
<fieldset class="no-border-bottom">
<legend align="center"><%= t('spree.billing_address') %></legend>
<%= f.fields_for :bill_address, @user.bill_address || Spree::Address.build_default do |ba_form| %>
Expand All @@ -9,7 +9,7 @@
</fieldset>
</div>

<div data-hook="ship_address_wrapper" class="col-6">
<div data-hook="ship_address_wrapper" class="col-6 js-addresses-form">
<fieldset class="no-border-bottom">
<legend align="center"><%= t('spree.shipping_address') %></legend>
<%= f.fields_for :ship_address, @user.ship_address || Spree::Address.build_default do |sa_form| %>
Expand Down