spree_core 1.3.0.rc1 → 1.3.0.rc2

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

@@ -1,4 +1,5 @@
 //= require_self
+//= require admin/handlebar_extensions
 //= require admin/variant_autocomplete
 //= require admin/taxon_autocomplete
 //= require admin/spree-select2
@@ -157,6 +158,13 @@ $(document).ready(function(){
       el.attr("id", el.attr("id").replace(/\d+/, new_id))
       el.attr("name", el.attr("name").replace(/\d+/, new_id))
     })
+    // When cloning a new row, set the href of all icons to be an empty "#"
+    // This is so that clicking on them does not perform the actions for the
+    // duplicated row
+    new_table_row.find("a").each(function () {
+      var el = $(this);
+      el.attr('href', '#');
+    })
     $(target).prepend(new_table_row);
   })
 
@@ -183,8 +191,26 @@ $(document).ready(function(){
   });
 
   $('body').on('click', 'a.remove_fields', function() {
-    $(this).prev("input[type=hidden]").val("1");
-    $(this).closest(".fields").hide();
+    el = $(this);
+    el.prev("input[type=hidden]").val("1");
+    el.closest(".fields").hide();
+    if (el.attr("href")) {
+      $.ajax({
+        type: 'POST',
+        url: el.attr("href"),
+        data: { 
+          _method: 'delete',
+          authenticity_token: AUTH_TOKEN
+        },
+        success: function(response) {
+          el.parents("tr").fadeOut('hide');
+        },
+        error: function(response, textStatus, errorThrown) {
+          show_flash_error(response.responseText);
+        }
+
+      })
+    }
     return false;
   });
 

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

