solidus_backend 1.1.4 → 1.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a424af68c70b4b40ab5322bfe67f822d1e8098e2
-  data.tar.gz: 83a0c987f9a21e98d72bba55c8bcb454cf02327f
+  metadata.gz: 05e360a1b3908a72fe9edc9a62364f678c10164c
+  data.tar.gz: e4344f4944cf1f4e1e50fbeb598796db5d53cd56
 SHA512:
-  metadata.gz: 692a1942d3463871dfced0cad56f7059012661cb7dc2b7780f520df05f47bae9bc631a3e57d0fa59a508f78bf062cc36800dd488f6e80e62c5eecf7ff4fa7dd8
-  data.tar.gz: 6281cc7731d9a867994d3e4c2daf2d84af1fcb8a24ca40bb473fa6ae35cdcc2d30f9e61c9d528813a201d35a84335022dc2cad1acc32114d2aedd528b5a7a4a2
+  metadata.gz: f9d2d66298b165a2f90bbcfdd789018b2a4050f963da76005eb3e7cc3fd3b9f32718e2f44da65e9ead2bc495f032b5af319833b4eda4201545495f641fbe16e5
+  data.tar.gz: 2c74297aae1f4c51e1db3a527878775c9af2587af57c1df6c78c904a89730b53c1a5d3789788a222d5007593c7a28abc6f79d60605ce89bcddbcf008933d68fb

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

@@ -16,9 +16,6 @@ Hopefully, this will evolve into a propper class.
 
 jQuery(function($) {
 
-  // Vertical align of checkbox fields
-  $('.field.checkbox label').vAlign()
-
   // Add some tips
   $('.with-tip').powerTip({
     smartPlacement: true,
@@ -48,9 +45,6 @@ jQuery(function($) {
     tr.prev().removeClass('before-' + klass);
   });
 
-  // Make height of dt/dd elements the same
-  $("dl").equalize('outerHeight');
-
 });
 
 
@@ -212,7 +206,7 @@ $(document).ready(function(){
             if (idAttr) {
               objId = idAttr.split('_').slice(-1);
               if (!isNaN(objId)) {
-                positions['positions['+objId+']'] = position;
+                positions['positions['+objId+']'] = position+1;
               }
             }
           });

data/app/assets/javascripts/spree/backend/checkouts/edit.js

@@ -24,7 +24,7 @@ $(document).ready(function() {
           }
         },
         results: function(data, page) {
-          return { results: data.users }
+          return { results: data }
         }
       },
       dropdownCssClass: 'customer_search',
@@ -52,7 +52,7 @@ $(document).ready(function() {
             });
           });
         }
-        return Select2.util.escapeMarkup(customer.email);
+        return customer.email;
       }
     })
   }

data/app/assets/javascripts/spree/backend/navigation.coffee

@@ -0,0 +1,10 @@
+navHeight = ->
+  $('.admin-nav-header').outerHeight() + $('.admin-nav-menu').outerHeight() + $('.admin-nav-footer').outerHeight()
+
+checkSideBarFit = ->
+  $('.admin-nav').toggleClass('fits', navHeight() < $(window).height())
+
+$ ->
+  $(".admin-nav-sticky, .admin-nav").stick_in_parent()
+  checkSideBarFit()
+  $(window).on('resize', checkSideBarFit)

data/app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb

