spree_core 1.1.6 → 1.2.0.rc1

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

@@ -1,5 +1,6 @@
-//<%#encoding: UTF-8%>
 //= require_self
+//= require admin/product_autocomplete
+//= require select2
 
 /**
 This is a collection of javascript functions and whatnot
@@ -44,129 +45,13 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
   });
 }
 
-// Product autocompletion
-image_html = function(item){
-  return "<img src='" + item['images'][0]["mini_url"] + "'/>";
-}
-
-format_product_autocomplete = function(item){
-  var html = "";
-
-  var product = item.data['product'];
-
-  if(item.data['variant']==undefined){
-    if(product['images'].length!=0){
-      html = image_html(product);
-    }
-
-    html += "<div><h4>" + product['name'] + "</h4>";
-    if (product['master']) {
-      html += "<span><strong>" + Spree.translations.sku + ":</strong>" + product['master']['sku'] + "</span>";
-    }
-    html += "<span><strong>" + Spree.translations.on_hand + ":</strong>" + product['count_on_hand'] + "</span></div>";
-  }else{
-    // variant
-    var variant = item.data['variant'];
-    var name = item.data.product['name'];
-
-    if(variant['images'].length!=0){
-      html = image_html(variant);
-    }else{
-      if(product['images'].length!=0){
-        html = image_html(product);
-      }
-    }
-
-    name += " - " + $.map(variant['option_values'], function(option_value){
-      return option_value["option_type"]["presentation"] + ": " + option_value['presentation'];
-    }).join(", ")
-
-    html += "<div><h4>" + name + "</h4>";
-    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
-}
-
-prep_product_autocomplete_data = function(data){
-  return $.map(eval(data), function(row) {
-
-    var product = row['product'];
-
-    if(product['variants'].length>0 && ['expand_variants']){
-      //variants
-      return $.map(product['variants'], function(variant){
-
-        var name = product['name'];
-        name += " - " + $.map(variant['option_values'], function(option_value){
-          return option_value["option_type"]["presentation"] + ": " + option_value['presentation'];
-        }).join(", ");
-
-        return {
-            data: {product: product, variant: variant},
-            value: name,
-            result: name
-        }
-      });
-    }else{
-      return {
-          data: {product: product},
-          value: product['name'],
-          result: product['name']
-      }
-    }
-  });
-}
-
-$.fn.product_autocomplete = function(){
-  return this.each(function() {
-    $(this).autocomplete({
-      source: function(request, response) {
-        $.get(Spree.routes.product_search + '?' + jQuery.param({ q: $('#add_product_name').val(), authenticity_token: encodeURIComponent($('meta[name=csrf-token]').attr("content"))}), function(data) {
-          result = prep_product_autocomplete_data(data)
-          response(result);
-        });
-      },
-      minLength: 4,
-      focus: function(event, ui) {
-        $('#add_product_name').val(ui.item.label);
-        return false;
-      },
-      select: function(event, ui) {
-        $('#add_product_name').val(ui.item.label);
-        product = ui.item.data;
-        if (product['variant'] == undefined) {
-          // product
-          $('#add_variant_id').val(product['product']['master']['id']);
-        } else {
-          // variant
-          $('#add_variant_id').val(product['variant']['id']);
-        }
-        return false;
-      }
-    }).data("autocomplete")._renderItem = function(ul, item) {
-      $(ul).addClass('ac_results');
-      html = format_product_autocomplete(item);
-      return $("<li></li>")
-              .data("item.autocomplete", item)
-              .append("<a>" + html + "</a>")
-              .appendTo(ul);
-    }
-
-    $(this).data("autocomplete")._resizeMenu = function() {
-      var ul = this.menu.element;
-      ul.outerWidth(this.element.outerWidth());
-    }
-  });
-}
 
 $.fn.objectPicker = function(url){
   $(this).tokenInput(url + "&authenticity_token=" + escape(AUTH_TOKEN), {
     searchDelay          : 600,
-    hintText             : Spree.translations.type_to_search,
-    noResultsText        : Spree.translations.no_results,
-    searchingText        : Spree.translations.searching,
+    hintText             : strings.type_to_search,
+    noResultsText        : strings.no_results,
+    searchingText        : strings.searching,
     prePopulateFromInput : true
   });
 };
@@ -175,18 +60,14 @@ $.fn.productPicker = function(){
   $(this).objectPicker(Spree.routes.product_search_basic);
 }
 
-$.fn.userPicker = function(){
-  $(this).objectPicker(Spree.routes.user_search);
-}
-
 handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
-    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,
+    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) %>',
     showOn: "button",
     buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
     buttonImageOnly: true
@@ -194,6 +75,7 @@ handle_date_picker_fields = function(){
 }
 
 $(document).ready(function(){
+  handle_date_picker_fields();
   $(".observe_field").on('change', function() {
     target = $(this).attr("data-update");
     ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';
@@ -252,9 +134,6 @@ $(document).ready(function(){
   });
 
   $('.tokeninput.products').productPicker();
-  $('.tokeninput.users').userPicker();
-
-  handle_date_picker_fields();
 
   $('body').on('click', '.select_properties_from_prototype', function(){
     $("#busy_indicator").show();
@@ -294,9 +173,6 @@ $(document).ready(function(){
       });
   });
 
-});
-
-jQuery(document).ready(function() {
   $('a.dismiss').click(function() {
     $(this).parent().fadeOut();
   });

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

@@ -1,4 +1,5 @@
 $(document).ready(function(){
+
   add_address = function(addr){
     var html = "";
     if(addr!=undefined){
@@ -80,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').prop("disabled", false);
+        $('#guest_checkout_false').prob("disabled", false);
         return true;
       }
     }).data("autocomplete")._renderItem = function(ul, item) {
@@ -100,40 +101,6 @@ $(document).ready(function(){
 
   }
 
-
-
-  $('input#order_use_billing').click(function() {
-    show_billing(!$(this).is(':checked'));
-  });
-
-  $('#guest_checkout_true').change(function() {
-    $('#customer_search').val("");
-    $('#user_id').val("");
-    $('#checkout_email').val("");
-
-    $('#order_bill_address_attributes_firstname').val("");
-    $('#order_bill_address_attributes_lastname').val("");
-    $('#order_bill_address_attributes_company').val("");
-    $('#order_bill_address_attributes_address1').val("");
-    $('#order_bill_address_attributes_address2').val("");
-    $('#order_bill_address_attributes_city').val("");
-    $('#order_bill_address_attributes_zipcode').val("");
-    $('#order_bill_address_attributes_state_id').val("");
-    $('#order_bill_address_attributes_country_id').val("");
-    $('#order_bill_address_attributes_phone').val("");
-
-    $('#order_ship_address_attributes_firstname').val("");
-    $('#order_ship_address_attributes_lastname').val("");
-    $('#order_bill_address_attributes_company').val("");
-    $('#order_ship_address_attributes_address1').val("");
-    $('#order_ship_address_attributes_address2').val("");
-    $('#order_ship_address_attributes_city').val("");
-    $('#order_ship_address_attributes_zipcode').val("");
-    $('#order_ship_address_attributes_state_id').val("");
-    $('#order_ship_address_attributes_country_id').val("");
-    $('#order_ship_address_attributes_phone').val("");
-  });
-
   var show_billing = function(show) {
     if(show) {
       $('#shipping').show();
@@ -146,6 +113,22 @@ $(document).ready(function(){
     }
   }
 
+  $('input#order_use_billing').click(function() {
+    show_billing(!$(this).is(':checked'));
+  });
+
+  $('#guest_checkout_true').change(function() {
+    $('#customer_search').val("");
+    $('#user_id').val("");
+    $('#checkout_email').val("");
+
+    var fields = ["firstname", "lastname", "company", "address1", "address2",
+              "city", "zipcode", "state_id", "country_id", "phone"]
+    $.each(fields, function(i, field) {
+      $('#order_bill_address_attributes' + field).val("");
+      $('#order_ship_address_attributes' + field).val("");
+    })
+  });
 });
 
 

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

@@ -1,4 +1,4 @@
-$(function() {                                                                    
+$(function() {
   var original_gtwy_type = $('#gtwy-type').attr('value');
   $('div#gateway-settings-warning').hide();
   $('#gtwy-type').change(function() { 
@@ -10,4 +10,4 @@ $(function() {
       $('div#gateway-settings-warning').show();
     }
   });
-})
+})

data/app/assets/javascripts/admin/images/index.js.coffee

@@ -0,0 +1,12 @@
+$ ->
+  ($ '#new_image_link').click (event) ->
+    event.preventDefault()
+    ($ this).hide()
+    $.ajax
+      type: 'GET'
+      url: @href
+      data: (
+        authenticity_token: AUTH_TOKEN
+      )
+      success: (r) ->
+        ($ '#images').html r

data/app/assets/javascripts/admin/images/new.js.coffee

@@ -0,0 +1,4 @@
+($ '#cancel_link').click (event) ->
+  event.preventDefault()
+  ($ '#new_image_link').show()
+  ($ '#images').html('')

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

@@ -10,6 +10,6 @@ $(document).ready(function(){
     return false;
   });
 
-  $("#add_product_name").product_autocomplete();
+  $(".product_autocomplete").product_autocomplete();
 
 });

data/app/assets/javascripts/admin/orders/edit_form.js

@@ -4,8 +4,6 @@ $(document).ready(function() {
     $(input).on('change', function() {
 
       var id = "#" + $(this).attr('id').replace("_quantity", "_id");
-      console.log($(this))
-      console.log($(id))
 
       jQuery.post("/admin/orders/" + $('input#order_number').val() + "/line_items/" + $(id).val(),
         { _method: "put", "line_item[quantity]": $(this).val()},

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

@@ -0,0 +1,116 @@
+// Product autocompletion
+image_html = function(item){
+  return "<img src='" + item['images'][0]["mini_url"] + "'/>";
+}
+
+format_product_autocomplete = function(item){
+  var html = "";
+
+  var product = item.data['product'];
+
+  if(item.data['variant']==undefined){
+    if(product['images'].length!=0){
+      html = image_html(product);
+    }
+
+    html += "<div><h4>" + product['name'] + "</h4>";
+    if (product['master']) {
+      html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + product['master']['sku'] + "</span>";
+    }
+    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + product['count_on_hand'] + "</span></div>";
+  }else{
+    // variant
+    var variant = item.data['variant'];
+    var name = item.data.product['name'];
+
+    if(variant['images'].length!=0){
+      html = image_html(variant);
+    }else{
+      if(product['images'].length!=0){
+        html = image_html(product);
+      }
+    }
+
+    name += " - " + $.map(variant['option_values'], function(option_value){
+      return option_value["option_type"]["presentation"] + ": " + option_value['presentation'];
+    }).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>";
+  }
+
+  return html
+}
+
+prep_product_autocomplete_data = function(data){
+  return $.map(eval(data), function(row) {
+
+    var product = row['product'];
+
+    if(product['variants'].length>0 && ['expand_variants']){
+      //variants
+      return $.map(product['variants'], function(variant){
+
+        var name = product['name'];
+        name += " - " + $.map(variant['option_values'], function(option_value){
+          return option_value["option_type"]["presentation"] + ": " + option_value['presentation'];
+        }).join(", ");
+
+        return {
+            data: {product: product, variant: variant},
+            value: name,
+            result: name
+        }
+      });
+    }else{
+      return {
+          data: {product: product},
+          value: product['name'],
+          result: product['name']
+      }
+    }
+  });
+}
+
+$.fn.product_autocomplete = function(){
+  return this.each(function() {
+    $(this).autocomplete({
+      source: function(request, response) {
+        $.get(Spree.routes.product_search + '?' + jQuery.param({ q: $('.product_autocomplete').val(), authenticity_token: encodeURIComponent($('meta[name=csrf-token]').attr("content"))}), function(data) {
+          result = prep_product_autocomplete_data(data)
+          response(result);
+        });
+      },
+      minLength: 4,
+      focus: function(event, ui) {
+        $('.product_autocomplete').val(ui.item.label);
+        return false;
+      },
+      select: function(event, ui) {
+        $('.product_autocomplete').val(ui.item.label);
+        product = ui.item.data;
+        if (product['variant'] == undefined) {
+          // product
+          $('#add_variant_id').val(product['product']['master']['id']);
+        } else {
+          // variant
+          $('#add_variant_id').val(product['variant']['id']);
+        }
+        return false;
+      }
+    }).data("autocomplete")._renderItem = function(ul, item) {
+      $(ul).addClass('ac_results');
+      html = format_product_autocomplete(item);
+      return $("<li></li>")
+              .data("item.autocomplete", item)
+              .append("<a>" + html + "</a>")
+              .appendTo(ul);
+    }
+
+    $(this).data("autocomplete")._resizeMenu = function() {
+      var ul = this.menu.element;
+      ul.outerWidth(this.element.outerWidth());
+    }
+  });
+}