@@ -1,108 +1,68 @@
-$(document).ready(function(){
-
-  add_address = function(addr){
-    var html = "";
-    if(addr!=undefined){
-      html += addr['firstname'] + " " + addr['lastname'] + ", ";
-      html += addr['address1'] + ", " + addr['address2'] + ", ";
-      html += addr['city'] + ", ";
-
-      if(addr['state_id']!=null){
-        html += addr['state']['name'] + ", ";
-      }else{
-        html += addr['state_name'] + ", ";
-      }
-
-      html += addr['country']['name'];
-    }
-    return html;
-  }
-
-  format_user_autocomplete = function(item){
-    var data = item.data
-    var html = "<h4>" + data['email'] +"</h4>";
-    html += "<span><strong>Billing:</strong> ";
-    html += add_address(data['bill_address']);
-    html += "</span>";
-
-    html += "<span><strong>Shipping:</strong> ";
-    html += add_address(data['ship_address']);
-    html += "</span>";
-
-    return html
-  }
-
-  prep_user_autocomplete_data = function(data){
-    return $.map(eval(data['users']), function(row) {
-      return {
-          data: row,
-          value: row['email'],
-          result: row['email']
-      }
-    });
+$(document).ready(function() {
+  window.customerTemplate = Handlebars.compile($('#customer_autocomplete_template').text());
+
+  formatCustomerResult = function(customer) {
+    return customerTemplate({
+      customer: customer,
+      bill_address: customer.bill_address,
+      ship_address: customer.ship_address
+    })
   }
 
   if ($("#customer_search").length > 0) {
-    $("#customer_search").autocomplete({
-      minChars: 5,
-      delay: 500,
-      source: function(request, response) {
-        var params = { q: $('#customer_search').val(),
-                       authenticity_token: AUTH_TOKEN }
-        $.get(Spree.routes.user_search + '&' + jQuery.param(params), function(data) {
-          result = prep_user_autocomplete_data(data)
-          response(result);
-        });
-      },
-      focus: function(event, ui) {
-        $('#customer_search').val(ui.item.label);
-        $(ui).addClass('ac_over');
-        return false;
+    $("#customer_search").select2({
+      placeholder: Spree.translations.choose_a_customer,
+      ajax: {
+        url: Spree.routes.user_search,
+        datatype: 'json',
+        data: function(term, page) {
+          return { q: term }
+        },
+        results: function(data, page) {
+          return { results: data }
+        }
       },
-      select: function(event, ui) {
-        $('#customer_search').val(ui.item.label);
-        _.each(['bill', 'ship'], function(addr_name){
-          var addr = ui.item.data[addr_name + '_address'];
-          if(addr!=undefined){
-            $('#order_' + addr_name + '_address_attributes_firstname').val(addr['firstname']);
-            $('#order_' + addr_name + '_address_attributes_lastname').val(addr['lastname']);
-            $('#order_' + addr_name + '_address_attributes_company').val(addr['company']);
-            $('#order_' + addr_name + '_address_attributes_address1').val(addr['address1']);
-            $('#order_' + addr_name + '_address_attributes_address2').val(addr['address2']);
-            $('#order_' + addr_name + '_address_attributes_city').val(addr['city']);
-            $('#order_' + addr_name + '_address_attributes_zipcode').val(addr['zipcode']);
-            $('#order_' + addr_name + '_address_attributes_state_id').val(addr['state_id']);
-            $('#order_' + addr_name + '_address_attributes_country_id').val(addr['country_id']);
-            $('#order_' + addr_name + '_address_attributes_phone').val(addr['phone']);
+      formatResult: formatCustomerResult,
+      formatSelection: function (customer) {
+        _.each(['bill_address', 'ship_address'], function(address) {
+          var data = customer[address];
+          address_parts = ['firstname', 'lastname',
+                           'company', 'address1',
+                           'address2', 'city',
+                           'zipcode', 'phone']
+          var attribute_wrapper = '#order_' + address + '_attributes_'
+          if(data != undefined) {
+            _.each(address_parts, function(part) {
+              $(attribute_wrapper + part).val(data[part]);
+            })
+
+            $(attribute_wrapper + 'state_id').select2("val", data['state_id']);
+            $(attribute_wrapper + 'country_id').select2("val", data['country_id']);
+          }
+          else {
+            _.each(address_parts, function(part) {
+              $(attribute_wrapper + part).val("");
+            })
+
+            $(attribute_wrapper + 'state_id').select2("val", '');
+            $(attribute_wrapper + 'country_id').select2("val", '');
           }
         });
 
-        $('#order_email').val(ui.item.data['email']);
-        $('#user_id').val(ui.item.data['id']);
+        $('#order_email').val(customer.email);
+        $('#user_id').val(customer.id);
         $('#guest_checkout_true').prop("checked", false);
         $('#guest_checkout_false').prop("checked", true);
         $('#guest_checkout_false').prop("disabled", false);
-        return true;
-      }
-    }).data("autocomplete")._renderItem = function(ul, item) {
-      $(ul).addClass('ac_results');
-      html = format_user_autocomplete(item);
-      return $("<li></li>")
-              .data("item.autocomplete", item)
-              .append("<a class='ui-menu-item'>" + html + "</a>")
-              .appendTo(ul);
-    }
-
-    $("#customer_search").data("autocomplete")._resizeMenu = function() {
-      var ul = this.menu.element;
-      ul.outerWidth(this.element.outerWidth());
-    }
-
 
+        return customer.email;
+      }
+    })
   }
 
-  var show_billing = function(show) {
-    if(show) {
+
+  $('input#order_use_billing').click(function() {
+    if(!$(this).is(':checked')) {
       $('#shipping').show();
       $('#shipping input').prop("disabled", false);
       $('#shipping select').prop("disabled", false);
@@ -111,10 +71,6 @@ $(document).ready(function(){
       $('#shipping input').prop("disabled", true);
       $('#shipping select').prop("disabled", true);
     }
-  }
-
-  $('input#order_use_billing').click(function() {
-    show_billing(!$(this).is(':checked'));
   });
 
   $('#guest_checkout_true').change(function() {

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

@@ -0,0 +1,9 @@
+//= require handlebars
+Handlebars.registerHelper("t", function(key) {
+  if (Spree.translations[key]) {
+    return Spree.translations[key]
+  } else {
+    console.error("No translation found for " + key + ". Does it exist within spree/admin/shared/_translations.html.erb?")
+  }
+});
+

data/app/assets/javascripts/admin/spree-select2.js.erb

@@ -1,24 +1,22 @@
 //= require select2
 jQuery(function($) {
-  <% unless Rails.env.test? %>
-    // Make select beautiful
-    $('select.select2').select2({
-      allowClear: true
-    });
+  // Make select beautiful
+  $('select.select2').select2({
+    allowClear: true
+  });
 
-    function format_taxons(taxon) {
-      new_taxon = taxon.text.replace('->', '<i class="icon-arrow-right">')
-      return new_taxon;
-    }
+  function format_taxons(taxon) {
+    new_taxon = taxon.text.replace('->', '<i class="icon-arrow-right">')
+    return new_taxon;
+  }
 
-    $("#product_taxon_ids").on({
-      change: function(e){
-        $('.select2-search-choice .with-tip').powerTip({
-          smartPlacement: true,
-          fadeInTime: 50,
-          fadeOutTime: 50
-        })
-      }
-    })
-  <% end %>
+  $("#product_taxon_ids").on({
+    change: function(e){
+      $('.select2-search-choice .with-tip').powerTip({
+        smartPlacement: true,
+        fadeInTime: 50,
+        fadeOutTime: 50
+      })
+    }
+  })
 })

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

@@ -1,7 +1,6 @@
 //= require jquery-ui
 //= require modernizr
 //= require jquery.cookie
-//= require jquery.tokeninput
 //= require jquery.delayedobserver
 //= require jquery.jstree/jquery.jstree
 //= require jquery.alerts/jquery.alerts

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

@@ -0,0 +1,9 @@
+$(document).ready(function() {
+	$("#country").change(function() {
+		var new_state_link_href = $('#new_state_link a').attr('href');
+		var selected_country_id = $('#country option:selected').attr('value');
+	    var new_link = new_state_link_href.replace(/countries\/(\d+)/,
+	    									'countries/'+selected_country_id);
+	    $('#new_state_link a').attr('href', new_link);
+	});
+});

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

@@ -8,7 +8,7 @@ function cleanTaxons(data) {
 $(document).ready(function() {
   if ($("#product_taxon_ids").length > 0) {
     $("#product_taxon_ids").select2({
-      placeholder: "Add a taxon",
+      placeholder: Spree.translations.taxon_placeholder,
       multiple: true,
       initSelection: function(element, callback) {
         return $.getJSON(Spree.routes.taxon_search + "?ids=" + (element.val()), null, function(data) {

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

@@ -1,4 +1,3 @@
-//= require handlebars
 <%#encoding: UTF-8%>
 // variant autocompletion
 
@@ -10,7 +9,7 @@ formatVariantResult = function(variant) {
   if (variant["images"][0] != undefined) {
     variant.image = variant.images[0].image.mini_url
   }
-  return variantTemplate({ variant: variant, translations: Spree.translations })
+  return variantTemplate({ variant: variant })
 }
 
 $.fn.variantAutocomplete = function() {
@@ -25,10 +24,7 @@ $.fn.variantAutocomplete = function() {
         return { q: term }
       },
       results: function (data, page) {
-        var variants = $.map(data['variants'], function(result) {
-          return result['variant']
-        })
-        return { results: variants }
+        return { results: data }
       }
     },
     formatResult: formatVariantResult,

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

@@ -69,11 +69,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
     )
+
+    # Activate already checked payment method if form is re-rendered
+    # i.e. if user enters invalid data
+    ($ 'input[type="radio"]:checked').click()

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

@@ -610,6 +610,14 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   /*--------------------------------------*/
   /* Checkout
   /*--------------------------------------*/
+  .out-of-stock {
+    background: #df0000;
+    color: white;
+    padding: 5px;
+    padding-right: 10px;
+    font-weight: bold;
+  }
+
   .progress-steps {
     list-style: decimal inside;
     overflow: auto;

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

@@ -0,0 +1,11 @@
+module Spree
+  module Admin
+    class OptionValuesController < Spree::Admin::BaseController
+      def destroy
+        option_value = Spree::OptionValue.find(params[:id])
+        option_value.destroy
+        render :text => nil
+      end
+    end
+  end
+end

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

@@ -5,6 +5,18 @@ module Spree
       before_filter :find_properties
       before_filter :setup_property, :only => [:index]
 
+      # We use a "custom" finder in destroy
+      # Because the request is scoped without a product
+      # on account of the request coming from the "link_to_remove_fields"
+      # helper on the admin/product_properties view
+      skip_before_filter :load_resource, :only => [:destroy]
+
+      def destroy
+        product_property = Spree::ProductProperty.find(params[:id])
+        product_property.destroy
+        render :text => nil
+      end
+
       private
         def find_properties
           @properties = Spree::Property.pluck(:name)

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

@@ -16,6 +16,15 @@ module Spree
         respond_with(@collection)
       end
 
+      def search
+        if params[:ids]
+          @products = Spree::Product.where(:id => params[:ids].split(","))
+        else
+          search_params = { :name_cont => params[:q], :sku_cont => params[:q] }
+          @products = Spree::Product.ransack(search_params.merge(:m => 'or')).result
+        end
+      end
+
       def update
         if params[:product][:taxon_ids].present?
           params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')

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

@@ -132,13 +132,6 @@ module Spree
         }.join("<br />").html_safe
       end
 
-      def product_picker_field(name, value)
-        products = Product.with_ids(value.split(','))
-        product_names = products.inject({}){|memo,item| memo[item.id] = item.name; memo}
-        product_rules = products.collect{ |p| { :id => p.id, :name => p.name } }
-        %(<input type="text" name="#{name}" value="#{value}" class="tokeninput products" data-names='#{product_names.to_json}' data-pre='#{product_rules.to_json}'/>).html_safe
-      end
-
       def link_to_add_fields(name, target, options = {})
         name = '' if options[:no_text]
         css_classes = options[:class] ? options[:class] + " add_fields" : "add_fields"
@@ -150,7 +143,8 @@ module Spree
         name = '' if options[:no_text]
         options[:class] = '' unless options[:class]
         options[:class] += 'no-text with-tip' if options[:no_text]
-        link_to_with_icon('icon-trash', name, '#', :class => "remove_fields #{options[:class]}", :data => {:action => 'remove'}, :title => t(:remove)) + f.hidden_field(:_destroy)
+        url = f.object.persisted? ? [:admin, f.object] : '#'
+        link_to_with_icon('icon-trash', name, url, :class => "remove_fields #{options[:class]}", :data => {:action => 'remove'}, :title => t(:remove)) + f.hidden_field(:_destroy)
       end
 
       def spree_dom_id(record)

data/app/models/spree/app_configuration.rb

@@ -61,6 +61,7 @@ module Spree
     preference :show_only_complete_orders_by_default, :boolean, :default => true
     preference :show_zero_stock_products, :boolean, :default => true
     preference :show_variant_full_price, :boolean, :default => false #Displays variant full price or difference with product price. Default false to be compatible with older behavior
+    preference :show_products_without_price, :boolean, :default => false
     preference :site_name, :string, :default => 'Spree Demo Site'
     preference :site_url, :string, :default => 'demo.spreecommerce.com'
     preference :tax_using_ship_address, :boolean, :default => true