@@ -1,10 +1,6 @@
 $(document).ready(function () {
   'use strict';
 
-  function formatOptionType(option_type) {
-    return Select2.util.escapeMarkup(option_type.presentation + ' (' + option_type.name + ')');
-  }
-
   if ($('#product_option_type_ids').length > 0) {
     $('#product_option_type_ids').select2({
       placeholder: Spree.translations.option_type_placeholder,
@@ -35,8 +31,12 @@ $(document).ready(function () {
           };
         }
       },
-      formatResult: formatOptionType,
-      formatSelection: formatOptionType
+      formatResult: 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/spree/backend/option_value_picker.js

@@ -6,10 +6,6 @@ $.fn.optionValueAutocomplete = function (options) {
   var multiple = typeof(options['multiple']) !== 'undefined' ? options['multiple'] : true;
   var productSelect = options['productSelect'];
 
-  function formatOptionValue(option_value) {
-    return Select2.util.escapeMarkup(option_value.name);
-  }
-
   this.select2({
     minimumInputLength: 3,
     multiple: multiple,
@@ -37,7 +33,11 @@ $.fn.optionValueAutocomplete = function (options) {
         return { results: data };
       }
     },
-    formatResult: formatOptionValue,
-    formatSelection: formatOptionValue
+    formatResult: function (option_value) {
+      return option_value.name;
+    },
+    formatSelection: function (option_value) {
+      return option_value.name;
+    }
   });
 };

data/app/assets/javascripts/spree/backend/product_picker.js

@@ -5,10 +5,6 @@ $.fn.productAutocomplete = function (options) {
   options = options || {}
   var multiple = typeof(options['multiple']) !== 'undefined' ? options['multiple'] : true
 
-  function formatProduct(product) {
-    return Select2.util.escapeMarkup(product.name);
-  }
-
   this.select2({
     minimumInputLength: 3,
     multiple: multiple,
@@ -43,8 +39,12 @@ $.fn.productAutocomplete = function (options) {
         };
       }
     },
-    formatResult: formatProduct,
-    formatSelection: formatProduct
+    formatResult: function (product) {
+      return product.name;
+    },
+    formatSelection: function (product) {
+      return product.name;
+    }
   });
 };
 

data/app/assets/javascripts/spree/backend/shipments.js.erb

@@ -50,11 +50,10 @@ $(document).ready(function () {
   $('a.delete-item').click(function(event){
     if (confirm(Spree.translations.are_you_sure_delete)) {
       var del = $(this);
-      var shipment_number = del.data('shipment-number');
-      var variant_id = del.data('variant-id');
+      var line_item_id = del.data('line-item-id');
 
       toggleItemEdit();
-      adjustShipmentItems(shipment_number, variant_id, 0);
+      deleteLineItem(line_item_id);
     }
     return false;
   });
@@ -171,6 +170,21 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
     }
 }
 
+deleteLineItem = function(line_item_id){
+  var url = Spree.routes.line_items_api(order_number) + "/" + line_item_id + ".json";
+
+  Spree.ajax({
+    type: "DELETE",
+    url: Spree.url(url),
+    success: function(response) {
+      window.location.reload();
+    },
+    error: function(response) {
+      show_flash('error', response.responseJSON.message);
+    }
+  });
+}
+
 toggleMethodEdit = function(){
   var link = $(this);
   link.parents('tbody').find('tr.edit-method').toggle();

data/app/assets/javascripts/spree/backend/stock_movement.js.coffee

@@ -17,5 +17,5 @@ jQuery ->
           return { results: data.stock_items, more: more }
       formatResult: (stock_item) ->
         variantTemplate({ variant: stock_item.variant })
-      formatSelection: (stock_item, container, excapeMarkup) ->
-        Select2.util.escapeMarkup("#{stock_item.variant.name} (#{stock_item.variant.options_text})")
+      formatSelection: (stock_item) ->
+        "#{stock_item.variant.name} (#{stock_item.variant.options_text})"

data/app/assets/javascripts/spree/backend/style_guide.coffee

@@ -0,0 +1,2 @@
+$ ->
+  $(".style-guide-nav, .style-guide-sidebar").stick_in_parent()

data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb

@@ -1,10 +1,6 @@
 'use strict';
 
 var set_taxon_select = function(){
-  function formatTaxon(taxon) {
-    return Select2.util.escapeMarkup(taxon.pretty_name);
-  }
-
   if ($('#product_taxon_ids').length > 0) {
     $('#product_taxon_ids').select2({
       placeholder: Spree.translations.taxon_placeholder,
@@ -41,8 +37,12 @@ var set_taxon_select = function(){
           };
         }
       },
-      formatResult: formatTaxon,
-      formatSelection: formatTaxon
+      formatResult: function (taxon) {
+        return taxon.pretty_name;
+      },
+      formatSelection: function (taxon) {
+        return taxon.pretty_name;
+      }
     });
   }
 }

data/app/assets/javascripts/spree/backend/taxonomy.js.coffee

@@ -1,120 +1,93 @@
-base_url = null
+taxons_template = null
+Handlebars.registerHelper 'isRootTaxon', ->
+  !@parent_id?
 
-tree_error_handler = (data) ->
-  rollback = data.rlbk
-  (XMLHttpRequest, textStatus, errorThrown) ->
-    $.jstree.rollback(rollback)
-    $("#ajax_error").show().html("<strong>#{server_error}</strong><br />" + taxonomy_tree_error)
-
-handle_move = (e, data) ->
-  position = data.rslt.cp
-  node = data.rslt.o
-  new_parent = data.rslt.np
-
-  url = "#{base_url}/#{node.prop("id")}"
+get_taxonomy = ->
   Spree.ajax
-    type: "PUT",
-    dataType: "json",
-    url: url,
-    data: ({"taxon[parent_id]": new_parent.prop("id"), "taxon[child_index]": position }),
-    error: tree_error_handler(data)
-
-  true
-
-handle_create = (e, data) ->
-  node = data.rslt.obj
-  name = data.rslt.name
-  position = data.rslt.position
-  new_parent = data.rslt.parent
+    url: "#{Spree.routes.taxonomy_path}?set=nested"
 
