spree_backend 2.0.3 → 2.0.4

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

@@ -1,8 +1,10 @@
 <% content_for :page_actions do %>
   <li><%= button_link_to Spree.t(:back_to_products_list), session[:return_to] || admin_products_url, :icon => 'icon-arrow-left' %></li>
-  <li id="new_product_link">
-    <%= button_link_to Spree.t(:new_product), new_object_url, { :icon => 'icon-plus', :id => 'admin_new_product' } %>
-  </li>
+  <% if can?(:create, Spree::Product) %>
+    <li id="new_product_link">
+      <%= button_link_to Spree.t(:new_product), new_object_url, { :icon => 'icon-plus', :id => 'admin_new_product' } %>
+    </li>
+  <% end %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>

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

@@ -6,7 +6,7 @@
   <li id="new_product_link">
     <%= button_link_to Spree.t(:new_product), new_object_url, { :remote => true, :icon => 'icon-plus', :id => 'admin_new_product' } %>
   </li>
-<% end %>
+<% end if can?(:create, Spree::Product) %>
 
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>
 
@@ -82,11 +82,11 @@
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
             <td class="align-center"><%= product.display_price.to_html rescue '' %></td>
             <td class="actions" data-hook="admin_products_index_row_actions">
-              <%= link_to_edit product, :no_text => true, :class => 'edit' unless product.deleted? %>
+              <%= link_to_edit product, :no_text => true, :class => 'edit' if can?(:edit, product) && !product.deleted? %>
               &nbsp;
-              <%= link_to_clone product, :no_text => true, :class => 'clone' %>
+              <%= link_to_clone product, :no_text => true, :class => 'clone' if can?(:clone, product) %>
               &nbsp;
-              <%= link_to_delete product, :no_text => true unless product.deleted? %>
+              <%= link_to_delete product, :no_text => true if can?(:delete, product) && !product.deleted? %>
             </td>
           </tr>
       <% end %>

data/app/views/spree/admin/products/new.html.erb

@@ -49,6 +49,16 @@
 
     </div>
 
+    <div class='row'>
+      <div class="alpha four columns">
+        <%= f.field_container :shipping_category do %>
+          <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span><br />
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
+          <%= f.error_message_on :shipping_category_id %>
+        <% end %>
+      </div>
+    </div>
+
     <div class="clearfix" data-hook="product-from-prototype" id="product-from-prototype">
       <%= render :file => 'spree/admin/prototypes/show' if @prototype %>
     </div>

data/app/views/spree/admin/products/stock.html.erb

@@ -3,12 +3,9 @@
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Stock Management' } %>
-
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
 
-
 <div id="add_stock_form">
   <%= render 'add_stock_form' %>
 </div>
@@ -37,10 +34,11 @@
               <%= image_tag variant.images.first.attachment.url(:mini) %>
             <% end %>
           </td>
-          <td colspan="3" class="stock_location_info">
+          <td colspan="4" class="stock_location_info">
             <table>
               <colgroup>
-                <col style="width: 60%" />
+                <col style="width: 40%" />
+                <col style="width: 20%" />
                 <col style="width: 20%" />
                 <col style="width: 20%" />
               </colgroup>
@@ -48,24 +46,26 @@
                 <th><%= Spree.t(:stock_location) %></th>
                 <th><%= Spree.t(:count_on_hand) %></th>
                 <th><%= Spree.t(:backorderable) %></th>
+                <th></th>
               </thead>
               <tbody>
-                <% @stock_locations.each do |stock_location| %>
-                <% next if stock_location.stock_item(variant).nil? %>
-                  <tr class="<%= cycle('odd', 'even', :name => 'stock_locations')%>">
-                    <td><%= stock_location.name %></td>
-                    <td class="align-center">
-                      <%= stock_location.stock_item(variant).count_on_hand %>
-                    </td>
+                <% variant.stock_items.each do |item| %>
+                  <% next unless @stock_locations.include?(item.stock_location) %>
+
+                  <tr id="stock-item-<%= item.id %>" class="<%= cycle('odd', 'even', :name => 'stock_locations')%>">
+                    <td><%= item.stock_location.name %></td>
+                    <td class="align-center"><%= item.count_on_hand %></td>
                     <td class="align-center">
-                      <% url = admin_stock_item_path(stock_location.stock_item(variant)) %>
-                      <%= form_tag url, method: :put, class: 'toggle_stock_item_backorderable' do %>
-                        <%= check_box_tag 'stock_item[backorderable]', true,
-                              stock_location.stock_item(variant).backorderable?,
+                      <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
+                        <%= check_box_tag 'stock_item[backorderable]', 1, item.backorderable?,
                               class: 'stock_item_backorderable',
-                              id: "stock_item_backorderable_#{stock_location.id}" %>
+                              id: "stock_item_backorderable_#{item.stock_location.id}" %>
                       <% end %>
                     </td>
