spree_core 0.30.0.beta1 → 0.30.0

data/{lib/generators/templates/public → public}/javascripts/admin.js

@@ -36,7 +36,7 @@ var request = function(options) {
   jQuery.ajax(jQuery.extend({ dataType: 'script', url: options.url, type: 'get' }, options));
   return false;
 };
- 
+
 // remote links handler
 jQuery('a[data-remote=true]').live('click', function() {
   if(confirm_msg = jQuery(this).attr("data-confirm")){
@@ -68,7 +68,7 @@ jQuery('a[data-remote=true]').live('click', function() {
     return false;
   }
 });
- 
+
 // remote forms handler
 jQuery('form[data-remote=true]').live('submit', function() {
   return request({ url : this.action, type : this.method, data : jQuery(this).serialize() });
@@ -155,7 +155,7 @@ prep_autocomplete_data = function(data){
 }
 
 jQuery.fn.product_autocomplete = function(){
-  $(this).autocomplete("/admin/products.json", {
+  $(this).autocomplete("/admin/products.json?authenticity_token=" + $('meta[name=csrf-token]').attr("content"), {
       parse: prep_autocomplete_data,
       formatItem: function(item) {
         return format_autocomplete(item);
@@ -176,7 +176,7 @@ jQuery.fn.product_autocomplete = function(){
 
 
 jQuery.fn.objectPicker = function(url){
-  jQuery(this).tokenInput(url, {
+  jQuery(this).tokenInput(url + "&authenticity_token=" + AUTH_TOKEN, {
     searchDelay          : 600,
     hintText             : strings.type_to_search,
     noResultsText        : strings.no_results,
@@ -199,10 +199,10 @@ jQuery(document).ready(function() {
 
 });
 
-function add_fields(target, association, content) {  
-  var new_id = new Date().getTime();  
-  var regexp = new RegExp("new_" + association, "g");  
-  $(target).append(content.replace(regexp, new_id));  
+function add_fields(target, association, content) {
+  var new_id = new Date().getTime();
+  var regexp = new RegExp("new_" + association, "g");
+  $(target).append(content.replace(regexp, new_id));
 }
 
 jQuery('a.remove_fields').live('click', function() {
@@ -214,12 +214,12 @@ jQuery('a.remove_fields').live('click', function() {
 jQuery(".observe_field").live('change', function() {
   target = $(this).attr("data-update");
   ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';
-  $(target).hide(); 
+  $(target).hide();
   $(ajax_indicator).show();
-  $.get($(this).attr("data-base-url")+encodeURIComponent($(this).val()), 
+  $.get($(this).attr("data-base-url")+encodeURIComponent($(this).val()),
     function(data) {
       $(target).html(data);
-      $(ajax_indicator).hide(); 
+      $(ajax_indicator).hide();
       $(target).show();
     }
   );

data/{lib/generators/templates/public → public}/javascripts/admin/checkouts/edit.js

@@ -40,7 +40,7 @@ jQuery(document).ready(function(){
     });
   }
 
-  $("#customer_search").autocomplete("/admin/users.json", {
+  $("#customer_search").autocomplete("/admin/users.json?authenticity_token=" + $('meta[name=csrf-token]').attr("content"), {
     minChars: 5,
     delay: 1500,
     parse: prep_autocomplete_data,

data/{lib/generators/templates/public → public}/javascripts/application.js

@@ -1,12 +1,12 @@
 (function($){
   $(document).ready(function(){
 
-    // Remove an item from the cart by setting its quantity to zero and posting the update form 
+    // Remove an item from the cart by setting its quantity to zero and posting the update form
     $('form#updatecart a.delete').show().click(function(){
-      $(this).parents('tr').find('input').val(0);
+      $(this).parents('tr').find('input.line_item_quantity').val(0);
       $(this).parents('form').submit();
       return false;
     });
-    
+
   });
 })(jQuery);

data/{lib/generators/templates/public → public}/javascripts/checkout.js

@@ -3,20 +3,13 @@
 
     $('#checkout_form_address').validate();
 
-    $('input#order_use_billing').click(function() {
-      if(this.checked) {
-        $('#shipping .inner').hide();
-        $('#shipping .inner input, #shipping .inner select').attr('disabled', 'disabled');
-      } else {
-        $('#shipping .inner').show();
-        $('#shipping .inner input, #shipping .inner select').removeAttr('disabled', 'disabled');
-      }
-    }).triggerHandler('click');
-
-
-    var update_state = function(region) {
+    var get_states = function(region){
       var country        = $('span#' + region + 'country :only-child').val();
-      var states         = state_mapper[country];
+      return state_mapper[country];
+    }
+    
+    var update_state = function(region) {
+      var states         = get_states(region);
 
       var state_select = $('span#' + region + 'state select');
       var state_input = $('span#' + region + 'state input');
@@ -34,7 +27,7 @@
           }
           state_select.append(opt);
         });
-        state_select.removeAttr('disabled').show();;
+        state_select.removeAttr('disabled').show();
         state_input.hide().attr('disabled', 'disabled');
 
       } else {
@@ -45,7 +38,7 @@
     };
 
     // Show fields for the selected payment method
-    $("input[type='radio'][name='checkout[payments_attributes][][payment_method_id]']").click(function(){
+    $("input[type='radio'][name='order[payments_attributes][][payment_method_id]']").click(function(){
       $('#payment-methods li').hide();
       if(this.checked){ $('#payment_method_'+this.value).show(); }
     }).triggerHandler('click');
@@ -55,6 +48,24 @@
     update_state('b');
     update_state('s');
 
+    $('input#order_use_billing').click(function() {
+      if($(this).is(':checked')) {
+        $('#shipping .inner input, #shipping .inner select, #shipping .inner label, #shipping .inner .req').hide();
+        $('#shipping .inner input, #shipping .inner select').attr('disabled', 'disabled');
+      } else {
+        $('#shipping .inner input, #shipping .inner select, #shipping .inner label, #shipping .inner .req').show();
+        $('#shipping .inner input, #shipping .inner select').removeAttr('disabled', 'disabled');
+
+        //only want to enable relevant field
+        if(get_states('s')){
+          $('span#sstate input').hide().attr('disabled', 'disabled');
+        }else{
+          $('span#sstate select').hide().attr('disabled', 'disabled');
+        }
+
+      }
+    }).triggerHandler('click');
+
     $('form.edit_checkout').submit(function() {
       $(this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass('disabled');
     });