spree_core 1.2.0 → 1.2.2

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

@@ -1,6 +1,7 @@
 //<%#encoding: UTF-8%>
 //= require_self
 //= require admin/product_autocomplete
+//= require admin/taxon_autocomplete
 //= require select2
 
 /**
@@ -50,9 +51,9 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
 $.fn.objectPicker = function(url){
   $(this).tokenInput(url + "&authenticity_token=" + escape(AUTH_TOKEN), {
     searchDelay          : 600,
-    hintText             : strings.type_to_search,
-    noResultsText        : strings.no_results,
-    searchingText        : strings.searching,
+    hintText             : Spree.translations.type_to_search,
+    noResultsText        : Spree.translations.no_results,
+    searchingText        : Spree.translations.searching,
     prePopulateFromInput : true
   });
 };
@@ -63,12 +64,12 @@ $.fn.productPicker = function(){
 
 handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
-    dateFormat: "<%= ::I18n.t(:format, :scope => 'spree.date_picker', :default => 'yy/mm/dd') %>",
-    dayNames: <%= ::I18n.t(:day_names, :scope => :date).to_json %>,
-    dayNamesMin: <%= ::I18n.t(:abbr_day_names, :scope => :date).to_json %>,
-    monthNames: <%= (::I18n.t(:month_names, :scope => :date).delete_if(&:blank?)).to_json %>,
-    prevText: '<%= ::I18n.t(:previous) %>',
-    nextText: '<%= ::I18n.t(:next) %>',
+    dateFormat: Spree.translations.date_picker,
+    dayNames: Spree.translations.abbr_day_names,
+    dayNamesMin: Spree.translations.abbr_day_names,
+    monthNames: Spree.translations.month_names, 
+    prevText: Spree.translations.previous,
+    nextText: Spree.translations.next,
     showOn: "button",
     buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
     buttonImageOnly: true

data/app/assets/javascripts/admin/checkouts/edit.js

@@ -33,7 +33,7 @@ $(document).ready(function(){
   }
 
   prep_user_autocomplete_data = function(data){
-    return $.map(eval(data), function(row) {
+    return $.map(eval(data['users']), function(row) {
       return {
           data: row['user'],
           value: row['user']['email'],
@@ -45,10 +45,10 @@ $(document).ready(function(){
   if ($("#customer_search").length > 0) {
     $("#customer_search").autocomplete({
       minChars: 5,
-      delay: 1500,
+      delay: 500,
       source: function(request, response) {
         var params = { q: $('#customer_search').val(),
-                       authenticity_token: encodeURIComponent($('meta[name=csrf-token]').attr("content")) }
+                       authenticity_token: AUTH_TOKEN }
         $.get(Spree.routes.user_search + '&' + jQuery.param(params), function(data) {
           result = prep_user_autocomplete_data(data)
           response(result);
@@ -81,7 +81,7 @@ $(document).ready(function(){
         $('#user_id').val(ui.item.data['id']);
         $('#guest_checkout_true').prop("checked", false);
         $('#guest_checkout_false').prop("checked", true);
-        $('#guest_checkout_false').prob("disabled", false);
+        $('#guest_checkout_false').prop("disabled", false);
         return true;
       }
     }).data("autocomplete")._renderItem = function(ul, item) {

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

@@ -1,4 +1,4 @@
-//<%#encoding: UTF-8%>
+<%#encoding: UTF-8%>
 // Product autocompletion
 image_html = function(item){
   return "<img src='" + item['images'][0]["mini_url"] + "'/>";
@@ -16,9 +16,9 @@ format_product_autocomplete = function(item){
 
     html += "<div><h4>" + product['name'] + "</h4>";
     if (product['master']) {
-      html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + product['master']['sku'] + "</span>";
+      html += "<span><strong>" + Spree.translations.sku + ":</strong>" + product['master']['sku'] + "</span>";
     }
-    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + product['count_on_hand'] + "</span></div>";
+    html += "<span><strong>" + Spree.translations.on_hand + ":</strong>" + product['count_on_hand'] + "</span></div>";
   }else{
     // variant
     var variant = item.data['variant'];
@@ -37,8 +37,8 @@ format_product_autocomplete = function(item){
     }).join(", ")
 
     html += "<div><h4>" + name + "</h4>";
-    html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + variant['sku'] + "</span>";
-    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + variant['count_on_hand'] + "</span></div>";
+    html += "<span><strong>" + Spree.translations.sku + ":</strong>" + variant['sku'] + "</span>";
+    html += "<span><strong>" + Spree.translations.on_hand + ":</strong>" + variant['count_on_hand'] + "</span></div>";
   }
 
   return html

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

@@ -0,0 +1,34 @@
+function cleanTaxons(data) {
+  var taxons = $.map(data['taxons'], function(result) {
+    return result['taxon']
+  })
+  return taxons;
+}
+
+$(document).ready(function() {
+  $("#product_taxon_ids").select2({
+    placeholder: "Add a taxon",
+    multiple: true,
+    initSelection: function(element, callback) {
+      return $.getJSON(Spree.routes.taxon_search + "?ids=" + (element.val()), null, function(data) {
+        return callback(self.cleanTaxons(data));
+      })
+    },
+    ajax: {
+      url: Spree.routes.taxon_search,
+      datatype: 'json',
+      data: function(term, page) {
+        return { q: term }
+      },
+      results: function (data, page) {
+        return { results: self.cleanTaxons(data) }
+      }
+    },
+    formatResult: function(taxon) {
+      return taxon.pretty_name
+    },
+    formatSelection: function(taxon) {
+      return taxon.pretty_name
+    }
+  })
+})

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

@@ -59,7 +59,7 @@ var handle_delete = function(e, data){
   last_rollback = data.rlbk;
   var node = data.rslt.obj;
 
-  jConfirm('Are you sure you want to delete this taxon?', 'Confirm Taxon Deletion', function(r) {
+  jConfirm(Spree.translations.are_you_sure_delete, Spree.translations.confirm_delete, function(r) {
     if(r){
       $.ajax({
         type: "POST",
@@ -103,7 +103,7 @@ $(document).ready(function(){
       },
       "strings" : {
         "new_node" : new_taxon,
-        "loading" : loading + "..."
+        "loading" : Spree.translations.loading + "..."
       },
       "crrm" : {
         "move" : {
@@ -131,48 +131,48 @@ $(document).ready(function(){
             if(type_of_node == "root") {
               menu = {
                 "create" : {
-                  "label"            : "Create",
+                  "label"            : Spree.translations.add,
                   "action"           : function (obj) { this.create(obj); }
                 },
                  "paste" : {
                    "separator_before" : true,
-                   "label"            : "Paste",
+                   "label"            : Spree.translations.paste,
                    "action"           : function (obj) { is_cut = false; this.paste(obj); },
                    "_disabled"        : is_cut == false
                 },
                 "edit" : {
                   "separator_before" : true,
-                  "label"            : "Edit",
+                  "label"            : Spree.translations.edit,
                   "action"           : function (obj) { window.location = base_url + obj.attr("id") + "/edit/"; }
                 }
               }
             } else {
               menu =  {
                 "create" : {
-                  "label"            : "Create",
+                  "label"            : Spree.translations.add,
                   "action"           : function (obj) { this.create(obj); }
                 },
                 "rename" : {
-                  "label"            : "Rename",
+                  "label"            : Spree.translations.rename,
                   "action"           : function (obj) { this.rename(obj); }
                 },
                 "remove" : {
-                  "label"            : "Remove",
+                  "label"            : Spree.translations.remove,
                   "action"           : function (obj) { this.remove(obj); }
                 },
                 "cut" : {
                   "separator_before" : true,
-                  "label"            : "Cut",
+                  "label"            : Spree.translations.cut,
                   "action"           : function (obj) { is_cut = true; this.cut(obj); }
                 },
                 "paste" : {
-                  "label"            : "Paste",
+                  "label"            : Spree.translations.paste,
                   "action"           : function (obj) { is_cut = false; this.paste(obj); },
                   "_disabled"        : is_cut == false
                 },
                 "edit" : {
                   "separator_before" : true,
-                  "label"            : "Edit",
+                  "label"            : Spree.translations.edit,
                   "action"           : function (obj) { window.location = base_url + obj.attr("id") + "/edit/"; }
                 }
                     }

data/app/assets/javascripts/store/cart.js.coffee

@@ -1,6 +1,9 @@
 $ ->
   if ($ 'form#update-cart').is('*')
-    ($ 'form#update-cart a.delete').show().on 'click', ->
+    ($ 'form#update-cart a.delete').show().one 'click', ->
       ($ this).parents('.line-item').first().find('input.line_item_quantity').val 0
       ($ this).parents('form').first().submit()
-      false
+      false
+
+  ($ 'form#update-cart').submit ->
+    ($ 'form#update-cart #update-button').attr('disabled', true)

data/app/assets/javascripts/store/checkout.js.coffee

@@ -1,5 +1,5 @@
-disableSaveOnClick = ->
-  ($ 'form.edit_spree_order').submit ->
+@disableSaveOnClick = ->
+  ($ 'form.edit_order').submit ->
     ($ this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass 'disabled'
 
 $ ->
@@ -14,7 +14,7 @@ $ ->
       state_select = ($ 'p#' + region + 'state select')
       state_input = ($ 'p#' + region + 'state input')
       if states
-        selected = state_select.val()
+        selected = parseInt state_select.val()
         state_select.html ''
         states_with_blank = [ [ '', '' ] ].concat(states)
         $.each states_with_blank, (pos, id_nm) ->
@@ -51,7 +51,11 @@ $ ->
     ).triggerHandler 'click'
 
   if ($ '#checkout_form_payment').is('*')
+    # Activate already checked payment method if form is re-rendered
+    # i.e. if user enters invalid data
+    ($ 'input[type="radio"]:checked').click()
+
     ($ 'input[type="radio"][name="order[payments_attributes][][payment_method_id]"]').click(->
       ($ '#payment-methods li').hide()
       ($ '#payment_method_' + @value).show() if @checked
-    ).triggerHandler 'click'
+    )

data/app/assets/stylesheets/admin/admin-form.css.erb

@@ -161,3 +161,7 @@ fieldset {
     -moz-border-radius-topright: 5px;
     -webkit-border-top-right-radius: 5px; }
 
+/* make sure the select2 boxes on product#edit have some width to select. */
+.select2-choices {
+  min-width: 150px;
+}

