spree_backend 2.2.9 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bcb1884615353d33f853200f421a091c56a2f8b
-  data.tar.gz: 9695ba8467c411876e9984d6dc397ec2d49eb92d
+  metadata.gz: 89ce981f657e0415a271dc5ef18755d1d75f5c77
+  data.tar.gz: d6813759c824ffd1127110640fedbc14a886921d
 SHA512:
-  metadata.gz: bea6745864a1a7ba1188c41ad54e112f86fff11df404129e339707da428613b3118908102bd52bb24d05fd19ee8ae867f2d106588a2dadb259810ef34124d600
-  data.tar.gz: a718c52841cd6b993ccdf6a9e2a101b7aa0a507389950b3fcf66ee410433cbff548bb7972b671d17689218c4fcbdf8f5dbad3827eeb4feb43605f70cabfa058f
+  metadata.gz: 4c3f893ba97421aca33802742448ca5fa799a3c0979d003516163a0153368114dd85e5211db3fbeba490fdf7fc16e2ac7e89f3eb0b2a10d014f2d290d8ca9d8e
+  data.tar.gz: fadd70d7c5cf9d0f9a916cd8c15be924b369950a5b6efca8c76ff9e34b0ddae635fe8b499d95a4b0e412a9298a98d0c12cad839e93ad8e1d6b0f5326ba52c3a3

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

@@ -6,6 +6,7 @@ $(@).ready( ->
       url: Spree.url(Spree.routes.orders_api + '/' + order_number + '/apply_coupon_code.json');
       data:
         coupon_code: $("#coupon_code").val()
+        token: Spree.api_key
       success: ->
         window.location.reload();
       error: (msg) ->
@@ -13,4 +14,4 @@ $(@).ready( ->
           show_flash 'error', msg.responseJSON["error"]
         else
           show_flash 'error', "There was a problem adding this coupon code."
-)
+)

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

@@ -19,7 +19,10 @@ $(document).ready(function() {
         url: Spree.routes.user_search,
         datatype: 'json',
         data: function(term, page) {
-          return { q: term }
+          return {
+            q: term,
+            token: Spree.api_key
+          }
         },
         results: function(data, page) {
           return { results: data }

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

@@ -46,6 +46,7 @@ adjustLineItem = (line_item_id, quantity) ->
     data:
       line_item:
         quantity: quantity
+      token: Spree.api_key
   ).done (msg) ->
     advanceOrder()
 
@@ -54,8 +55,10 @@ deleteLineItem = (line_item_id) ->
   $.ajax(
     type: "DELETE"
     url: Spree.url(url)
+    data:
+      token: Spree.api_key
   ).done (msg) ->
     $('#line-item-' + line_item_id).remove()
     if $('.line-items tr.line-item').length == 0
       $('.line-items').remove()
-    advanceOrder()
+    advanceOrder()

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

@@ -9,7 +9,8 @@ $(document).ready(function () {
 
       $.post('/admin/orders/' + $('input#order_number').val() + '/line_items/' + $(id).val(), {
           _method: 'put',
-          'line_item[quantity]': $(this).val()
+          'line_item[quantity]': $(this).val(),
+          token: Spree.api_key
         },
 
         function (resp) {
@@ -17,4 +18,4 @@ $(document).ready(function () {
         });
     });
   });
-});
+});

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

@@ -65,7 +65,10 @@ $(document).ready(function () {
     var url = Spree.url(Spree.routes.shipments_api + '/' + shipment_number + '/ship.json');
     $.ajax({
       type: 'PUT',
-      url: url
+      url: url,
+      data: {
+        token: Spree.api_key
+      }
     }).done(function () {
       window.location.reload();
     }).error(function (msg) {
@@ -92,7 +95,8 @@ $(document).ready(function () {
         shipment: {
           selected_shipping_rate_id: selected_shipping_rate_id,
           unlock: unlock
-        }
+        },
+        token: Spree.api_key
       }
     }).done(function () {
       window.location.reload();
@@ -118,7 +122,8 @@ $(document).ready(function () {
       data: {
         shipment: {
           tracking: tracking
-        }
+        },
+        token: Spree.api_key
       }
     }).done(function () {
       window.location.reload();
@@ -149,7 +154,11 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
       $.ajax({
         type: "PUT",
         url: Spree.url(url),
-        data: { variant_id: variant_id, quantity: new_quantity }
+        data: {
+          variant_id: variant_id,
+          quantity: new_quantity,
+          token: Spree.api_key
+        }
       }).done(function( msg ) {
         window.location.reload();
       });
@@ -197,7 +206,8 @@ startItemSplit = function(event){
     data: {
       q: {
         "id_eq": variant_id
-      }
+      },
+      token: Spree.api_key
     }
   }).success(function( data ) {
     variant = data['variants'][0];
@@ -250,7 +260,7 @@ completeItemSplit = function(event) {
         type: "POST",
         async: false,
         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 }
+        data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id, token: Spree.api_key }
       }).done(function(msg) {
         advanceOrder();
       });
@@ -259,7 +269,7 @@ completeItemSplit = function(event) {
         type: "PUT",
         async: false,
         url: Spree.url(Spree.routes.shipments_api + "/" + target_shipment_number + "/add.json"),
-        data: { variant_id: variant_id, quantity: quantity }
+        data: { variant_id: variant_id, quantity: quantity, token: Spree.api_key }
       }).done(function(msg) {
         advanceOrder();
       });
@@ -302,7 +312,12 @@ addVariantFromStockLocation = function() {
     $.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 }
+      data: {
+        variant_id: variant_id,
+        quantity: quantity,
+        stock_location_id: stock_location_id,
+        token: Spree.api_key
+      }
     }).done(function( msg ) {
       window.location.reload();
     }).error(function( msg ) {

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

@@ -8,10 +8,11 @@ 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), (data) =>
+      $.getJSON Spree.url(Spree.routes.stock_locations_api) + '?token=' + Spree.api_key, (data) =>
         @locations = (location for location in data.stock_locations)
         @force_receive_stock() if @locations.length < 2
 
@@ -107,6 +107,7 @@ $ ->
             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/taxonomy.js.coffee

@@ -14,7 +14,12 @@ 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 }),
+    data: {
+      _method: "put",
+      "taxon[parent_id]": new_parent.prop("id"),
+      "taxon[child_index]": position,
+      token: Spree.api_key
+    },
     error: handle_ajax_error
 
   true
