spree_backend 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eea403d8dc1a1a649cab2e0ee1f8536155504623
-  data.tar.gz: edae6e9b6e61d665ec40de4416d2dd97148a79c4
+  metadata.gz: 2d5d1d087b80b4d4ccb804eb2282ee51a8abdb20
+  data.tar.gz: 821bef1778e272492e163c1e983fcddbd9fec6fe
 SHA512:
-  metadata.gz: fe3cb526c9276e7f0cdd1fe8e9b975f175f43e9beb9a767ba4a6ff6e87d6f85e5efc1f70cb0988652cfcc518d03b4faf7d7b2819cc40c84c3b838015f54b33f9
-  data.tar.gz: f986b8f5a62b5fec1db0540b321336e7c9e8e9a898cd6f0e070dbf55d5762d14f34020962fe297552cd45ee689ba32fcfac62b9a3a7975c0c3267f0b8d8988a9
+  metadata.gz: a2a653988067c0e6dc42a69ebfe7f95074f93caa8217a32fc0684c2dc79406d546961743b17e6fa1365325d5d79b3a322f498d951e18b3e15e2c839a2cefc11b
+  data.tar.gz: 72f6eec30e2ab2bcd16718c65fc91d71d0e820e7e9120e3a9a26c46983e584746b238e7a239b0f0316459c4e5daadcdf2a366944107863bd70c1ba7e4757865b

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

