spree_backend 2.0.4 → 2.0.5

data/app/views/spree/admin/zones/_country_members.html.erb

@@ -0,0 +1,10 @@
+<div id="country_members" data-hook="member" class="omega six columns">
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:countries) %></legend>
+
+    <%= zone_form.field_container :country_ids do %>
+      <%= zone_form.label :country_ids, Spree.t(:countries) %><br>
+      <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+    <% end %>
+  </fieldset>
+</div>

data/app/views/spree/admin/zones/_form.html.erb

@@ -31,4 +31,7 @@
       </ul>
     </div>
   </fieldset>
-</div>
+</div>
+
+<%= render :partial => 'state_members', :locals => { :zone_form => zone_form }%>
+<%= render :partial => 'country_members', :locals => { :zone_form => zone_form } %>

data/app/views/spree/admin/zones/_state_members.html.erb

@@ -0,0 +1,10 @@
+<div id="state_members" data-hook="member" class="omega six columns">
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= Spree.t(:states) %></legend>
+
+    <%= zone_form.field_container :state_ids do %>
+      <%= zone_form.label :state_ids, Spree.t(:states) %><br>
+      <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+    <% end %>
+  </fieldset>
+</div>

data/app/views/spree/admin/zones/edit.html.erb

@@ -13,11 +13,7 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @zone } %>
 
 <%= form_for [:admin, @zone] do |zone_form| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
-    <%= render :partial => 'member_type', :locals => { :type => 'country', :zone_form => zone_form }%>
-    <%= render :partial => 'member_type', :locals => { :type => 'state', :zone_form => zone_form } %>
-    <div class="clear"></div>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-  </fieldset>
+  <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
+  <div class="clear"></div>
+  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
 <% end %>

data/app/views/spree/admin/zones/index.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:zones) %>
@@ -12,11 +12,7 @@
 
 <%= paginate @zones %>
 
-<% if @zones.empty? %>
-  <div class="no-objects-found">
-    <%= Spree.t(:none) %>
-  </div>
-<% else %>
+<% if @zones.any? %>
   <table class="index" id='listing_zones' data-hook>
     <colgroup>
       <col style="width: 30%" />
@@ -37,9 +33,9 @@
     <tbody>
       <% @zones.each do |zone| %>
         <tr id="<%= spree_dom_id zone %>" data-hook="zones_row" class="<%= cycle('odd', 'even')%>">
-          <td><%=zone.name %></td>
-          <td><%=zone.description %></td>
-          <td class="align-center"><%=zone.default_tax %></td>
+          <td class="align-center"><%= zone.name %></td>
+          <td><%= zone.description %></td>
+          <td class="align-center"><%= zone.default_tax? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="actions">
             <%=link_to_edit zone, :no_text => true %>
             <%=link_to_delete zone, :no_text => true %>
@@ -48,6 +44,11 @@
       <% end %>
     </tbody>
   </table>
-<% end%>
+<% else %>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/zone')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_zone_path %>!
+  </div>
+<% end %>
 
 <%= paginate @zones %>