+                    <td class="align-center">
+                      <%= link_to "", [:admin, item], method: :delete, remote: true,
+                        confirm: Spree.t(:are_you_sure), class: "icon_link with-tip icon-trash" %>
+                    </td>
                   </tr>
                 <% end %>
               </tbody>

data/app/views/spree/admin/promotions/_promotion_action.html.erb

@@ -6,6 +6,7 @@
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
   
+  <%= render :partial => "spree/shared/error_messages", :locals => { :target => promotion_action } %>
   <%= render :partial => "spree/admin/promotions/actions/#{type_name}",
              :locals => { :promotion_action => promotion_action, :param_prefix => param_prefix } %>
-</div>
+</div>

data/app/views/spree/admin/promotions/_promotion_rule.html.erb

@@ -5,5 +5,6 @@
   
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>  
+  <%= render :partial => "spree/shared/error_messages", :locals => { :target => promotion_rule } %>
   <%= render :partial => "spree/admin/promotions/rules/#{type_name}", :locals => { :promotion_rule => promotion_rule, :param_prefix => param_prefix } %>
 </div>

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

@@ -10,7 +10,7 @@
 
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>
 
-<%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display: none', :id => 'busy_indicator' %>
+<%= image_tag 'select2-spinner.gif', :plugin => 'spree', :style => 'display: none', :id => 'busy_indicator' %>
 
 <%# Placeholder for new prototype form %>
 <div id="new_prototype"></div>

data/app/views/spree/admin/shared/_product_tabs.html.erb

@@ -9,20 +9,21 @@
 <% content_for :sidebar do %>
   <nav class="menu">
     <ul data-hook="admin_product_tabs">
-      <li<%== ' class="active"' if current == 'Product Details' %>>
+      <%= content_tag :li, :class => ('active' if current == 'Product Details') do %>
         <%= link_to_with_icon 'icon-edit', Spree.t(:product_details), edit_admin_product_url(@product) %>
-      </li>
-      <li<%== ' class="active"' if current == 'Images' %>>
+      <% end if can?(:admin, Spree::Product) %>
+      <%= content_tag :li, :class => ('active' if current == 'Images') do %>
         <%= link_to_with_icon 'icon-picture', Spree.t(:images), admin_product_images_url(@product) %>
-      </li>
-      <li<%== ' class="active"' if current == 'Variants' %>>
+      <% end if can?(:admin, Spree::Image) %>
+      <%= content_tag :li, :class => ('active' if current == 'Variants') do %>
         <%= link_to_with_icon 'icon-th-large', Spree.t(:variants),  admin_product_variants_url(@product) %>
-      </li>
-      <li<%== ' class="active"' if current == 'Product Properties' %>>
+      <% end if can?(:admin, Spree::Variant) %>
+      <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %>
         <%= link_to_with_icon 'icon-tasks', Spree.t(:product_properties), admin_product_product_properties_url(@product) %>
-      </li>
-      <li<%== ' class="active"' if current == 'Stock Management' %>>
+      <% end if can?(:admin, Spree::ProductProperty) %>
+      <%= content_tag :li, :class => ('active' if current == 'Stock Management') do %>
         <%= link_to_with_icon 'icon-tasks', Spree.t(:stock_management), stock_admin_product_url(@product) %>
+      <% end if can?(:stock, Spree::Product) %>
       </li>
     </ul>
   </nav>

data/app/views/spree/admin/shared/_routes.html.erb

@@ -5,4 +5,8 @@
   Spree.routes.user_search = "<%= spree.admin_search_users_url(:format => 'json') %>";
   Spree.routes.product_search = "<%= spree.api_products_url(:format => 'json') %>";
   Spree.routes.option_type_search = "<%= spree.api_option_types_url(:format => 'json') %>";
+  Spree.routes.orders_api = "<%= spree.api_orders_url(:format => 'json') %>";
+  Spree.routes.stock_locations_api = "<%= spree.api_stock_locations_url(:format => 'json') %>";
+  Spree.routes.variants_api = "<%= spree.api_variants_url(:format => 'json') %>";
+
 </script>

data/app/views/spree/admin/shared/_tabs.html.erb

@@ -2,7 +2,7 @@
   <%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations, :icon => 'icon-shopping-cart' %>
 <% end %>
 <% if can? :admin, Spree::Product %>
-  <%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :icon => 'icon-th-large' %>
+  <%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, :icon => 'icon-th-large' %>
 <% end %>
 <% if can? :admin, Spree::Admin::ReportsController %>
   <%= tab :reports, :icon => 'icon-file'  %>

data/app/views/spree/admin/shared/_translations.html.erb