@@ -1,27 +1,31 @@
-var update_state = function(region) {
-  var country        = $('span#' + region + 'country .select2').select2('val');
+var update_state = function (region) {
+  'use strict';
 
-  var state_select   = $('span#' + region + 'state select.select2');
-  var state_input    = $('span#' + region + 'state input.state_name');
+  var country = $('span#' + region + 'country .select2').select2('val');
+  var state_select = $('span#' + region + 'state select.select2');
+  var state_input = $('span#' + region + 'state input.state_name');
 
-  $.get(Spree.routes.states_search + "?country_id=" + country, function(data) {
-    var states = data["states"]
+  $.get(Spree.routes.states_search + '?country_id=' + country, function (data) {
+    var states = data.states;
     if (states.length > 0) {
       state_select.html('');
-      var states_with_blank = [{name: '', id: ''}].concat(states);
-      $.each(states_with_blank, function(pos,state) {
+      var states_with_blank = [{
+        name: '',
+        id: ''
+      }].concat(states);
+      $.each(states_with_blank, function (pos, state) {
         var opt = $(document.createElement('option'))
-                  .attr('value', state.id)
-                  .html(state.name);
+          .attr('value', state.id)
+          .html(state.name);
         state_select.append(opt);
       });
-      state_select.prop("disabled", false).show();
+      state_select.prop('disabled', false).show();
       state_select.select2();
-      state_input.hide().prop("disabled", true);
+      state_input.hide().prop('disabled', true);
 
     } else {
-      state_input.prop("disabled", false).show();
+      state_input.prop('disabled', false).show();
       state_select.select2('destroy').hide();
     }
-  })
-};
+  });
+};

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

@@ -13,11 +13,6 @@ Hopefully, this will evolve into a propper class.
 **/
 
 jQuery(function($) {
-  // Make main menu use full width
-  $('.fullwidth-menu').horizontalNav({
-    tableDisplay: false,
-    responsiveDelay: 0
-  });
 
   // Vertical align of checkbox fields
   $('.field.checkbox label').vAlign()
@@ -117,6 +112,7 @@ handle_date_picker_fields = function(){
     dateFormat: Spree.translations.date_picker,
     dayNames: Spree.translations.abbr_day_names,
     dayNamesMin: Spree.translations.abbr_day_names,
+    firstDay: Spree.translations.first_day,
     monthNames: Spree.translations.month_names,
     prevText: Spree.translations.previous,
     nextText: Spree.translations.next,

data/app/assets/javascripts/admin/nested-attribute.js

@@ -1,23 +1,27 @@
-//On page load 
-replace_ids = function(s){
+// On page load
+var replace_ids = function (s) {
   var new_id = new Date().getTime();
   return s.replace(/NEW_RECORD/g, new_id);
-}
+};
+
+$(function () {
+  'use strict';
 
-$(function() {
-  $('a[id*=nested]').click(function() { 
+  $('a[id*=nested]').on('click', function () {
     var template = $(this).attr('href').replace(/.*#/, '');
-    html = replace_ids(eval(template));
+    var html = replace_ids(eval(template));
     $('#ul-' + $(this).attr('id')).append(html);
     update_remove_links();
-  });  
+  });
   update_remove_links();
-})   
+});
 
-var update_remove_links = function() {
-  $('.remove').click(function() {
+var update_remove_links = function () {
+  'use strict';
+
+  $('.remove').on('click', function () {
     $(this).prevAll(':first').val(1);
     $(this).parent().hide();
     return false;
   });
-};
+};

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

@@ -1,34 +1,38 @@
-$(document).ready(function() {
-  if ($("#product_option_type_ids").length > 0) {
-    $("#product_option_type_ids").select2({
+$(document).ready(function () {
+  'use strict';
+
+  if ($('#product_option_type_ids').length > 0) {
+    $('#product_option_type_ids').select2({
       placeholder: Spree.translations.option_type_placeholder,
       multiple: true,
-      initSelection: function(element, callback) {
-        return $.getJSON(Spree.routes.option_type_search + "?ids=" + (element.val()), null, function(data) {
+      initSelection: function (element, callback) {
+        return $.getJSON(Spree.routes.option_type_search + '?ids=' + (element.val()), null, function (data) {
           return callback(data);
-        })
+        });
       },
       ajax: {
         url: Spree.routes.option_type_search,
         quietMillis: 200,
         datatype: 'json',
-        data: function(term, page) {
+        data: function (term) {
           return {
             q: {
               name_cont: term
             }
-          }
+          };
         },
-        results: function (data, page) {
-          return { results: data }
+        results: function (data) {
+          return {
+            results: data
+          };
         }
       },
-      formatResult: function(option_type) {
-        return option_type.presentation + " (" + option_type.name + ")"
+      formatResult: function (option_type) {
+        return option_type.presentation + ' (' + option_type.name + ')';
       },
-      formatSelection: function(option_type) {
-        return option_type.presentation + " (" + option_type.name + ")"
+      formatSelection: function (option_type) {
+        return option_type.presentation + ' (' + option_type.name + ')';
       }
-    })
+    });
   }
-})
+});

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

@@ -1,17 +1,22 @@
-$(document).ready(function() {
+$(document).ready(function () {
+  'use strict';
 
-  $("#add_line_item_to_order").on("click", function() {
-    if($('#add_variant_id').val() == ''){ return false; }
+  $('#add_line_item_to_order').on('click', function () {
+    if ($('#add_variant_id').val() === '') {
+      return false;
+    }
 
-    update_target = '#' + $(this).attr("data-update");
-    $.post(this.href,
-           { "line_item[variant_id]": $('#add_variant_id').val(),
-             "line_item[quantity]": $('#add_quantity').val() },
-           function(data) {
-             $(update_target).html(data);
-           });
+    var update_target = '#' + $(this).attr('data-update');
+    $.post(this.href, {
+        'line_item[variant_id]': $('#add_variant_id').val(),
+        'line_item[quantity]': $('#add_quantity').val()
+      },
+
+      function (data) {
+        $(update_target).html(data);
+      });
     return false;
   });
 
-  $('[data-hook="add_product_name"]').find(".variant_autocomplete").variantAutocomplete();
-});
+  $('[data-hook="add_product_name"]').find('.variant_autocomplete').variantAutocomplete();
+});

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

@@ -1,16 +1,20 @@
-$(document).ready(function() {
-  $.each($('td.qty input'), function(i, input) {
+$(document).ready(function () {
+  'use strict';
 
-    $(input).on('change', function() {
+  $.each($('td.qty input'), function (i, input) {
 
-      var id = "#" + $(this).attr('id').replace("_quantity", "_id");
+    $(input).on('change', function () {
 
-      jQuery.post("/admin/orders/" + $('input#order_number').val() + "/line_items/" + $(id).val(),
-        { _method: "put", "line_item[quantity]": $(this).val()},
-        function(resp) {
-          $('#order-form-wrapper').html(resp.responseText);
-      })
-    })
-  })
-});
+      var id = '#' + $(this).attr('id').replace('_quantity', '_id');
+
+      $.post('/admin/orders/' + $('input#order_number').val() + '/line_items/' + $(id).val(), {
+          _method: 'put',
+          'line_item[quantity]': $(this).val()
+        },
 
+        function (resp) {
+          $('#order-form-wrapper').html(resp.responseText);
+        });
+    });
+  });
+});

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

@@ -1,37 +1,43 @@
-$.fn.productAutocomplete = function() {
+$.fn.productAutocomplete = function () {
+  'use strict';
+
   this.select2({
     minimumInputLength: 1,
     multiple: true,
-    initSelection: function(element, callback) {
-      $.get(Spree.routes.product_search, { ids: element.val().split(',') }, function(data) { 
-        callback(data['products'])
-      })
+    initSelection: function (element, callback) {
+      $.get(Spree.routes.product_search, {
+        ids: element.val().split(',')
+      }, function (data) {
+        callback(data.products);
+      });
     },
     ajax: {
       url: Spree.routes.product_search,
       datatype: 'json',
-      data: function(term, page) {
-        return { 
+      data: function (term, page) {
+        return {
           q: {
             name_cont: term,
-            sku_cont: term,
+            sku_cont: term
           },
-          m: "OR"
-        }
+          m: 'OR'
+        };
       },
-      results: function(data, page) {
-        return { results: data['products'] }
+      results: function (data, page) {
+        return {
+          results: data.products
+        };
       }
     },
-    formatResult: function(product) {
+    formatResult: function (product) {
       return product.name;
     },
-    formatSelection: function(product) {
+    formatSelection: function (product) {
       return product.name;
     }
   });
-}
+};
 
 $(document).ready(function () {
   $('.product_picker').productAutocomplete();
-})
+});

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

@@ -1,17 +1,18 @@
-var initProductActions = function(){
+var initProductActions = function () {
+  'use strict';
 
   // Add classes on promotion items for design
-  $(document).on('mouseover mouseout', 'a.delete', function(event) {
-    if (event.type == 'mouseover') {
+  $(document).on('mouseover mouseout', 'a.delete', function (event) {
+    if (event.type === 'mouseover') {
       $(this).parent().addClass('action-remove');
     } else {
       $(this).parent().removeClass('action-remove');
     }
   });
 
-  $('#promotion-filters').find(".variant_autocomplete").variantAutocomplete();
+  $('#promotion-filters').find('.variant_autocomplete').variantAutocomplete();
 
-  $('.calculator-fields').each(function(){
+  $('.calculator-fields').each(function () {
     var $fields_container = $(this);
     var $type_select = $fields_container.find('.type-select');
     var $settings = $fields_container.find('.settings');
@@ -19,15 +20,15 @@ var initProductActions = function(){
     var originalType = $type_select.val();
 
     $warning.hide();
-    $type_select.change(function(){
-      if( $(this).val() == originalType ){
+    $type_select.change(function () {
+      if ($(this).val() === originalType) {
         $warning.hide();
         $settings.show();
         $settings.find('input').removeAttr('disabled');
       } else {
         $warning.show();
         $settings.hide();
-        $settings.find('input').attr('disabled', 'disabled');
+        $settings.find('input').prop('disabled', 'disabled');
       }
     });
   });
@@ -35,10 +36,10 @@ var initProductActions = function(){
   //
   // CreateLineItems Promotion Action
   //
-  ( function(){
-    var hideOrShowItemTables = function(){
-      $('.promotion_action table').each(function(){
-        if($(this).find('td').length == 0){
+  (function () {
+    var hideOrShowItemTables = function () {
+      $('.promotion_action table').each(function () {
+        if ($(this).find('td').length === 0) {
           $(this).hide();
         } else {
           $(this).show();
@@ -48,11 +49,11 @@ var initProductActions = function(){
     hideOrShowItemTables();
 
     // Remove line item
-    var setupRemoveLineItems = function(){
-      $(".remove_promotion_line_item").click(function(){
-        line_items_el = $($('.line_items_string')[0])
-        finder = RegExp($(this).data("variant-id") + "x\\d+")
-        line_items_el.val(line_items_el.val().replace(finder, ""))
+    var setupRemoveLineItems = function () {
+      $('.remove_promotion_line_item').on('click', function () {
+        var line_items_el = $($('.line_items_string')[0]);
+        var finder = new RegExp($(this).data('variant-id') + "x\\d+");
+        line_items_el.val(line_items_el.val().replace(finder, ''));
         $(this).parents('tr').remove();
         hideOrShowItemTables();
       });
@@ -60,39 +61,37 @@ var initProductActions = function(){
 
     setupRemoveLineItems();
     // Add line item to list
-    $(".promotion_action.create_line_items button.add").unbind('click').click(function(e){
+    $('.promotion_action.create_line_items button.add').unbind('click').click(function () {
       var $container = $(this).parents('.promotion_action');
-      var product_name = $container.find("input[name='add_product_name']").val();
-      var variant_id = $container.find("input[name='add_variant_id']").val();
-      var quantity = $container.find("input[name='add_quantity']").val();
-      if(variant_id){
+      var product_name = $container.find('input[name="add_product_name"]').val();
+      var variant_id = $container.find('input[name="add_variant_id"]').val();
+      var quantity = $container.find('input[name="add_quantity"]').val();
+      if (variant_id) {
         // Add to the table
-        var newRow = "<tr><td>" + product_name + "</td><td>" + quantity + "</td><td><img src='/assets/admin/icons/cross.png' /></td></tr>";
+        var newRow = '<tr><td>' + product_name + '</td><td>' + quantity + '</td><td><img src="/assets/admin/icons/cross.png"/></td></tr>';
         $container.find('table').append(newRow);
         // Add to serialized string in hidden text field
-        var $hiddenField = $container.find(".line_items_string");
-        $hiddenField.val($hiddenField.val() + "," + variant_id + "x" + quantity);
+        var $hiddenField = $container.find('.line_items_string');
+        $hiddenField.val($hiddenField.val() + ',' + variant_id + 'x' + quantity);
         setupRemoveLineItems();
         hideOrShowItemTables();
       }
       return false;
     });
 
-  } )();
+  })();
 
-}
+};
+
+$(document).ready(function () {
 
-$(document).ready(function() {
   initProductActions();
 
   // toggle fields for specific events
-  $('#promotion_event_name').change(function() {
-    $('#promotion_code_field').toggle($('#promotion_event_name').val() == 'spree.checkout.coupon_code_added');
-    $('#promotion_path_field').toggle($('#promotion_event_name').val() == 'spree.content.visited');
+  $('#promotion_event_name').on('change', function () {
+    $('#promotion_code_field').toggle($('#promotion_event_name').val() === 'spree.checkout.coupon_code_added');
+    $('#promotion_path_field').toggle($('#promotion_event_name').val() === 'spree.content.visited');
   });
   $('#promotion_event_name').change();
 
-});
-
-
-
+});

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

@@ -1,64 +1,72 @@
-<%#encoding: UTF-8%>
 // Shipments AJAX API
+$(document).ready(function () {
+  'use strict';
 
-$(document).ready(function() {
-
-  //handle ship click
-  $('[data-hook=admin_order_edit_form] a.ship').click(function(){
+  // handle ship click
+  $('[data-hook=admin_order_edit_form] a.ship').on('click', function () {
     var link = $(this);
     var shipment_number = link.data('shipment-number');
-    var url = Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number + "/ship.json");
+    var url = Spree.url(Spree.routes.orders_api + '/' + order_number + '/shipments/' + shipment_number + '/ship.json');
     $.ajax({
-      type: "PUT",
+      type: 'PUT',
       url: url
-    }).done(function( msg ) {
+    }).done(function () {
       window.location.reload();
-    }).error(function( msg ) {
+    }).error(function (msg) {
       console.log(msg);
     });
   });
 
-  //handle shipping method edit click
+  // handle shipping method edit click
   $('a.edit-method').click(toggleMethodEdit);
   $('a.cancel-method').click(toggleMethodEdit);
 
-  //handle shipping method save
-  $('[data-hook=admin_order_edit_form] a.save-method').click(function(){
+  // handle shipping method save
+  $('[data-hook=admin_order_edit_form] a.save-method').on('click', function () {
     var link = $(this);
     var shipment_number = link.data('shipment-number');
     var selected_shipping_rate_id = link.parents('tbody').find("select#selected_shipping_rate_id[data-shipment-number='" + shipment_number + "']").val();
     var unlock = link.parents('tbody').find("input[name='open_adjustment'][data-shipment-number='" + shipment_number + "']:checked").val();
-    var url = Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number + ".json");
+    var url = Spree.url(Spree.routes.orders_api + '/' + order_number + '/shipments/' + shipment_number + '.json');
 
     $.ajax({
-      type: "PUT",
+      type: 'PUT',
       url: url,
-      data: { shipment: { selected_shipping_rate_id: selected_shipping_rate_id, unlock: unlock  } }
-    }).done(function( msg ) {
+      data: {
+        shipment: {
+          selected_shipping_rate_id: selected_shipping_rate_id,
+          unlock: unlock
+        }
+      }
+    }).done(function () {
       window.location.reload();
-    }).error(function( msg ) {
+    }).error(function (msg) {
       console.log(msg);
     });
   });
 
-  //handle tracking edit click
-  $('a.edit-tracking').click(toggleTrackingEdit);
-  $('a.cancel-tracking').click(toggleTrackingEdit);
+  // handle tracking edit click
+  $('a.edit-tracking').on('click', toggleTrackingEdit);
+  $('a.cancel-tracking').on('click', toggleTrackingEdit);
 
-  //handle tracking save
-  $('[data-hook=admin_order_edit_form] a.save-tracking').click(function(){
+  // handle tracking save
+  $('[data-hook=admin_order_edit_form] a.save-tracking').on('click', function () {
     var link = $(this);
     var shipment_number = link.data('shipment-number');
     var tracking = link.parents('tbody').find('input#tracking').val();
-    var url = Spree.url( Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number + ".json");
+    var url = Spree.url(Spree.routes.orders_api + '/' + order_number + '/shipments/' + shipment_number + '.json');
 
     $.ajax({
-      type: "PUT",
+      type: 'PUT',
       url: url,
-      data: { shipment: { tracking: tracking } }
-    }).done(function( msg ) {
+      data: {
+        shipment: {
+          tracking: tracking
+        }
+      }
+    }).done(function () {
       window.location.reload();
-    }).error(function( msg ) {
+    }).error(function (msg) {
       console.log(msg);
     });
   });

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

@@ -2,7 +2,8 @@
 jQuery(function($) {
   // Make select beautiful
   $('select.select2').select2({
-    allowClear: true
+    allowClear: true,
+    dropdownAutoWidth: true
   });
 
   function format_taxons(taxon) {

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

@@ -13,7 +13,6 @@
 //= require jquery.adaptivemenu
 //= require equalize
 //= require responsive-tables
-//= require jquery.horizontalNav
 //= require spree
 //= require admin/spree-select2
 //= require_tree .

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

@@ -1,9 +1,11 @@
-$(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);
-	});
+$(document).ready(function () {
+  'use strict';
+
+  $('#country').on('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/stock_management.js.coffee

@@ -1,7 +1,7 @@
 jQuery ->
-  $('.stock_item_backorderable').live 'click', ->
+  $('.stock_item_backorderable').on 'click', ->
     $(@).parent('form').submit()
-  $('.toggle_stock_item_backorderable').submit ->
+  $('.toggle_stock_item_backorderable').on 'submit', ->
     $.ajax
       type: @method
       url: @action