Skip to content

Commit

Permalink
Merge pull request #1523 from jhawthorn/stock_locations_form
Browse files Browse the repository at this point in the history 
Simplify and improve stock locations form
  • Loading branch information
@cbrunsdon
cbrunsdon authored Oct 4, 2017
2 parents d6dbc4a + 2ee01e2 commit 6cf0c7b
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 93 deletions.
167 changes: 82 additions & 85 deletions backend/app/views/spree/admin/stock_locations/_form.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,114 +1,111 @@
<div data-hook="admin_stock_locations_form_fields" class="row">
<div class="col-7" data-hook="stock_location_names">
<div data-hook="stock_location_name">
<%= f.field_container :name do %>
<%= f.label :name, class: 'required' %><br />
<%= f.text_field :name, class: 'fullwidth', required: true %>
<% end %>
</div>
<div data-hook="stock_location_code">
<%= f.field_container :code do %>
<%= f.label :code %>
<%= f.text_field :code, class: 'fullwidth', label: false %>
<% end %>
</div>
<div data-hook="stock_location_admin_name">
<%= f.field_container :admin_name do %>
<%= f.label :admin_name %>
<%= f.text_field :admin_name, class: 'fullwidth', label: false %>
<% end %>
</div>
</div>
<div data-hook="admin_stock_locations_form_fields">
<fieldset class="no-border-bottom">
<legend><%= t('.general') %></legend>

<%= f.field_container :name do %>
<%= f.label :name, class: 'required' %><br />
<%= f.text_field :name, class: 'fullwidth', required: true %>
<% end %>

<%= f.field_container :code do %>
<%= f.label :code %>
<%= f.text_field :code, :class => 'fullwidth', :label => false %>
<% end %>

<%= f.field_container :admin_name do %>
<%= f.label :admin_name %>
<%= f.text_field :admin_name, class: 'fullwidth', label: false %>
<% end %>
</fieldset>

<fieldset class="no-border-bottom">
<legend><%= t('.settings') %></legend>

<div class="col-3" data-hook="stock_location_status">
<%= f.field_container :active do %>
<label for="active"><%= Spree.t(:status) %></label>
<ul>
<li class="fullwidth" data-hook="stock_location_active">
<%= f.check_box :active %>
<%= f.label :active %>
</li>
<li class="fullwidth" data-hook="stock_location_default">
<%= f.check_box :default %>
<%= f.label :default %>
</li>
<li class="fullwidth" data-hook="stock_location_backorderable_default">
<%= f.check_box :backorderable_default %>
<%= f.label :backorderable_default %>
</li>
<li class="fullwidth" data-hook="stock_location_propagate_all_variants">
<%= f.check_box :propagate_all_variants %>
<%= f.label :propagate_all_variants %>
</li>
<li class="fullwidth">
<%= f.check_box :restock_inventory %>
<%= f.label :restock_inventory %>
</li>
<li>
<%= f.check_box :fulfillable %>
<%= f.label :fulfillable %>
</li>
<li class="fullwidth">
<%= f.check_box :check_stock_on_transfer %>
<%= f.label :check_stock_on_transfer %>
</li>
</ul>
<%= f.check_box :active %>
<%= f.label :active %>
<%= f.field_hint :active %>
<% end %>

<%= f.field_container :default do %>
<%= f.check_box :default %>
<%= f.label :default %>
<% end %>

<%= f.field_container :backorderable_default do %>
<%= f.check_box :backorderable_default %>
<%= f.label :backorderable_default %>
<%= f.field_hint :backorderable_default %>
<% end %>

<%= f.field_container :propagate_all_variants do %>
<%= f.check_box :propagate_all_variants %>
<%= f.label :propagate_all_variants %>
<%= f.field_hint :propagate_all_variants %>
<% end %>

<%= f.field_container :restock_inventory do %>
<%= f.check_box :restock_inventory %>
<%= f.label :restock_inventory %>
<%= f.field_hint :restock_inventory %>
<% end %>

<%= f.field_container :fulfillable do %>
<%= f.check_box :fulfillable %>
<%= f.label :fulfillable %>
<%= f.field_hint :fulfillable %>
<% end %>
</div>

<div class="col-5" data-hook="stock_location_address1">
<div class="field">
<%= f.field_container :check_stock_on_transfer do %>
<%= f.check_box :check_stock_on_transfer %>
<%= f.label :check_stock_on_transfer %>
<%= f.field_hint :check_stock_on_transfer %>
<% end %>
</fieldset>

<fieldset>
<legend><%= t('.address') %></legend>

<%= f.field_container :check_stock_on_transfer do %>
<%= f.label :address1 %>
<%= f.text_field :address1, class: 'fullwidth' %>
</div>
</div>