@@ -1,32 +1,34 @@
 <script>
   Spree.translations = <%==
   { :date_picker    => Spree.t(:js_format,
-                              :scope => 'spree.date_picker',
+                              :scope => 'date_picker',
                               :default => 'yy/mm/dd'),
-    :abbr_day_names      => I18n.t(:abbr_day_names, :scope => :date),
-    :add                 => Spree.t(:add),
-    :are_you_sure_delete => Spree.t(:are_you_sure_delete),
-    :bill_address        => Spree.t(:bill_address),
-    :choose_a_customer   => Spree.t(:choose_a_customer),
-    :confirm_delete      => Spree.t(:confirm_delete),
-    :cut                 => Spree.t(:cut),
-    :destroy             => Spree.t(:destroy),
-    :edit                => Spree.t(:edit),
-    :loading             => Spree.t(:loading),
-    :month_names         => I18n.t(:month_names, :scope => :date).reject(&:blank?),
-    :more                => Spree.t(:more),
-    :name                => Spree.t(:name),
-    :next                => Spree.t(:next),
-    :no_results          => Spree.t(:no_results),
-    :paste               => Spree.t(:paste),
-    :previous            => Spree.t(:previous),
-    :remove              => Spree.t(:remove),
-    :rename              => Spree.t(:rename),
-    :searching           => Spree.t(:searching),
-    :sku                 => Spree.t(:sku),
-    :type_to_search      => Spree.t(:type_to_search),
-    :taxon_placeholder   => Spree.t(:taxon_placeholder),
-    :value               => Spree.t(:value)
+    :abbr_day_names           => I18n.t(:abbr_day_names, :scope => :date),
+    :add                      => Spree.t(:add),
+    :are_you_sure_delete      => Spree.t(:are_you_sure_delete),
+    :bill_address             => Spree.t(:bill_address),
+    :choose_a_customer        => Spree.t(:choose_a_customer),
+    :confirm_delete           => Spree.t(:confirm_delete),
+    :cut                      => Spree.t(:cut),
+    :destroy                  => Spree.t(:destroy),
+    :edit                     => Spree.t(:edit),
+    :loading                  => Spree.t(:loading),
+    :month_names              => I18n.t(:month_names, :scope => :date).reject(&:blank?),
+    :more                     => Spree.t(:more),
+    :name                     => Spree.t(:name),
+    :next                     => Spree.t(:next),
+    :no_results               => Spree.t(:no_results),
+    :option_type_placeholder  => Spree.t(:option_type_placeholder),
+    :paste                    => Spree.t(:paste),
+    :previous                 => Spree.t(:previous),
+    :remove                   => Spree.t(:remove),
+    :rename                   => Spree.t(:rename),
+    :searching                => Spree.t(:searching),
+    :sku                      => Spree.t(:sku),
+    :type_to_search           => Spree.t(:type_to_search),
+    :taxon_placeholder        => Spree.t(:taxon_placeholder),
+    :variant_placeholder      => Spree.t(:variant_placeholder),
+    :value                    => Spree.t(:value)
   }.to_json
 %>
 </script>

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

@@ -30,8 +30,10 @@
       <legend align="center"><%= Spree.t(:categories) %></legend>
           <%= f.field_container :categories do %>
         <% Spree::ShippingCategory.all.each do |category| %>
-          <%= f.label :shipping_category_id, category.name %>
-          <%= check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category)) %><br>
+          <%= label_tag do %>
+            <%= check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category)) %>
+            <%= category.name %><br>
+          <% end %>
         <% end %>
         <%= error_message_on :shipping_method, :shipping_category_id %>
       <% end %>
@@ -43,8 +45,11 @@
       <legend align="center"><%= Spree.t(:zones) %></legend>
       <%= f.field_container :zones do %>
         <% Spree::Zone.all.each do |zone| %>
-          <%= f.label :zone_id, zone.name %>
-          <%= check_box_tag('shipping_method[zones][]', zone.id, @shipping_method.zones.include?(zone)) %><br>
+          <%= label_tag do %>
+            <%= check_box_tag('shipping_method[zones][]', zone.id, @shipping_method.zones.include?(zone)) %>
+            <%= zone.name %>
+          <% end %>
+          <br>
         <% end %>
         <%= error_message_on :shipping_method, :zone_id %>
       <% end %>

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

@@ -17,7 +17,7 @@
   </select>
 </div>
 
-<%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
+<%= image_tag 'select2-spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
 
 <div id="state-list" data-hook>
   <%= render :partial => 'state_list'%>

data/app/views/spree/admin/stock_items/destroy.js.erb

@@ -0,0 +1 @@
+$("#stock-item-<%= @stock_item.id %>").fadeOut();

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

@@ -14,6 +14,14 @@
             <%= f.label :active, Spree.t(:active) + ':' %>
             <%= f.check_box :active %>
           </li>
