spree_backend 2.4.10 → 3.0.0.rc1

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

@@ -13,15 +13,6 @@ $(document).ready(function () {
     $('#stock_details').show();
 
     $('button.add_variant').click(addVariantFromStockLocation);
-
-    // Add some tips
-    $('.with-tip').powerTip({
-      smartPlacement: true,
-      fadeInTime: 50,
-      fadeOutTime: 50,
-      intentPollInterval: 300
-    });
-
   });
 
   //handle edit click
@@ -66,10 +57,7 @@ $(document).ready(function () {
     var url = Spree.url(Spree.routes.shipments_api + '/' + shipment_number + '/ship.json');
     $.ajax({
       type: 'PUT',
-      url: url,
-      data: {
-        token: Spree.api_key
-      }
+      url: url
     }).done(function () {
       window.location.reload();
     }).error(function (msg) {
@@ -98,8 +86,7 @@ $(document).ready(function () {
         shipment: {
           selected_shipping_rate_id: selected_shipping_rate_id,
           unlock: unlock
-        },
-        token: Spree.api_key
+        }
       }
     }).done(function () {
       window.location.reload();
@@ -135,8 +122,7 @@ $(document).ready(function () {
       data: {
         shipment: {
           tracking: tracking
-        },
-        token: Spree.api_key
+        }
       }
     }).done(function (data) {
       link.parents('tbody').find('tr.edit-tracking').toggle();
@@ -168,13 +154,11 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
       $.ajax({
         type: "PUT",
         url: Spree.url(url),
-        data: {
-          variant_id: variant_id,
-          quantity: new_quantity,
-          token: Spree.api_key
-        }
+        data: { variant_id: variant_id, quantity: new_quantity }
       }).done(function( msg ) {
         window.location.reload();
+      }).fail(function(msg) {
+        alert(msg.responseJSON.message)
       });
     }
 }
@@ -216,8 +200,7 @@ startItemSplit = function(event){
     data: {
       q: {
         "id_eq": variant_id
-      },
-      token: Spree.api_key
+      }
     }
   }).success(function( data ) {
     variant = data['variants'][0];
@@ -231,13 +214,6 @@ startItemSplit = function(event){
   $('a.cancel-split').click(cancelItemSplit);
   $('a.save-split').click(completeItemSplit);
 
-  // Add some tips
-  $('.with-tip').powerTip({
-    smartPlacement: true,
-    fadeInTime: 50,
-    fadeOutTime: 50,
-    intentPollInterval: 300
-  });
   $('#item_stock_location').select2({ width: 'resolve', placeholder: Spree.translations.item_stock_placeholder });
 }
 
@@ -272,8 +248,7 @@ completeItemSplit = function(event) {
             original_shipment_number: original_shipment_number,
             variant_id: variant_id,
             quantity: quantity,
-            stock_location_id: stock_location_id,
-            token: Spree.api_key
+            stock_location_id: stock_location_id
         }
       }).error(function(msg) {
           alert(msg.responseJSON['message']);
@@ -290,8 +265,7 @@ completeItemSplit = function(event) {
                 original_shipment_number: original_shipment_number,
                 target_shipment_number: target_shipment_number,
                 variant_id: variant_id,
-                quantity: quantity,
-                token: Spree.api_key
+                quantity: quantity
             }
         }).error(function(msg) {
             alert(msg.responseJSON['message']);
@@ -329,12 +303,7 @@ addVariantFromStockLocation = function(event) {
     $.ajax({
       type: "POST",
       url: Spree.url(Spree.routes.shipments_api + "?shipment[order_id]=" + order_number),
-      data: {
-        variant_id: variant_id,
-        quantity: quantity,
-        stock_location_id: stock_location_id,
-        token: Spree.api_key
-      }
+      data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
     }).done(function( msg ) {
       window.location.reload();
     }).error(function( msg ) {

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

@@ -5,19 +5,4 @@ jQuery(function($) {
     allowClear: true,
     dropdownAutoWidth: true
   });
-
-  function format_taxons(taxon) {
-    new_taxon = taxon.text.replace('->', '<i class="fa fa-arrow-right">')
-    return new_taxon;
-  }
-
-  $("#product_taxon_ids").on({
-    change: function(e){
-      $('.select2-search-choice .with-tip').powerTip({
-        smartPlacement: true,
-        fadeInTime: 50,
-        fadeOutTime: 50
-      })
-    }
-  })
 })

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

@@ -2,10 +2,10 @@ $(document).ready(function () {
   'use strict';
 
   $('#country').on('change', function () {
-    var new_state_link_href = $('#new_state_link a').prop('href');
+    var new_state_link_href = $('#new_state_link').prop('href');
     var selected_country_id = $('#country option:selected').prop('value');
     var new_link = new_state_link_href.replace(/countries\/(\d+)/,
       'countries/' + selected_country_id);
-    $('#new_state_link a').attr('href', new_link);
+    $('#new_state_link').attr('href', new_link);
   });
-});
+});

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

@@ -9,11 +9,10 @@ jQuery ->
           variant_product_name_cont: term
         per_page: 50
         page: page
-        token: Spree.api_key
       results: (data, page) ->
         more = (page * 50) < data.count
         return { results: data.stock_items, more: more }
     formatResult: (stock_item) ->
       variantTemplate({ variant: stock_item.variant })
     formatSelection: (stock_item) ->
-      "#{stock_item.variant.name} (#{stock_item.variant.options_text})"
+      "#{stock_item.variant.name} (#{stock_item.variant.options_text})"

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

@@ -30,7 +30,7 @@ $ ->
 
       $('#transfer_receive_stock').change (event) => @receive_stock_change(event)
 
-      $.getJSON Spree.url(Spree.routes.stock_locations_api) + '?token=' + Spree.api_key, (data) =>
+      $.getJSON Spree.url(Spree.routes.stock_locations_api), (data) =>
         @locations = (location for location in data.stock_locations)
         @force_receive_stock() if @locations.length < 2
 
@@ -49,8 +49,10 @@ $ ->
       @source.trigger('change')
       if @is_source_location_hidden() and not hide
         $('#transfer_source_location_id_field').css('visibility', 'visible')
+        $('#transfer_source_location_id_field').show()
       else
         $('#transfer_source_location_id_field').css('visibility', 'hidden')
+        $('#transfer_source_location_id_field').hide()
 
     receive_stock_change: (event) ->
       @toggle_source_location event.target.checked
@@ -107,7 +109,6 @@ $ ->
             query_object = {}
             query_object[query] = term
             q: query_object
-            token: Spree.api_key
 
           results: (data, page) ->
             result = data["variants"] || data["stock_items"]

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

@@ -7,8 +7,7 @@ var set_taxon_select = function(){
       multiple: true,
       initSelection: function (element, callback) {
         var url = Spree.url(Spree.routes.taxons_search, {
-          ids: element.val(),
-          token: Spree.api_key
+          ids: element.val()
         });
         return $.getJSON(url, null, function (data) {
           return callback(data['taxons']);
@@ -24,8 +23,7 @@ var set_taxon_select = function(){
             without_children: true,
             q: {
               name_cont: term
-            },
-            token: Spree.api_key
+            }
           };
         },
         results: function (data, page) {

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

@@ -8,15 +8,15 @@ root.taxon_tree_menu = (obj, context) ->
   edit_url.setPath(edit_url.path() + '/' + obj.attr("id") + "/edit");
 
   create:
-    label: "<i class='fa fa-plus'></i> " + Spree.translations.add,
+    label: Spree.translations.add,
     action: (obj) -> context.create(obj)
   rename:
-    label: "<i class='fa fa-pencil'></i> " + Spree.translations.rename,
+    label: Spree.translations.rename,
     action: (obj) -> context.rename(obj)
   remove:
-    label: "<i class='fa fa-trash'></i> " + Spree.translations.remove,
+    label: Spree.translations.remove,
     action: (obj) -> context.remove(obj)
   edit:
     separator_before: true,
-    label: "<i class='fa fa-edit'></i> " + Spree.translations.edit,
+    label: Spree.translations.edit,
     action: (obj) -> window.location = edit_url.toString()

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

@@ -14,12 +14,7 @@ handle_move = (e, data) ->
     type: "POST",
     dataType: "json",
     url: url.toString(),
-    data: {
-      _method: "put",
-      "taxon[parent_id]": new_parent.prop("id"),
-      "taxon[child_index]": position,
-      token: Spree.api_key
-    },
+    data: ({_method: "put", "taxon[parent_id]": new_parent.prop("id"), "taxon[child_index]": position }),
     error: handle_ajax_error
 
   true
@@ -35,12 +30,7 @@ handle_create = (e, data) ->
     type: "POST",
     dataType: "json",
     url: base_url.toString(),
-    data: {
-      "taxon[name]": name,
-      "taxon[parent_id]": new_parent.prop("id"),
-      "taxon[child_index]": position,
-      token: Spree.api_key
-    },
+    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.prop("id"), "taxon[child_index]": position }),
     error: handle_ajax_error,
     success: (data,result) ->
       node.prop('id', data.id)
@@ -57,11 +47,7 @@ handle_rename = (e, data) ->
     type: "POST",
     dataType: "json",
     url: url.toString(),
-    data: {
-      _method: "put",
-      "taxon[name]": name,
-      token: Spree.api_key
-    },
+    data: {_method: "put", "taxon[name]": name },
     error: handle_ajax_error
 
 handle_delete = (e, data) ->
@@ -69,20 +55,17 @@ handle_delete = (e, data) ->
   node = data.rslt.obj
   delete_url = base_url.clone()
   delete_url.setPath delete_url.path() + '/' + node.prop("id")
-  jConfirm Spree.translations.are_you_sure_delete, Spree.translations.confirm_delete, (r) ->
-    if r
-      $.ajax
-        type: "POST",
-        dataType: "json",
-        url: delete_url.toString(),
-        data: {
-          _method: "delete",
-          token: Spree.api_key
-        },
-        error: handle_ajax_error
-    else
-      $.jstree.rollback(last_rollback)
-      last_rollback = null
+  response = confirm(Spree.translations.are_you_sure_delete)
+  if response
+    $.ajax
+      type: "POST",
+      dataType: "json",
+      url: delete_url.toString(),
+      data: {_method: "delete"},
+      error: handle_ajax_error
+  else
+    $.jstree.rollback(last_rollback)
+    last_rollback = null
 
 root = exports ? this
 root.setup_taxonomy_tree = (taxonomy_id) ->
@@ -92,8 +75,6 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
 
     $.ajax
       url: Spree.url(base_url.path().replace("/taxons", "/jstree")).toString(),
-      data:
-        token: Spree.api_key
       success: (taxonomy) ->
         last_rollback = null
 
@@ -102,7 +83,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
             data: taxonomy,
             ajax:
               url: (e) ->
-                Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree' + '?token=' + Spree.api_key).toString()
+                Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree').toString()
           themes:
             theme: "apple",
             url: Spree.url(Spree.routes.jstree_theme_path)

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

@@ -1,12 +1,14 @@
 $(document).ready ->
   window.productTemplate = Handlebars.compile($('#product_template').text());
-  $('#taxon_products').sortable();
+  $('#taxon_products').sortable({
+      handle: ".js-sort-handle"
+    });
   $('#taxon_products').on "sortstop", (event, ui) ->
     $.ajax
       url: Spree.routes.classifications_api,
       method: 'PUT',
+      dataType:'json',
       data:
-        token: Spree.api_key,
         product_id: ui.item.data('product-id'),
         taxon_id: $('#taxon_id').val(),
         position: ui.item.index()
@@ -21,7 +23,6 @@ $(document).ready ->
         data: (term, page) ->
           per_page: 50,
           page: page,
-          token: Spree.api_key,
           q:
             name_cont: term
         results: (data, page) ->
@@ -38,16 +39,34 @@ $(document).ready ->
     $.ajax
       url: Spree.routes.taxon_products_api,
       data:
-        id: e.val,
-        token: Spree.api_key
+        id: e.val
       success: (data) ->
         el.empty();
         if data.products.length == 0
-          $('#sorting_explanation').hide()
-          $('#taxon_products').html("<h4>" + Spree.translations.no_results + "</h4>")
+          $('#taxon_products').html("<div class='alert alert-info'>" + Spree.translations.no_results + "</div>")
         else
           for product in data.products
             if product.master.images[0] != undefined && product.master.images[0].small_url != undefined
               product.image = product.master.images[0].small_url
             el.append(productTemplate({ product: product }))
-          $('#sorting_explanation').show()
+
+  $('#taxon_products').on "click", ".js-delete-product", (e) ->
+    current_taxon_id = $("#taxon_id").val();
+    product = $(this).parents(".product")
+    product_id = product.data("product-id");
+    product_taxons = String(product.data("taxons")).split(',').map(Number);
+    product_index = product_taxons.indexOf(parseFloat(current_taxon_id));
+    product_taxons.splice(product_index, 1);
+    $.ajax
+      url: Spree.routes.products_api + "/" + product_id + "?product[taxon_ids]=" + product_taxons,
+      type: "PUT",
+      success: (data) ->
+        product.fadeOut 400, (e) ->
+          product.remove()
+
+  $('#taxon_products').on "click", ".js-edit-product", (e) ->
+    product = $(this).parents(".product")
+    product_id = product.data("product-id")
+    window.location = Spree.routes.edit_product(product_id)
+
+  $(".variant_autocomplete").variantAutocomplete();

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

@@ -16,8 +16,7 @@ $.fn.userAutocomplete = function () {
       datatype: 'json',
       data: function (term) {
         return {
-          q: term,
-          token: Spree.api_key
+          q: term
         };
       },
       results: function (data) {
@@ -37,4 +36,4 @@ $.fn.userAutocomplete = function () {
 
 $(document).ready(function () {
   $('.user_picker').userAutocomplete();
-});
+});

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

@@ -23,7 +23,6 @@ $.fn.variantAutocomplete = ->
       data: (term, page) ->
         q:
           product_name_or_sku_cont: term
-        token: Spree.api_key
 
       results: (data, page) ->
         window.variants = data["variants"]
@@ -34,4 +33,4 @@ $.fn.variantAutocomplete = ->
       if !!variant.options_text
         variant.name + " (#{variant.options_text})"
       else
-        variant.name
+        variant.name

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

@@ -1,7 +1,6 @@
 jQuery ->
   $('.track_inventory_checkbox').on 'click', ->
-    $(@).siblings('.variant_track_inventory').val($(@).is(':checked'))
-    $(@).parent('form').submit()
+    $(@).parents('form').submit()
   $('.toggle_variant_track_inventory').on 'submit', ->
     $.ajax
       type: @method

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

@@ -1,32 +1,26 @@
+//= require bootstrap-sprockets
 //= require jquery
+//= require jquery.cookie
+//= require jquery.jstree/jquery.jstree
 //= 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.delayedobserver
-//= require jquery.jstree/jquery.jstree
-//= require jquery.alerts/jquery.alerts
-//= require jquery.powertip
-//= require jquery.vAlign
-//= require css_browser_selector_dev
-//= require spin
-//= require trunk8
-//= require jquery.adaptivemenu
-//= require equalize
-//= require responsive-tables
+//= require underscore-min.js
+//= require velocity
 //= require spree
 //= require spree/backend/spree-select2
 //= require_tree .
 
+Spree.routes.clear_cache = Spree.pathFor('admin/general_settings/clear_cache')
 Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
 Spree.routes.classifications_api = Spree.pathFor('api/classifications')
-Spree.routes.clear_cache = Spree.pathFor('admin/general_settings/clear_cache')
 Spree.routes.option_type_search = Spree.pathFor('api/option_types')
+Spree.routes.option_value_search = Spree.pathFor('api/option_values')
 Spree.routes.orders_api = Spree.pathFor('api/orders')
-Spree.routes.product_search = Spree.pathFor('api/products')
+Spree.routes.products_api = Spree.pathFor('api/products')
+Spree.routes.product_search = Spree.pathFor('admin/search/products')
 Spree.routes.shipments_api = Spree.pathFor('api/shipments')
 Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
 Spree.routes.stock_locations_api = Spree.pathFor('api/stock_locations')
@@ -35,6 +29,10 @@ Spree.routes.taxons_search = Spree.pathFor('api/taxons')
 Spree.routes.user_search = Spree.pathFor('admin/search/users')
 Spree.routes.variants_api = Spree.pathFor('api/variants')
 
+Spree.routes.edit_product = function(product_id) {
+  return Spree.pathFor('admin/products/' + product_id + '/edit')
+}
+
 Spree.routes.payments_api = function(order_id) {
   return Spree.pathFor('api/orders/' + order_id + '/payments')
 }

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

@@ -0,0 +1,37 @@
+.btn, .nav-pills > li > a {
+  letter-spacing: 1px;
+  vertical-align: middle;
+  transition: color 0.1s linear 0s,background-color 0.1s linear 0s,opacity 0.2s linear 0s !important;
+
+  -webkit-font-smoothing: antialiased;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+  -webkit-font-feature-settings: "kern" 1;
+  -moz-font-feature-settings: "kern" 1;
+}
+.btn {
+  text-align: center;
+
+  &:focus {
+    outline: 0 !important;
+  }
+  
+  &:hover,
+  &:focus,
+  &:active,
+  &.active,
+  &.disabled,
+  &[disabled] {
+      box-shadow: none;
+  }
+
+  .glyphicon {
+    padding-right: 3px;
+  }
+}
+
+.btn-sm .glyphicon { padding: 0 }
+
+.btn.action-void { @extend .btn-danger; }
+.btn.action-capture { @extend .btn-success; }
+.btn.payment-action-edit { @extend .btn-primary; }

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

@@ -0,0 +1,25 @@
+#table-filter {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  margin-top: 20px;
+}
+
+.index-filter-button {
+  .glyphicon {
+    color: $gray-light;
+  }
+
+  button {
+    text-transform: uppercase;
+    letter-spacing: 2px;
+    font-weight: bold;
+    font-size: $font-size-base - 3;
+    padding: ($padding-base-vertical + 3) $padding-base-horizontal ($padding-base-vertical + 2);
+    border-right: none;
+
+    &:focus {
+      background-color: $gray-lighter;
+      border-color: $input-border;
+    }
+  }
+}