<div class="col-5" data-hook="stock_location_city">
<div class="field">
<%= f.label :city %>
<%= f.text_field :city, class: 'fullwidth' %>
</div>
</div>
<% end %>

<div class="col-5" data-hook="stock_location_address2">
<div class="field">
<%= f.field_container :address2 do %>
<%= f.label :address2 %>
<%= f.text_field :address2, class: 'fullwidth' %>
</div>
</div>
<% end %>

<div class="col-2" data-hook="stock_location_zipcode">
<div class="field">
<%= f.field_container :city do %>
<%= f.label :city %>
<%= f.text_field :city, class: 'fullwidth' %>
<% end %>

<%= f.field_container :zipcode do %>
<%= f.label :zipcode %>
<%= f.text_field :zipcode, class: 'fullwidth' %>
</div>
</div>
<% end %>

<div class="col-3" data-hook="stock_location_phone">
<div class="field">
<%= f.field_container :phone do %>
<%= f.label :phone %>
<%= f.phone_field :phone, class: 'fullwidth' %>
</div>
</div>
<% end %>

<div class="col-5" data-hook="stock_location_country">
<div class="field">
<%= f.field_container :country_id do %>
<%= f.label :country_id %>
<span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 fullwidth' } %></span>
</div>
</div>
<% end %>

<div class="col-5" data-hook="stock_location_state">
<div class="field">
<%= f.field_container :state do %>
<% if f.object.country %>
<%= f.label :state_id %>
<span id="state" class="region">
<%= f.text_field :state_name, style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };", disabled: !f.object.country.states.empty?, class: 'fullwidth state_name' %>
<%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2 fullwidth', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
</span>
<% end %>
</div>
</div>
<% end %>
</fieldset>
</div>

<% content_for :head do %>
Expand Down
6 changes: 2 additions & 4 deletions backend/app/views/spree/admin/stock_locations/edit.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<%= render partial: 'spree/shared/error_messages', locals: { target: @stock_location } %>

<%= form_for [:admin, @stock_location] do |f| %>
<fieldset class="no-border-top">
<%= render partial: 'form', locals: { f: f } %>
<%= render partial: 'spree/admin/shared/edit_resource_links' %>
</fieldset>
<%= render :partial => 'form', :locals => { :f => f } %>
<%= render :partial => 'spree/admin/shared/edit_resource_links' %>
<% end %>
6 changes: 2 additions & 4 deletions backend/app/views/spree/admin/stock_locations/new.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<%= render partial: 'spree/shared/error_messages', locals: { target: @stock_locations } %>

<%= form_for [:admin, @stock_location] do |f| %>
<fieldset class="no-border-top">
<%= render partial: 'form', locals: { f: f } %>
<%= render partial: 'spree/admin/shared/new_resource_links' %>
</fieldset>
<%= render :partial => 'form', :locals => { :f => f } %>
<%= render :partial => 'spree/admin/shared/new_resource_links' %>
<% end %>
12 changes: 12 additions & 0 deletions core/config/locales/en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -868,6 +868,11 @@ en:
auto: All orders will attempt to use this promotion
single_code_html: "This promotion uses the promotion code: <code>%{code}</code>"
multiple_codes_html: "This promotion uses %{count} promotion codes"
stock_locations:
form:
general: General
settings: Settings
address: Address
store_credits:
add: "Add store credit"
amount_authorized: "Amount Authorized"
Expand Down Expand Up @@ -1283,6 +1288,13 @@ en:
spree/promotion:
starts_at: "This determines when the promotion can be applied to orders. <br/> If no value is specified, the promotion will be immediately available."
expires_at: "This determines when the promotion expires. <br/> If no value is specified, the promotion will never expire."
spree/stock_location:
active: "This determines whether stock from this location can be used when building packages.<br/> Default: Checked"
backorderable_default: "When checked, stock items in this location will default to allowing backorders.<br/> Default: Unchecked"
propagate_all_variants: "When checked, this will create a stock item for in this stock location.<br/> Default: Checked"
restock_inventory: "When checked, returned inventory can be added back to this location's stock levels.<br/> Default: checked"
fulfillable: "When unchecked, this indicates that items in this location don't require actual fulfilment. Stock will not be checked when shipping and emails will not be sent.<br/> Default: Checked"
check_stock_on_transfer: "When checked, inventory levels will be checked when performing stock transfers.<br/> Default: Checked"
spree/store:
cart_tax_country_iso: "This determines which country is used for taxes on carts (orders which don't yet have an address).<br/> Default: None."
spree/variant:
Expand Down

0 comments on commit 6cf0c7b

Please sign in to comment.