data/app/assets/stylesheets/store/screen.css.scss

@@ -1,4 +1,4 @@
-@import "store/variables";
+@import "./variables.css.scss";
 
 /*--------------------------------------*/
 /* Basic styles 

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

@@ -2,12 +2,12 @@ module Spree
   module Admin
     class BannersController < Spree::Admin::BaseController
       def dismiss
-        if request.xhr? and params[:id]
+        if params[:id]
           if user = try_spree_current_user
             user.dismiss_banner(params[:id])
           end
-          render :nothing => true
         end
+        render :nothing => true
       end
     end
   end

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

@@ -3,6 +3,13 @@ module Spree
     class MailMethodsController < ResourceController
       after_filter :initialize_mail_settings
 
+      def update
+        if params[:mail_method][:preferred_smtp_password].blank?
+          params[:mail_method].delete(:preferred_smtp_password)
+        end
+        super
+      end
+
       def testmail
         @mail_method = Spree::MailMethod.find(params[:id])
         if TestMailer.test_email(@mail_method, try_spree_current_user).deliver

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

@@ -36,7 +36,9 @@ module Spree
         end
 
         @search = Order.ransack(params[:q])
-        @orders = @search.result(:distinct => true).includes([:user, :shipments, :payments]).page(params[:page]).per(Spree::Config[:orders_per_page])
+        @orders = @search.result.includes([:user, :shipments, :payments]).
+          page(params[:page]).
+          per(params[:per_page] || Spree::Config[:orders_per_page])
 
         # Restore dates
         params[:q][:created_at_gt] = created_at_gt

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

@@ -27,7 +27,13 @@ module Spree
         end
 
         payment_method_params = params[ActiveModel::Naming.param_key(@payment_method)] || {}
-        if @payment_method.update_attributes(params[:payment_method].merge(payment_method_params))
+        attributes = params[:payment_method].merge(payment_method_params)
+        attributes.each do |k,v|
+          if k.include?("password") && attributes[k].blank?
+            attributes.delete(k)
+          end
+        end
+        if @payment_method.update_attributes(attributes)
           invoke_callbacks(:update, :after)
           flash.notice = I18n.t(:successfully_updated, :resource => I18n.t(:payment_method))
           respond_with(@payment_method, :location => edit_admin_payment_method_path(@payment_method))

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

@@ -19,6 +19,13 @@ module Spree
         end
       end
 
+      def update
+        if params[:product][:taxon_ids].present?
+          params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
+        end
+        super
+      end
+
       def destroy
         @product = Product.where(:permalink => params[:id]).first!
         @product.delete
@@ -89,12 +96,10 @@ module Spree
               page(params[:page]).
               per(Spree::Config[:admin_products_per_page])
 
-            if params[:q][:s].include?("master_price")
-              # By applying the group in the main query we get an undefined method gsub for Arel::Nodes::Descending
-              # It seems to only work when the price is actually being sorted in the query
-              # To be investigated later.
-              @collection = @collection.group("spree_variants.price")
-            end
+              # PostgreSQL compatibility
+              if params[:q][:s].include?("master_price")
+                @collection = @collection.group("spree_variants.price")
+              end
           else
             includes = [{:variants => [:images,  {:option_values => :option_type}]}, {:master => :images}]
 

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

@@ -29,7 +29,7 @@ module Spree
       private
 
         def set_habtm_associations
-          @prototype.property_ids = params[:option_type].blank? ? [] : params[:property][:id]
+          @prototype.property_ids = params[:property].blank? ? [] : params[:property][:id]
           @prototype.option_type_ids = params[:option_type].blank? ? [] : params[:option_type][:id]
         end
     end

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

@@ -8,37 +8,17 @@ module Spree
       # TODO: Clean this up by moving searching out to user_class_extensions
       # And then JSON building with something like Active Model Serializers
       def users
-        @users = Spree.user_class.ransack({
-          :m => 'or',
-          :email_start => params[:q],
-          :ship_address_firstname_start => params[:q],
-          :ship_address_lastname_start => params[:q],
-          :bill_address_firstname_start => params[:q],
-          :bill_address_lastname_start => params[:q]
-        }).result.limit(params[:limit] || 100)
-
-        respond_with(@users) do |format|
-          format.json do
-            address_fields = [:firstname, :lastname,
-                              :address1, :address2,
-                              :city, :zipcode,
-                              :phone, :state_name,
-                              :state_id, :country_id]
-            includes = {
-              :only => address_fields,
-              :include => {
-                :state => { :only => :name },
-                :country => { :only => :name }
-              }
-            }
-
-          json = @users.to_json({
-            :only => [:id, :email],
-            :include => { :bill_address => includes, :ship_address => includes }
-          })
-
-          render :json => json
-          end
+        if params[:ids]
+          @users = Spree.user_class.where(:id => params[:ids].split(','))
+        else
+          @users = Spree.user_class.ransack({
+            :m => 'or',
+            :email_start => params[:q],
+            :ship_address_firstname_start => params[:q],
+            :ship_address_lastname_start => params[:q],
+            :bill_address_firstname_start => params[:q],
+            :bill_address_lastname_start => params[:q]
+          }).result.limit(10)
         end
       end
     end

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

@@ -4,6 +4,14 @@ module Spree
 
       respond_to :html, :json, :js
 
+      def search
+        if params[:ids]
+          @taxons = Spree::Taxon.where(:id => params[:ids].split(','))
+        else
+          @taxons = Spree::Taxon.limit(20).search(:name_cont => params[:q]).result
+        end
+      end
+
       def create
         @taxonomy = Taxonomy.find(params[:taxonomy_id])
         @taxon = @taxonomy.taxons.build(params[:taxon])

data/app/controllers/spree/checkout_controller.rb

@@ -2,7 +2,12 @@ module Spree
   # Handles checkout logic.  This is somewhat contrary to standard REST convention since there is not actually a
   # Checkout object.  There's enough distinct logic specific to checkout which has nothing to do with updating an
   # order that this approach is waranted.
-  class CheckoutController < BaseController
+  #
+  # Much of this file, especially the update action is overriden in the promo gem.
+  # This is to allow for the promo behavior but also allow the promo gem to be 
+  # removed if the functionality is not needed. 
+
+  class CheckoutController < Spree::BaseController
     ssl_required
 
     before_filter :load_order
@@ -13,6 +18,7 @@ module Spree
     respond_to :html
 
     # Updates the order and advances to the next state (when possible.)
+    # Overriden by the promo gem if it exists. 
     def update
       if @order.update_attributes(object_params)
         fire_event('spree.checkout.update')