+          <li>
+            <%= f.label :active, Spree.t(:backorderable_default) + ':' %>
+            <%= f.check_box :backorderable_default %>
+          </li>
+          <li>
+            <%= f.label :active, Spree.t(:propagate_all_variants) + ':' %>
+            <%= f.check_box :propagate_all_variants %>
+          </li>
         </ul>
       <% end %>
     </div>

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

@@ -15,35 +15,39 @@
   </ul>
 <% end %>
 
-<table class="index" id='listing_stock_locations' data-hook>
-  <colgroup>
-    <col style="width: 50%" />
-    <col style="width: 15%" />
-    <col style="width: 20%" />
-    <col style="width: 15%" />
-  </colgroup>
-  <thead>
-    <tr data-hook="stock_locations_header">
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:state) %></th>
-      <th><%= Spree.t(:stock_movements) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @stock_locations.each do |stock_location|
-         @edit_url = edit_admin_stock_location_path(stock_location)
-         @delete_url = admin_stock_location_path(stock_location)
-    %>
-      <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row" class="<%= cycle('odd', 'even')%>">
-        <td><%= stock_location.name %></td>
-        <td><span class="state <%= stock_location.active? ? 'active' : 'inactive' %>"><%= stock_location.active? ? 'active' : 'inactive' %></span></td>
-        <td><%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %> </td>
-        <td class="actions">
-          <%= link_to_edit stock_location, :no_text => true %>
-          <%= link_to_delete stock_location, :no_text => true %>
-        </td>
+<% if @stock_locations.any? %>
+  <table class="index" id='listing_stock_locations' data-hook>
+    <colgroup>
+      <col style="width: 50%" />
+      <col style="width: 15%" />
+      <col style="width: 20%" />
+      <col style="width: 15%" />
+    </colgroup>
+    <thead>
+      <tr data-hook="stock_locations_header">
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:state) %></th>
+        <th><%= Spree.t(:stock_movements) %></th>
+        <th class="actions"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @stock_locations.each do |stock_location|
+           @edit_url = edit_admin_stock_location_path(stock_location)
+           @delete_url = admin_stock_location_path(stock_location)
+      %>
+        <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row" class="<%= cycle('odd', 'even')%>">
+          <td><%= stock_location.name %></td>
+          <td><span class="state <%= stock_location.active? ? 'active' : 'inactive' %>"><%= stock_location.active? ? 'active' : 'inactive' %></span></td>
+          <td><%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %> </td>
+          <td class="actions">
+            <%= link_to_edit stock_location, :no_text => true %>
+            <%= link_to_delete stock_location, :no_text => true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alpha twelve columns no-objects-found"><%= Spree.t(:no_stock_locations_found) %></div>
+<% end %>

data/app/views/spree/admin/stock_locations/new.html.erb

@@ -7,10 +7,10 @@
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_locations } %>
-<% @stock_location.country = Spree::Country.find(Spree::Config[:default_country_id]) %>
+
 <%= 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>
-<% end %>
+<% end %>

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

@@ -8,6 +8,9 @@
   <li>
     <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location),  icon: 'icon-plus', id: 'admin_new_stock_movement_link' %>
   </li>
+  <li>
+    <%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %>
+  </li>
 <% end %>
 
 <table class="index" id='listing_stock_movements'>
@@ -21,7 +24,6 @@
       <th><%= Spree.t(:stock_item) %>
       <th><%= Spree.t(:quantity) %></th>
       <th><%= Spree.t(:action) %></th>
-      <th data-hook="admin_stock_movements_index_header_actions" class="actions"></th>
     </tr>
   </thead>
   <tbody>
@@ -30,11 +32,6 @@
         <td class="align-center"><%= stock_movement.stock_item.variant_name %></td>
         <td class="align-center"><%= stock_movement.quantity %></td>
         <td class="align-center"><%= pretty_originator(stock_movement) %></td>
-        <td data-hook="admin_stock_movements_index_row_actions" class="actions">
-          <%= link_to_with_icon 'icon-edit', Spree.t(:edit), edit_admin_stock_location_stock_movement_path(@stock_location, stock_movement), data: { action: 'edit' }, no_text: true %>
-          <%= link_to_with_icon 'icon-trash', Spree.t(:delete), admin_stock_location_stock_movement_path(@stock_location, stock_movement), method: :delete,
-            data: { confirm: t(:are_you_sure), action: 'remove' }, no_text: true %>
-        </td>
       </tr>
     <% end %>
   </tbody>

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

@@ -17,7 +17,7 @@
 
       <div class="field-block alpha four columns">
         <div class="field">
-          <%= f.label :reference_cont %>
+          <%= f.label :reference_cont, Spree.t(:reference_cont) %>
           <%= f.text_field :reference_cont, class: 'fullwidth' %>
         </div>
       </div>