spree_backend 2.0.4 → 2.0.5

data/app/assets/javascripts/admin/taxon_autocomplete.js.erb

@@ -1,32 +1,45 @@
-$(document).ready(function() {
-  if ($("#product_taxon_ids").length > 0) {
-    $("#product_taxon_ids").select2({
+$(document).ready(function () {
+  'use strict';
+
+  if ($('#product_taxon_ids').length > 0) {
+    $('#product_taxon_ids').select2({
       placeholder: Spree.translations.taxon_placeholder,
       multiple: true,
-      initSelection: function(element, callback) {
-        url = Spree.url(Spree.routes.taxons_search, { ids: element.val() })
-        return $.getJSON(url, null, function(data) {
-          return callback(data);
-        })
+      initSelection: function (element, callback) {
+        var url = Spree.url(Spree.routes.taxons_search, {
+          ids: element.val()
+        });
+        return $.getJSON(url, null, function (data) {
+          return callback(data['taxons']);
+        });
       },
       ajax: {
         url: Spree.routes.taxons_search,
         datatype: 'json',
-        data: function(term, page) {
-          return { q:
-            { name_cont: term }
-          }
+        data: function (term, page) {
+          return {
+            per_page: 50,
+            page: page,
+            q: {
+              name_cont: term
+            }
+          };
         },
         results: function (data, page) {
-          return { results: data }
+          var more = page < data.pages;
+          console.log(more)
+          return {
+            results: data['taxons'],
+            more: more
+          };
         }
       },
-      formatResult: function(taxon) {
-        return taxon.pretty_name
+      formatResult: function (taxon) {
+        return taxon.pretty_name;
       },
-      formatSelection: function(taxon) {
-        return taxon.pretty_name
+      formatSelection: function (taxon) {
+        return taxon.pretty_name;
       }
-    })
+    });
   }
-})
+});

data/app/assets/javascripts/admin/user_picker.js

@@ -1,31 +1,39 @@
-$.fn.userAutocomplete = function() {
+$.fn.userAutocomplete = function () {
+  'use strict';
+
   this.select2({
     minimumInputLength: 1,
     multiple: true,
-    initSelection: function(element, callback) {
-      $.get(Spree.routes.user_search, { ids: element.val() }, function(data) { 
-        callback(data)
-      })
+    initSelection: function (element, callback) {
+      $.get(Spree.routes.user_search, {
+        ids: element.val()
+      }, function (data) {
+        callback(data);
+      });
     },
     ajax: {
       url: Spree.routes.user_search,
       datatype: 'json',
-      data: function(term, page) {
-        return { q: term }
+      data: function (term) {
+        return {
+          q: term
+        };
       },
-      results: function(data, page) {
-        return { results: data }
+      results: function (data) {
+        return {
+          results: data
+        };
       }
     },
-    formatResult: function(user) {
+    formatResult: function (user) {
       return user.email;
     },
-    formatSelection: function(user) {
+    formatSelection: function (user) {
       return user.email;
     }
   });
-}
+};
 
 $(document).ready(function () {
   $('.user_picker').userAutocomplete();
-})
+});

data/app/assets/javascripts/admin/variant_autocomplete.js.erb

@@ -88,7 +88,7 @@ adjustItems = function(shipment_number, variant_id, quantity){
         url: Spree.url(url),
         data: { variant_id: variant_id, quantity: new_quantity }
       }).done(function( msg ) {
-        window.location.reload();
+        advanceOrder();
       });
     }
 }
@@ -180,8 +180,6 @@ completeItemSplit = function(event) {
       async: false,
       url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments/" + original_shipment_number + "/remove.json"),
       data: { variant_id: variant_id, quantity: quantity }
-    }).done(function(msg) {
-      window.location.reload();
     });
 
     if (new_shipment != undefined) {
@@ -190,6 +188,8 @@ completeItemSplit = function(event) {
         async: false,
         url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments.json"),
         data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
+      }).done(function(msg) {
+        advanceOrder();
       });
     } else {
       $.ajax({
@@ -197,11 +197,23 @@ completeItemSplit = function(event) {
         async: false,
         url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments/" + target_shipment_number + "/add.json"),
         data: { variant_id: variant_id, quantity: quantity }
+      }).done(function(msg) {
+        advanceOrder();
       });
     }
   }
 }
 
+advanceOrder = function() {
+  $.ajax({
+    type: "PUT",
+    async: false,
+    url: Spree.url(Spree.routes.checkouts_api + "/" + order_number + "/advance")
+  }).done(function() {
+    window.location.reload();
+  });
+}
+
 cancelItemSplit = function(event) {
   event.preventDefault();
   var link = $(this);
@@ -229,7 +241,7 @@ addVariantFromStockLocation = function() {
       url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments.json"),
       data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
     }).done(function( msg ) {
-      window.location.reload();
+      advanceOrder();
     }).error(function( msg ) {
       console.log(msg);
     });

data/app/assets/stylesheets/admin/plugins/_select2.scss

@@ -40,10 +40,12 @@
   }
 }
 