+create_taxon = ({name, parent_id, child_index}) ->
   Spree.ajax
     type: "POST",
     dataType: "json",
-    url: base_url,
-    data: {
-      "taxon[name]": name,
-      "taxon[parent_id]": new_parent.prop("id"),
-      "taxon[child_index]": position,
-    },
-    error: tree_error_handler(data)
-    success: (data,result) ->
-      node.prop('id', data.id)
-
-handle_rename = (e, data) ->
-  node = data.rslt.obj
-  name = data.rslt.new_name
-
-  url = "#{base_url}/#{node.prop("id")}"
+    url: Spree.routes.taxonomy_taxons_path,
+    data:
+      taxon: {name, parent_id, child_index}
+    complete: redraw_tree
 
+update_taxon = ({id, parent_id, child_index}) ->
   Spree.ajax
-    type: "PUT",
-    dataType: "json",
-    url: url,
-    data: {
-      "taxon[name]": name,
-    },
-    error: tree_error_handler(data)
-
-handle_delete = (e, data) ->
-  node = data.rslt.obj
-  delete_url = "#{base_url}/#{node.prop("id")}"
+    type: "PUT"
+    dataType: "json"
+    url: "#{Spree.routes.taxonomy_taxons_path}/#{id}"
+    data:
+      taxon: {parent_id, child_index}
+    error: redraw_tree
+
+delete_taxon = ({id}) ->
+  Spree.ajax
+    type: "DELETE"
+    dataType: "json"
+    url: "#{Spree.routes.taxonomy_taxons_path}/#{id}"
+    error: redraw_tree
+
+draw_tree = (taxonomy) ->
+  $('#taxonomy_tree')
+    .html( taxons_template({ taxons: [taxonomy.root] }) )
+    .find('ul')
+    .sortable
+      connectWith: '#taxonomy_tree ul'
+      placeholder: 'sortable-placeholder ui-state-highlight'
+      tolerance: 'pointer'
+      cursorAt: { left: 5 }
+
+redraw_tree = ->
+  get_taxonomy().done(draw_tree)
+
+resize_placeholder = (ui) ->
+  handleHeight = ui.helper.find('.sortable-handle').outerHeight()
+  ui.placeholder.height(handleHeight)
+
+restore_sort_targets = ->
+  $('.ui-sortable-over').removeClass('ui-sortable-over')
+
+highlight_sort_targets = (ui) ->
+  restore_sort_targets()
+  ui.placeholder.parents('ul').addClass('ui-sortable-over')
+
+handle_move = (el) ->
+  update_taxon
+    id: el.data('taxon-id')
+    parent_id: el.parent().closest('li').data('taxon-id')
+    child_index: el.index()
+
+handle_delete = (e) ->
+  el = $(e.target).closest('li')
   if confirm(Spree.translations.are_you_sure_delete)
-    Spree.ajax
-      type: "DELETE",
-      dataType: "json",
-      url: delete_url,
-      error: tree_error_handler(data)
-  else
-    $.jstree.rollback(data.rlbk)
-
-@setup_taxonomy_tree = (taxonomy_id) ->
-  if taxonomy_id != undefined
-    # this is defined within admin/taxonomies/edit
-    base_url = Spree.routes.taxonomy_taxons_path
-
-    Spree.ajax
-      url: base_url.replace("/taxons", "/jstree"),
-      success: (taxonomy) ->
-        last_rollback = null
+    delete_taxon({id: el.data('taxon-id')})
+    el.remove()
 
-        conf =
-          json_data:
-            data: taxonomy,
-            ajax:
-              headers: { "X-Spree-Token": Spree.api_key }
-              url: (e) ->
-                "#{base_url}/#{e.prop('id')}/jstree"
-          themes:
-            theme: "apple",
-            url: Spree.routes.jstree_theme_path
-          strings:
-            new_node: new_taxon,
-            loading: Spree.translations.loading + "..."
-          crrm:
-            move:
-              check_move: (m) ->
-                position = m.cp
-                node = m.o
-                new_parent = m.np
+get_create_handler = (taxonomy_id) ->
+  handle_create = (e) ->
+    e.preventDefault()
+    name = 'New node'
+    parent_id = taxonomy_id
+    child_index = 0
+    create_taxon({name, parent_id, child_index})
 