@@ -30,7 +35,12 @@ 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 }),
+    data: {
+      "taxon[name]": name,
+      "taxon[parent_id]": new_parent.prop("id"),
+      "taxon[child_index]": position,
+      token: Spree.api_key
+    },
     error: handle_ajax_error,
     success: (data,result) ->
       node.prop('id', data.id)
@@ -47,7 +57,11 @@ handle_rename = (e, data) ->
     type: "POST",
     dataType: "json",
     url: url.toString(),
-    data: {_method: "put", "taxon[name]": name },
+    data: {
+      _method: "put",
+      "taxon[name]": name,
+      token: Spree.api_key
+    },
     error: handle_ajax_error
 
 handle_delete = (e, data) ->
@@ -61,7 +75,10 @@ handle_delete = (e, data) ->
         type: "POST",
         dataType: "json",
         url: delete_url.toString(),
-        data: {_method: "delete"},
+        data: {
+          _method: "delete",
+          token: Spree.api_key
+        },
         error: handle_ajax_error
     else
       $.jstree.rollback(last_rollback)
@@ -75,6 +92,8 @@ 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
 
@@ -83,7 +102,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
             data: taxonomy,
             ajax:
               url: (e) ->
-                Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree').toString()
+                Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree' + '?token=' + Spree.api_key).toString()
           themes:
             theme: "apple",
             url: Spree.url(Spree.routes.jstree_theme_path)

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

@@ -20,6 +20,7 @@ $(document).ready ->
         data: (term, page) ->
           per_page: 50,
           page: page,
+          token: Spree.api_key,
           q:
             name_cont: term
         results: (data, page) ->
@@ -36,7 +37,8 @@ $(document).ready ->
     $.ajax
       url: Spree.routes.taxon_products_api,
       data:
-        id: e.val
+        id: e.val,
+        token: Spree.api_key
       success: (data) ->
         el.empty();
         if data.products.length == 0
@@ -48,4 +50,3 @@ $(document).ready ->
               product.image = product.master.images[0].small_url
             el.append(productTemplate({ product: product }))
           $('#sorting_explanation').show()
-

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

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

data/app/views/spree/admin/orders/_shipment_manifest.html.erb

@@ -23,7 +23,7 @@
     <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
     <% unless shipment.shipped? %>
       <td class="cart-item-delete actions" data-hook="cart_item_delete">
-        <% if can? :update, item %>
+        <% if can?(:update, item.line_item) %>
           <%= link_to '', '#', :class => 'save-item fa fa-check no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
           <%= link_to '', '#', :class => 'cancel-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
           <%= link_to '', '#', :class => 'edit-item fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>

data/app/views/spree/admin/shared/_destroy.js.erb

@@ -1,6 +1,6 @@
 <% success = flash.discard(:success)
 if success %>
-  show_flash('success', "<%= success %>")
+  show_flash('success', "<%= j success %>")
 <% end %>
 
 <%= render :partial => '/spree/admin/shared/update_order_state' if @order %>

data/app/views/spree/admin/shared/_head.html.erb

@@ -24,6 +24,7 @@
 <%= javascript_tag do -%>
   jQuery.alerts.dialogClass = 'spree';
   <%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" %>
-<% end -%>
+  <%== "Spree.api_key = '#{try_spree_current_user.spree_api_key}';" if try_spree_current_user %>
+<% end %>
 
 <%= yield :head %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.10
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.9
+        version: 2.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.9
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.9
+        version: 2.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.9
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -528,7 +528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.