-.select2-drop {
-  border-color: $color-sel-hover-bg;
+.select2-drop {  
   box-shadow: none !important;
   z-index: 1000000;
+  max-width: auto !important;
+  border-top: 1px solid;
+  border-color: $color-sel-hover-bg;
 
   &.select2-drop-above {
     border-color: $color-sel-hover-bg;
@@ -87,7 +89,7 @@
     display: block;
     width: 100%;
     height: 100%;
-    background: none;
+    background: none !important;
     font-family: FontAwesome;
     font-weight: 200 !important;
 

data/app/assets/stylesheets/admin/sections/_alerts.scss

@@ -0,0 +1,27 @@
+.alert {
+  padding: 10px;
+  color: white;
+  font-weight: bold;
+  font-size: 125%;
+
+  &.security {
+    background: #cc0000; 
+    border-bottom: 3px solid darken(#cc0000, 10);
+    a {
+      color: lighten($color-3, 20);
+    }
+  }
+
+  &.release, &.news {
+    background: $color-2;
+    border-bottom: 3px solid darken($color-2, 10);
+    a {
+      color: darken($color-3, 10);
+    }
+  }
+
+  .dismiss {
+    float: right;
+    color: white !important;
+  }
+}

data/app/assets/stylesheets/admin/spree_admin.scss

@@ -26,6 +26,7 @@
 @import 'plugins/token-input';
 @import 'plugins/jstree';
 
+@import 'sections/alerts';
 @import 'sections/image_settings';
 @import 'sections/orders';
 @import 'sections/overview';

data/app/controllers/spree/admin/base_controller.rb

@@ -28,24 +28,17 @@ module Spree
         # Need to generate an API key for a user due to some backend actions
         # requiring authentication to the Spree API
         def generate_admin_api_key
-          if user = try_spree_current_user
-            if user.spree_api_key.blank?
-              user.generate_spree_api_key!
-            end
+          if (user = try_spree_current_user) && user.spree_api_key.blank?
+            user.generate_spree_api_key!
           end
         end
 
         def check_alerts
           return unless should_check_alerts?
-
           unless session.has_key? :alerts
-            begin
-              session[:alerts] = Spree::Alert.current(request.host)
-              filter_dismissed_alerts
-              Spree::Config.set :last_check_for_spree_alerts => DateTime.now.to_s
-            rescue
-              session[:alerts] = nil
-            end
+            session[:alerts] = Spree::Alert.current(request.host)
+            filter_dismissed_alerts
+            Spree::Config.set :last_check_for_spree_alerts => DateTime.now.to_s
           end
         end
 
@@ -81,7 +74,12 @@ module Spree
         def filter_dismissed_alerts
           return unless session[:alerts]
           dismissed = (Spree::Config[:dismissed_spree_alerts] || '').split(',')
-          session[:alerts].reject! { |a| dismissed.include? a["id"].to_s }
+          # If it's a string, something has gone wrong with the alerts service. Ignore it.
+          if session[:alerts].is_a?(String)
+            session[:alerts] = nil
+          else
+            session[:alerts].reject! { |a| dismissed.include? a["id"].to_s }
+          end
         end
 
         def config_locale

data/app/controllers/spree/admin/images_controller.rb

@@ -5,10 +5,13 @@ module Spree
 
       create.before :set_viewable
       update.before :set_viewable
-      destroy.before :destroy_before
 
       private
 
+        def location_after_destroy
+          admin_product_images_url(@product)
+        end
+
         def location_after_save
           admin_product_images_url(@product)
         end
@@ -26,10 +29,6 @@ module Spree
           @image.viewable_id = params[:image][:viewable_id]
         end
 
-        def destroy_before
-          @viewable = @image.viewable
-        end
-
     end
   end
 end

data/app/controllers/spree/admin/mail_methods_controller.rb

@@ -18,7 +18,7 @@ module Spree
       end
 
       def testmail
-        if TestMailer.test_email(try_spree_current_user).deliver
+        if TestMailer.test_email(try_spree_current_user.id).deliver
           flash[:success] = Spree.t('admin.mail_methods.testmail.delivery_success')
         else
           flash[:error] = Spree.t('admin.mail_methods.testmail.delivery_error')

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -22,7 +22,7 @@ module Spree
             end
             while @order.next; end
 
-            @order.shipments.map &:refresh_rates
+            @order.refresh_shipment_rates
             flash[:success] = Spree.t('customer_details_updated')
             redirect_to admin_order_customer_path(@order)
           else

data/app/controllers/spree/admin/orders_controller.rb

@@ -52,13 +52,9 @@ module Spree
       end
 
       def edit
-        @order.shipments.map &:refresh_rates
-        # Transition as far as we can go
-        while @order.next; end
-        # The payment step shows an error of 'No pending payments'
-        # Clearing the errors from the order object will stop this error
-        # appearing on the edit page where we don't want it to.
-        @order.errors.clear
+        unless @order.complete?
+          @order.refresh_shipment_rates
+        end
       end
 
       def update

data/app/controllers/spree/admin/payments_controller.rb

@@ -92,7 +92,7 @@ module Spree
       #
       # Otherwise redirect user to that step
       def can_transition_to_payment
-        unless @order.payment? || @order.complete?
+        unless @order.billing_address.present?
           flash[:notice] = Spree.t(:fill_in_customer_info)
           redirect_to edit_admin_order_customer_url(@order)
         end

data/app/controllers/spree/admin/resource_controller.rb

@@ -70,13 +70,13 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       invoke_callbacks(:destroy, :after)
       flash[:success] = flash_message_for(@object, :successfully_removed)
       respond_with(@object) do |format|
-        format.html { redirect_to collection_url }
+        format.html { redirect_to location_after_destroy }
         format.js   { render :partial => "spree/admin/shared/destroy" }
       end
     else
       invoke_callbacks(:destroy, :fails)
       respond_with(@object) do |format|
-        format.html { redirect_to collection_url }
+        format.html { redirect_to location_after_destroy }
       end
     end
   end
@@ -198,6 +198,10 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       end
     end
 
+    def location_after_destroy
+      collection_url
+    end
+
     def location_after_save
       collection_url
     end

data/app/helpers/spree/admin/navigation_helper.rb

@@ -30,7 +30,7 @@ module Spree
         end
 
         selected = if options[:match_path]
-          request.fullpath.starts_with?("#{spree.root_path}admin#{options[:match_path]}")
+          request.fullpath.starts_with?("#{admin_path}#{options[:match_path]}")
         else
           args.include?(controller.controller_name.to_sym)
         end
@@ -142,7 +142,9 @@ module Spree
       end
 
       def configurations_sidebar_menu_item(link_text, url, options = {})
-        is_active = url.ends_with?(controller.controller_name) || url.ends_with?( "#{controller.controller_name}/edit")
+        is_active = url.ends_with?(controller.controller_name) || 
+                    url.ends_with?("#{controller.controller_name}/edit") ||
+                    url.ends_with?("#{controller.controller_name.singularize}/edit")
         options.merge!(:class => is_active ? 'active' : nil)
         content_tag(:li, options) do
           link_to(link_text, url)

data/app/helpers/spree/admin/stock_locations_helper.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Admin
+    module StockLocationsHelper
+      def display_name(stock_location)
+        name_parts = [stock_location.admin_name, stock_location.name]
+        name_parts.delete_if(&:blank?)
+        name_parts.join(' / ')
+      end
+
+      def state(stock_location)
+        stock_location.active? ? 'active' : 'inactive'
+      end
+    end
+  end
+end

data/app/views/spree/admin/countries/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(:listing_countries) %>
@@ -24,7 +24,7 @@
       <tr id="<%= spree_dom_id country %>" data-hook="country_row" class="<%= cycle('odd', 'even')%>">
         <td><%= country.name %></td>
         <td><%= country.iso_name %></td>
-        <td class="align-center"><%= country.states_required.to_s.titleize %></td>
+        <td class="align-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="actions">
           <%= link_to_edit country, :no_text => true %>
         </td>

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

@@ -11,7 +11,7 @@
       <% @preferences_general.each do |key|
           type = Spree::Config.preference_type(key) %>
           <div class="field">
-            <%= label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean %>
+            <%= label_tag(key, Spree.t(key)) + tag(:br) if type != :boolean %>
             <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
             <%= label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean %>
           </div>
@@ -25,7 +25,7 @@
             <% @preferences_security.each do |key|
                 type = Spree::Config.preference_type(key) %>
                 <div class="field">
-                  <%= label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean %>
+                  <%= label_tag(key, Spree.t(key)) + tag(:br) if type != :boolean %>
                   <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
                   <%= label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean %>
                 </div>
@@ -38,7 +38,7 @@
             <% @preferences_currency.each do |key|
                 type = Spree::Config.preference_type(key) %>
                 <div class="field">
-                  <%= label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean %>
+                  <%= label_tag(key, Spree.t(key)) + tag(:br) if type != :boolean %>
                   <%= preference_field_tag(key, Spree::Config[key], :type => type) %>
                   <%= label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean %>
                 </div>

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

@@ -12,14 +12,17 @@
 
 <div id="new_option_type"></div>
 
+<% if @option_types.any? %>
 <table class="index sortable" id="listing_option_types" data-hook data-sortable-link="<%= update_positions_admin_option_types_url %>">
   <colgroup>
-    <col style="width: 44%">
-    <col style="width: 44%">
-    <col style="width: 12%">
+    <col style="width: 10%">
+    <col style="width: 35%">
+    <col style="width: 40%">
+    <col style="width: 15%">
   </colgroup>
   <thead>
     <tr data-hook="option_header">
+      <th class="no-border"></th>
       <th><%= Spree.t(:name) %></th>
       <th><%= Spree.t(:presentation) %></th>
       <th class="actions"></th>
@@ -28,8 +31,9 @@
   <tbody>
     <% @option_types.each do |option_type| %>
       <tr class="spree_option_type <%= cycle('odd', 'even')%>" id="<%= spree_dom_id option_type %>" data-hook="option_row">
-        <td><span class="handle"></span> <%= option_type.name %></td>
-        <td class="presentation"><%= option_type.presentation %></td>
+        <td class="no-border"><span class="handle"></span></td>
+        <td class="align-center"><%= option_type.name %></td>
+        <td class="align-center presentation"><%= option_type.presentation %></td>
         <td class="actions">
           <%= link_to_edit(option_type, :class => 'admin_edit_option_type', :no_text => true) %>
           <%= link_to_delete(option_type, :no_text => true) %>
@@ -38,3 +42,9 @@
     <% end %>
   </tbody>
 </table>
+<% else %>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/option_type')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_option_type_path %>!
+  </div>
+<% end %>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -49,8 +49,8 @@
               <div class="field omega four columns">
                 <label><%= Spree.t(:associated_adjustment_closed) %></label>
                 <ul>
-                  <li><%= radio_button_tag :open_adjustment, 'yes', false, :data => {'shipment-number' => shipment.number } %> Yes</li>
-                  <li><%= radio_button_tag :open_adjustment, 'no', true, :data => {'shipment-number' => shipment.number } %> No</li>
+                  <li><%= radio_button_tag :open_adjustment, 'yes', false, data: { 'shipment-number' => shipment.number } %> <%= Spree.t(:say_yes) %></li>
+                  <li><%= radio_button_tag :open_adjustment, 'no', true, data: { 'shipment-number' => shipment.number } %> <%= Spree.t(:say_no) %></li>
                 </ul>
               </div>
             <% end %>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -1,18 +1,18 @@
 <fieldset data-hook="admin_customer_detail_form_fields" class="no-border-top">
-  
+
   <fieldset class="index no-border-bottom" data-hook="customer_guest">
     <legend align="center"><%= Spree.t(:account) %></legend>
-      
+
     <div data-hook="customer_fields" class="row">
       <div class="alpha eight columns">
         <div class="field">
-          <%= f.label :email, Spree.t(:email) + ':' %>
+          <%= f.label :email, Spree.t(:email) %>
           <%= f.email_field :email, :class => 'fullwidth' %>
         </div>
       </div>
       <div class="omega four columns">
         <div class="field">
-          <%= label_tag nil, Spree.t(:guest_checkout) %>:
+          <%= label_tag nil, Spree.t(:guest_checkout) %>
           <ul>
             <% if @order.completed? %>
               <li>
@@ -26,8 +26,8 @@
               </li>
               <li>
                 <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
-                <%= Spree.t(:say_no) %>  
-              </li>              
+                <%= Spree.t(:say_no) %>
+              </li>
               <%= hidden_field_tag :user_id, @order.user_id %>
             <% end %>
           </ul>
@@ -44,13 +44,13 @@
       <% end %>
     </fieldset>
   </div>
-  
+
   <div class="omega six columns" data-hook="ship_address_wrapper">
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:shipping_address) %></legend>
       <%= f.fields_for :ship_address do |sa_form| %>
         <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :name => Spree.t(:shipping_address), :use_billing => true } %>
-      <% end %>    
+      <% end %>
     </fieldset>
   </div>
 

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

@@ -80,7 +80,7 @@
 
 <%= paginate @orders %>
 
-<% unless @orders.empty? %>
+<% if @orders.any? %>
   <table class="index responsive" id="listing_orders" data-hook>
     <colgroup>
        <col style="width: 13%;">
@@ -126,8 +126,9 @@
     </tbody>
   </table>
 <% else %>
-  <div class="no-objects-found">
-    <%= Spree.t(:no_orders_found)%>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/order')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
   </div>
 <% end %>
 

data/app/views/spree/admin/payment_methods/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(:payment_methods) %>
@@ -28,13 +28,13 @@
         <th><%= Spree.t(:display) %></th>
         <th><%= Spree.t(:active) %></th>
         <th data-hook="admin_payment_methods_index_header_actions" class="actions"></th>
-      </tr>  
+      </tr>
     </thead>
     <tbody>
       <% @payment_methods.each do |method|%>
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows" class="<%= cycle('odd', 'even')%>">
           <td class="align-center"><%= method.name %></td>
-          <td><%= method.type %></td>
+          <td class="align-center"><%= method.type %></td>
           <td class="align-center"><%= method.environment.to_s.titleize %></td>
           <td class="align-center"><%= method.display_on.blank? ? Spree.t(:both) : Spree.t(method.display_on) %></td>
           <td class="align-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
@@ -47,6 +47,9 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found"><%= Spree.t(:no_payment_methods_found) %></div>
+  <div class="alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/payment_method')) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_payment_method_path %>!
+  </div>
 <% end %>
 

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

@@ -8,7 +8,7 @@
   <div class="omega nine columns">
     <div class="field">
       <label><%= Spree.t(:payment_method) %></label>
-      <ul>
+      <ul id='payment-methods'>
         <% @payment_methods.each do |method| %>
           <li>
             <label data-hook="payment_method_field">

data/app/views/spree/admin/payments/show.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :page_title do %>
   <i class="icon-arrow-right"></i>
-  <%= Spree.t("activerecord.models.#{@payment.class.to_s.underscore}.one") %>
+  <%= I18n.t("activerecord.models.#{@payment.class.to_s.underscore}.one") %>
   <i class="icon-arrow-right"></i>
   <%= payment_method_name(@payment) %>
 <% end %>
@@ -14,5 +14,5 @@
 <%= render :partial => "spree/admin/payments/source_views/#{@payment.payment_method.method_type}", :locals => { :payment => @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
 
 <div data-hook="amount" class="align-center">
-  <h5><%= label_tag nil, Spree.t(:amount) %>: <span class="green"><%= @payment.amount %></span> </h5>
+  <h5><%= label_tag nil, Spree.t(:amount) %>: <span class="green"><%= @payment.display_amount %></span> </h5>
 </div>