-                # no parent or cant drag and drop
-                if !new_parent || node.prop("rel") == "root"
-                  return false
-
-                # can't drop before root
-                if new_parent.prop("id") == "taxonomy_tree" && position == 0
-                  return false
-
-                true
-          contextmenu:
-            items: (obj) ->
-              taxon_tree_menu(obj, this)
-          plugins: ["themes", "json_data", "dnd", "crrm", "contextmenu"]
-
-        $("#taxonomy_tree").jstree(conf)
-          .bind("move_node.jstree", handle_move)
-          .bind("remove.jstree", handle_delete)
-          .bind("create.jstree", handle_create)
-          .bind("rename.jstree", handle_rename)
-          .bind "loaded.jstree", ->
-            $(this).jstree("core").toggle_node($('.jstree-icon').first())
+@setup_taxonomy_tree = (taxonomy_id) ->
+  return unless taxonomy_id?
+  taxons_template_text = $('#taxons-list-template').text()
+  taxons_template = Handlebars.compile(taxons_template_text)
+  Handlebars.registerPartial( 'taxons', taxons_template_text )
+  redraw_tree()
+  $('#taxonomy_tree').on
+      sortstart: (e, ui) ->
+        resize_placeholder(ui)
+      sortover: (e, ui) ->
+        highlight_sort_targets(ui)
+      sortstop: restore_sort_targets
+      sortupdate: (e, ui) ->
+        handle_move(ui.item) unless ui.sender?
+    .on('click', '.delete-taxon-button', handle_delete)
+  $('.add-taxon-button').on('click', get_create_handler(taxonomy_id))

data/app/assets/javascripts/spree/backend/taxons.js.coffee

@@ -45,9 +45,6 @@ $ ->
     sortable.trigger('sortupdate', item: draggable)
   , 250
 
-  formatTaxon = (taxon) ->
-    Select2.util.escapeMarkup(taxon.pretty_name)
-
   $('#taxon_id').select2
     dropdownCssClass: "taxon_select_box",
     placeholder: Spree.translations.find_a_taxon,
@@ -62,8 +59,10 @@ $ ->
       results: (data) ->
         results: data['taxons'],
         more: data.current_page < data.pages
-    formatResult: formatTaxon,
-    formatSelection: formatTaxon
+    formatResult: (taxon) ->
+      taxon.pretty_name
+    formatSelection: (taxon) ->
+      taxon.pretty_name
 
   $('#taxon_id').on "change", (e) ->
     Spree.ajax

data/app/assets/javascripts/spree/backend/user_picker.js

@@ -1,10 +1,6 @@
 $.fn.userAutocomplete = function () {
   'use strict';
 
-  function formatUser(user) {
-    return Select2.util.escapeMarkup(user.email);
-  }
-
   this.select2({
     minimumInputLength: 1,
     multiple: true,
@@ -12,7 +8,7 @@ $.fn.userAutocomplete = function () {
       $.get(Spree.routes.user_search, {
         ids: element.val()
       }, function (data) {
-        callback(data.users);
+        callback(data);
       });
     },
     ajax: {
@@ -27,12 +23,16 @@ $.fn.userAutocomplete = function () {
       },
       results: function (data) {
         return {
-          results: data.users
+          results: data
         };
       }
     },
-    formatResult: formatUser,
-    formatSelection: formatUser
+    formatResult: function (user) {
+      return user.email;
+    },
+    formatSelection: function (user) {
+      return user.email;
+    }
   });
 };
 

data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee.erb

@@ -33,8 +33,8 @@ $.fn.variantAutocomplete = (searchOptions = {}) ->
         results: data["variants"]
 
     formatResult: formatVariantResult
-    formatSelection: (variant, container, escapeMarkup) ->
+    formatSelection: (variant) ->
       if !!variant.options_text
-        Select2.util.escapeMarkup("#{variant.name} (#{variant.options_text}")
+        variant.name + " (#{variant.options_text})"
       else
-        Select2.util.escapeMarkup(variant.name)
+        variant.name

data/app/assets/javascripts/spree/backend.js

@@ -1,21 +1,18 @@
 //= require handlebars
 //= require jquery
 //= require jquery_ujs
+//= require jquery-migrate-1.0.0
 //= require jquery-ui/datepicker
 //= require jquery-ui/sortable
 //= require jquery-ui/autocomplete
-//= require modernizr
 //= require jquery.cookie
-//= require jquery.jstree/jquery.jstree
 //= require jquery.powertip
-//= require jquery.vAlign
-//= require equalize
-//= require responsive-tables
+//= require jquery.sticky-kit.min
 //= require underscore-min
 //= require backbone
+//= require prism
 //= require spree
 //= require ./backend/backbone-overrides
 //= require spree/backend/spree-select2
 //= require_tree ./backend/templates
 //= require_tree .
-

data/app/assets/stylesheets/spree/backend/components/_messages.scss

@@ -26,10 +26,7 @@
 }
 
 .flash-wrapper {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
+  @include position(fixed, null 0 0 $width-sidebar);
   z-index: 1000;
 }